[incubator-iotdb] branch debug_metero updated: add logs when unexpected paths are found

[jiangtian]

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

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


The following commit(s) were added to refs/heads/debug_metero by this push:
     new f4428ed  add logs when unexpected paths are found
f4428ed is described below

commit f4428edb135afa05094123c83ed8d999d14afb1c
Author: jt2594838 <jt2594...@163.com>
AuthorDate: Mon Mar 16 12:52:26 2020 +0800

    add logs when unexpected paths are found
---
 .../org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java   | 1 -
 .../java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java    | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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 98d1dc7..62ab0a2 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
@@ -152,7 +152,6 @@ class MergeMultiChunkTask {
     TsFileResource currTsFile = resource.getSeqFiles().get(seqFileIdx);
     String deviceId = currMergingPaths.get(0).getDevice();
     Long currDeviceMinTime = currTsFile.getStartTimeMap().get(deviceId);
-    //COMMENTS: is this correct? how about if there are other devices (in the 
currMergingPaths) that have unseq data?
     if (currDeviceMinTime == null) {
       return;
     }
diff --git 
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java
index aebfe99..3a4e43d 100644
--- 
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java
+++ 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java
@@ -397,6 +397,7 @@ public class TsFileIOWriter {
     Map<Path, Integer> startTimeIdxes = new HashMap<>();
     chunkStartTimes.forEach((p, t) -> startTimeIdxes.put(p, 0));
 
+    boolean pathsShown = false;
     Iterator<ChunkGroupMetaData> chunkGroupMetaDataIterator = 
chunkGroupMetaDataList.iterator();
     while (chunkGroupMetaDataIterator.hasNext()) {
       ChunkGroupMetaData chunkGroupMetaData = 
chunkGroupMetaDataIterator.next();
@@ -410,6 +411,10 @@ public class TsFileIOWriter {
         Integer startTimeIdx = startTimeIdxes.get(path);
         if (startTimeIdx == null) {
           logger.error("Unexpected timeseries {} found in file {}", path, 
file);
+          if (!pathsShown) {
+            logger.error("Merged timeseries in file {} are {}", file, 
startTimeIdxes.keySet());
+            pathsShown = true;
+          }
           continue;
         }