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 03:06:59 UTC

[incubator-iotdb] branch dev_merge updated (6a59eca -> 8781806)

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 6a59eca  add MaxMergeFileStrategy allow merging multiple series at the same time
     add 8781806  add MaxSeriesMergeFileSelectorTest

No new revisions were added by this update.

Summary of changes:
 .../merge/selector/MaxSeriesMergeFileSelector.java | 31 +++++-----------------
 .../engine/merge/selector/MergeFileSelector.java   |  6 +++--
 ...st.java => MaxSeriesMergeFileSelectorTest.java} | 20 ++++++++------
 .../db/engine/merge/MergeFileSelectorTest.java     |  1 -
 4 files changed, 23 insertions(+), 35 deletions(-)
 copy iotdb/src/test/java/org/apache/iotdb/db/engine/merge/{MergeFileSelectorTest.java => MaxSeriesMergeFileSelectorTest.java} (67%)