[iotdb] branch master updated: update test and doc and fix small bug (#3281)

[ta...@apache.org]

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

tanxinyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 8d3819f  update test and doc and fix small bug (#3281)
8d3819f is described below

commit 8d3819f107d1c7d7d1a80fd3d55a8ccd44cf43c9
Author: zhanglingzhe0820 <44...@qq.com>
AuthorDate: Thu May 27 21:48:27 2021 +0800

    update test and doc and fix small bug (#3281)
    
    Co-authored-by: zhanglingzhe <su...@foxmail.com>
---
 .../java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java  | 4 +---
 .../org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java    | 1 +
 .../src/test/java/org/apache/iotdb/db/engine/merge/MergeTaskTest.java | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java
index 4c88ae4..aea6e8b 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java
@@ -237,9 +237,7 @@ public abstract class TsFileManagement {
           "{} too much unseq files to be merged, reduce it to {}",
           storageGroupName,
           maxOpenFileNumInEachUnseqCompaction);
-      unSeqMergeList =
-          unSeqMergeList.subList(
-              unSeqMergeList.size() - maxOpenFileNumInEachUnseqCompaction, unSeqMergeList.size());
+      unSeqMergeList = unSeqMergeList.subList(0, maxOpenFileNumInEachUnseqCompaction);
     }
 
     long budget = IoTDBDescriptor.getInstance().getConfig().getMergeMemoryBudget();
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java
index 610a8e6..e44e248 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java
@@ -248,6 +248,7 @@ public class MergeMultiChunkTask {
       return;
     }
 
+    // need the max sensor in lexicographic order
     String lastSensor = getMaxSensor(currMergingPaths);
     String currSensor = null;
     Map<String, List<ChunkMetadata>> measurementChunkMetadataListMap = new TreeMap<>();
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTaskTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTaskTest.java
index ec69dfc..d4f5dfe 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTaskTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTaskTest.java
@@ -202,13 +202,13 @@ public class MergeTaskTest extends MergeTest {
         new PartialPath(
             deviceIds[0]
                 + TsFileConstant.PATH_SEPARATOR
-                + measurementSchemas[0].getMeasurementId());
+                + measurementSchemas[9].getMeasurementId());
     List<TsFileResource> list = new ArrayList<>();
     list.add(seqResources.get(0));
     IBatchReader tsFilesReader =
         new SeriesRawDataBatchReader(
             path,
-            measurementSchemas[0].getType(),
+            measurementSchemas[9].getType(),
             context,
             list,
             new ArrayList<>(),