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/08/13 09:26:23 UTC

[incubator-iotdb] branch dev_merge updated (2170da2 -> 3f8d716)

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 2170da2  fix perfTest
     add 3f8d716  get paths to be merged from MManager to avoid non-existing paths.

No new revisions were added by this update.

Summary of changes:
 .../db/engine/merge/manage/MergeResource.java      |  7 +++++++
 .../db/engine/merge/task/MergeMultiChunkTask.java  |  8 ++++++--
 .../iotdb/db/engine/merge/task/MergeTask.java      | 23 ++++++++++++++++++----
 .../db/engine/merge/task/RecoverMergeTask.java     |  4 ++--
 .../engine/storagegroup/StorageGroupProcessor.java |  4 ++--
 .../merge/MaxSeriesMergeFileSelectorTest.java      |  5 +++--
 .../apache/iotdb/db/engine/merge/MergeLogTest.java |  5 +++--
 .../iotdb/db/engine/merge/MergePerfTest.java       |  2 +-
 .../iotdb/db/engine/merge/MergeTaskTest.java       | 17 ++++++++--------
 .../apache/iotdb/db/engine/merge/MergeTest.java    | 23 ++++++++++++++++++----
 .../storagegroup/StorageGroupProcessorTest.java    |  2 +-
 11 files changed, 72 insertions(+), 28 deletions(-)