[incubator-iotdb] branch dev_new_merge_strategy updated (8f7bf3f -> 8de02ff)

[ji...@apache.org]

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

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


    from 8f7bf3f  temp save
     add 0df35ae  fix that CachedPriorityMergeReader fails to deduplicate the last element in the cache
     add becc6d5  fix that reader is not put back to the heap and readers are not removed after merge
     new 8de02ff  Merge branch 'fix_duplicated_overlap_merge' into dev_new_merge_strategy

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../engine/merge/inplace/task/MergeFileTask.java   |   4 +
 .../universal/CachedPriorityMergeReader.java       |  26 ++--
 .../reader/universal/PriorityMergeReader.java      |   2 +-
 .../iotdb/db/engine/merge/MergeOverLapTest.java    | 150 +++++++++++++++++++++
 .../apache/iotdb/db/engine/merge/MergeTest.java    |   4 +-
 5 files changed, 170 insertions(+), 16 deletions(-)
 create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java

[incubator-iotdb] 01/01: Merge branch 'fix_duplicated_overlap_merge' into dev_new_merge_strategy

[ji...@apache.org]

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

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

commit 8de02ff6f581f8511703603f4b7496faae61bd6a
Merge: 8f7bf3f becc6d5
Author: jt <jt...@163.com>
AuthorDate: Mon Oct 28 10:40:13 2019 +0800

    Merge branch 'fix_duplicated_overlap_merge' into dev_new_merge_strategy

 .../engine/merge/inplace/task/MergeFileTask.java   |   4 +
 .../universal/CachedPriorityMergeReader.java       |  26 ++--
 .../reader/universal/PriorityMergeReader.java      |   2 +-
 .../iotdb/db/engine/merge/MergeOverLapTest.java    | 150 +++++++++++++++++++++
 .../apache/iotdb/db/engine/merge/MergeTest.java    |   4 +-
 5 files changed, 170 insertions(+), 16 deletions(-)

diff --cc server/src/main/java/org/apache/iotdb/db/engine/merge/inplace/task/MergeFileTask.java
index 40d186b,7df2d74..3cb7472
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/inplace/task/MergeFileTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/inplace/task/MergeFileTask.java
@@@ -28,8 -28,9 +28,9 @@@ import org.apache.iotdb.db.engine.cache
  import org.apache.iotdb.db.engine.cache.TsFileMetaDataCache;
  import org.apache.iotdb.db.engine.merge.manage.MergeContext;
  import org.apache.iotdb.db.engine.merge.manage.MergeResource;
 -import org.apache.iotdb.db.engine.merge.recover.MergeLogger;
 +import org.apache.iotdb.db.engine.merge.inplace.recover.InplaceMergeLogger;
  import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
+ import org.apache.iotdb.db.query.control.FileReaderManager;
  import org.apache.iotdb.tsfile.exception.write.TsFileNotCompleteException;
  import org.apache.iotdb.tsfile.file.metadata.ChunkGroupMetaData;
  import org.apache.iotdb.tsfile.file.metadata.ChunkMetaData;
diff --cc server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java
index 1087503,bc3a7b6..7bd2afb
--- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java
@@@ -114,9 -113,9 +114,9 @@@ public abstract class MergeTest 
      }
    }
  
-   private void prepareFiles(int seqFileNum, int unseqFileNum) throws IOException, WriteProcessException {
+   void prepareFiles(int seqFileNum, int unseqFileNum) throws IOException, WriteProcessException {
      for (int i = 0; i < seqFileNum; i++) {
 -      File file = SystemFileFactory.INSTANCE.getFile(i + "seq.tsfile");
 +      File file = SystemFileFactory.INSTANCE.getFile("seq" + i + "-" + i + ".tsfile");
        TsFileResource tsFileResource = new TsFileResource(file);
        seqResources.add(tsFileResource);
        prepareFile(tsFileResource, i * ptNum, ptNum, 0);