[iotdb] branch ZYBug updated: [ZYBug] add merge datatype log (#1893)

[qiaojialin]

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

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


The following commit(s) were added to refs/heads/ZYBug by this push:
     new 7cc4b2a  [ZYBug] add merge datatype log (#1893)
7cc4b2a is described below

commit 7cc4b2a8c87330d2699c9b0d9ac213f5878d8be7
Author: zhanglingzhe0820 <445073...@qq.com>
AuthorDate: Thu Oct 29 09:21:23 2020 +0800

    [ZYBug] add merge datatype log (#1893)
---
 .../db/engine/merge/task/MergeMultiChunkTask.java      | 18 +++++++++++++++++-
 1 file changed, 17 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 67caf2c..8fde7c4 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
@@ -138,7 +138,23 @@ class MergeMultiChunkTask {
     currTimeValuePairs = new TimeValuePair[currMergingPaths.size()];
     for (int i = 0; i < currMergingPaths.size(); i++) {
       if (unseqReaders[i].hasNextTimeValuePair()) {
-        currTimeValuePairs[i] = unseqReaders[i].currentTimeValuePair();
+        try {
+          currTimeValuePairs[i] = unseqReaders[i].currentTimeValuePair();
+        } catch (IOException e) {
+          logger
+              .error("datatype error, path = {}", 
currMergingPaths.get(i).getFullPath());
+          for (TsFileResource tsFileResource : resource.getUnseqFiles()) {
+            logger
+                .error("datatype error, may be in file : {}", 
tsFileResource.getFile().getPath());
+            for (ChunkMetadata chunkMetadata : 
tsFileResource.getChunkMetadataList()) {
+              logger.error(
+                  "above unseq file have chunk path = {}, datatype = {}, 
startTime = {} ,endTime ={}",
+                  chunkMetadata.getMeasurementUid(), 
chunkMetadata.getDataType(),
+                  chunkMetadata.getStartTime(), chunkMetadata.getEndTime());
+            }
+          }
+          throw new IOException(e);
+        }
       }
     }