In order to avoid get chunkMetadata of other index in the array, wish to get chunkMetadata current index itself, when execute query statement.

Place null value that when chunkMetaData is not compatible with chunkMetadData of target data type

Author: zerolbsony

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/ResourceByPathUtils.java

@@ -552,7 +552,7 @@ public ITimeSeriesMetadata generateTimeSeriesMetadata(
         chunkMetadata.setModified(true);
       }
       if (!useFakeStatistics) {
-        if (targetDataType.isCompatible(chunkMetadata.getDataType())) {
+        if (chunkMetadata != null && targetDataType.isCompatible(chunkMetadata.getDataType())) {
           seriesStatistics.mergeStatistics(chunkMetadata.getStatistics());
         }
         continue;

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java

@@ -404,14 +404,17 @@ public static AbstractAlignedChunkMetadata rewriteAlignedChunkMetadataStatistics
       AbstractAlignedChunkMetadata alignedChunkMetadata, TSDataType targetDataType) {
     List<IChunkMetadata> newValueChunkMetadataList = new ArrayList<>();
     for (IChunkMetadata valueChunkMetadata : alignedChunkMetadata.getValueChunkMetadataList()) {
-      if (targetDataType.isCompatible(valueChunkMetadata.getDataType())) {
+      if (valueChunkMetadata != null
+          && targetDataType.isCompatible(valueChunkMetadata.getDataType())) {
         Statistics<?> statistics = Statistics.getStatsByType(targetDataType);
         statistics = getNewStatistics(valueChunkMetadata, targetDataType, statistics);
 
         ChunkMetadata newChunkMetadata = (ChunkMetadata) valueChunkMetadata;
         newChunkMetadata.setTsDataType(targetDataType);
         newChunkMetadata.setStatistics(statistics);
         newValueChunkMetadataList.add(newChunkMetadata);
+      } else {
+        newValueChunkMetadataList.add(null);
       }
     }
     return new AlignedChunkMetadata(
@@ -420,7 +423,7 @@ public static AbstractAlignedChunkMetadata rewriteAlignedChunkMetadataStatistics
 
   public static void rewriteNonAlignedChunkMetadataStatistics(
       ChunkMetadata chunkMetadata, TSDataType targetDataType) {
-    if (targetDataType.isCompatible(chunkMetadata.getDataType())) {
+    if (chunkMetadata != null && targetDataType.isCompatible(chunkMetadata.getDataType())) {
       Statistics<?> statistics = Statistics.getStatsByType(targetDataType);
       statistics = getNewStatistics(chunkMetadata, targetDataType, statistics);
 

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java

@@ -171,10 +171,7 @@ public void mergeMetadataStatistics() throws Exception {
           s3.update(
               new long[] {1, 2},
               new Binary[] {
-                new Binary("3", StandardCharsets.UTF_8),
-                new Binary("4", StandardCharsets.UTF_8),
-                new Binary("3", StandardCharsets.UTF_8),
-                new Binary("4", StandardCharsets.UTF_8)
+                new Binary("3", StandardCharsets.UTF_8), new Binary("4", StandardCharsets.UTF_8),
               },
               2);
         }
@@ -185,10 +182,7 @@ public void mergeMetadataStatistics() throws Exception {
           s4.update(
               new long[] {1, 2},
               new Binary[] {
-                new Binary("5", StandardCharsets.UTF_8),
-                new Binary("6", StandardCharsets.UTF_8),
-                new Binary("5", StandardCharsets.UTF_8),
-                new Binary("6", StandardCharsets.UTF_8)
+                new Binary("5", StandardCharsets.UTF_8), new Binary("6", StandardCharsets.UTF_8),
               },
               2);
         }