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

Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/07/23 07:42:34 UTC

[incubator-iotdb] branch dev_merge updated (5933e04 -> 4853bbb)

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

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


    from 5933e04  clean MergePerfTest
     add 4853bbb  fix chunks may not be deleted during merge

No new revisions were added by this update.

Summary of changes:
 .../engine/merge/selector/MergeFileSelector.java   | 52 +++++++++++++----
 .../db/engine/merge/task/MergeMultiChunkTask.java  | 41 +++++---------
 .../engine/storagegroup/StorageGroupProcessor.java |  5 +-
 .../java/org/apache/iotdb/db/utils/MergeUtils.java | 35 ++----------
 .../iotdb/db/engine/merge/MergeTaskTest.java       | 20 +++++--
 .../storagegroup/StorageGroupProcessorTest.java    | 65 +++++++++++++++++++++-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |  4 +-
 .../tsfile/read/controller/ChunkLoaderImpl.java    |  4 +-
 8 files changed, 142 insertions(+), 84 deletions(-)