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/22 13:16:26 UTC

[incubator-iotdb] branch dev_merge updated (aee1484 -> 9106a36)

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 aee1484  add MergeMultiChunkTask
     add 9106a36  remove MergeChunkTask

No new revisions were added by this update.

Summary of changes:
 .../db/engine/merge/selector/MergeFileSelector.java   |  6 ++++++
 .../apache/iotdb/db/engine/merge/task/MergeTask.java  | 19 ++++++++++++++++---
 .../iotdb/db/engine/merge/task/RecoverMergeTask.java  |  2 +-
 .../db/engine/storagegroup/StorageGroupProcessor.java |  3 ++-
 .../apache/iotdb/db/engine/merge/MergeLogTest.java    |  2 +-
 .../apache/iotdb/db/engine/merge/MergePerfTest.java   |  2 +-
 .../apache/iotdb/db/engine/merge/MergeTaskTest.java   |  2 +-
 7 files changed, 28 insertions(+), 8 deletions(-)