You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/01/15 07:30:58 UTC

[incubator-iotdb] branch new_series_reader updated (45a59bb -> 301ea5c)

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a change to branch new_series_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 45a59bb  Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader
     add ff06ddd  [IOTDB-421]fix that selected seq files for merge are not sorted (#743)
     add 301ea5c  Merge branch 'master' into new_series_reader

No new revisions were added by this update.

Summary of changes:
 .../db/engine/merge/manage/MergeResource.java      |   3 +
 .../merge/selector/MaxFileMergeFileSelector.java   |  73 +++++++-----
 .../iotdb/db/integration/IoTDBMergeTest.java       | 132 ++++++++++++++++++++-
 3 files changed, 178 insertions(+), 30 deletions(-)