[To rel/0.13] [IOTDB-4654] Fix concurrent bug caused by sharing same ChunkMetadata (#7605)

Author: liuminghui233

server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskAlignedChunkMetadataLoader.java

@@ -58,7 +58,7 @@ public DiskAlignedChunkMetadataLoader(
   @Override
   public List<IChunkMetadata> loadChunkMetadataList(ITimeSeriesMetadata timeSeriesMetadata) {
     List<AlignedChunkMetadata> alignedChunkMetadataList =
-        ((AlignedTimeSeriesMetadata) timeSeriesMetadata).getChunkMetadataList();
+        ((AlignedTimeSeriesMetadata) timeSeriesMetadata).getCopiedChunkMetadataList();
 
     // get all sub sensors' modifications
     List<List<Modification>> pathModifications =

server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskChunkMetadataLoader.java

@@ -57,7 +57,7 @@ public DiskChunkMetadataLoader(
   public List<IChunkMetadata> loadChunkMetadataList(ITimeSeriesMetadata timeSeriesMetadata) {
 
     List<IChunkMetadata> chunkMetadataList =
-        ((TimeseriesMetadata) timeSeriesMetadata).getChunkMetadataList();
+        ((TimeseriesMetadata) timeSeriesMetadata).getCopiedChunkMetadataList();
 
     List<Modification> pathModifications =
         context.getPathModifications(resource.getModFile(), seriesPath);

server/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java

@@ -80,9 +80,7 @@ public static void modifyChunkMetaData(
               if (range.contains(metaData.getStartTime(), metaData.getEndTime())) {
                 return true;
               } else {
-                if (!metaData.isModified()
-                    && range.overlaps(
-                        new TimeRange(metaData.getStartTime(), metaData.getEndTime()))) {
+                if (range.overlaps(new TimeRange(metaData.getStartTime(), metaData.getEndTime()))) {
                   metaData.setModified(true);
                 }
               }
@@ -138,11 +136,9 @@ public static void modifyAlignedChunkMetaData(
                   currentRemoved = true;
                   break;
                 } else {
-                  if (!valueChunkMetadata.isModified()
-                      && range.overlaps(
-                          new TimeRange(
-                              valueChunkMetadata.getStartTime(),
-                              valueChunkMetadata.getEndTime()))) {
+                  if (range.overlaps(
+                      new TimeRange(
+                          valueChunkMetadata.getStartTime(), valueChunkMetadata.getEndTime()))) {
                     valueChunkMetadata.setModified(true);
                     modified = true;
                   }
@@ -155,9 +151,7 @@ public static void modifyAlignedChunkMetaData(
               removed = false;
             }
           }
-          if (!alignedChunkMetadata.isModified()) {
-            alignedChunkMetadata.setModified(modified);
-          }
+          alignedChunkMetadata.setModified(modified);
           return removed;
         });
   }

tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/AlignedTimeSeriesMetadata.java

@@ -103,13 +103,28 @@ public List<IChunkMetadata> loadChunkMetadataList() throws IOException {
     return chunkMetadataLoader.loadChunkMetadataList(this);
   }
 
+  public List<AlignedChunkMetadata> getCopiedChunkMetadataList() {
+    List<IChunkMetadata> timeChunkMetadata = timeseriesMetadata.getCopiedChunkMetadataList();
+    List<List<IChunkMetadata>> valueChunkMetadataList = new ArrayList<>();
+    for (TimeseriesMetadata metadata : valueTimeseriesMetadataList) {
+      valueChunkMetadataList.add(metadata == null ? null : metadata.getCopiedChunkMetadataList());
+    }
+
+    return getAlignedChunkMetadata(timeChunkMetadata, valueChunkMetadataList);
+  }
+
   public List<AlignedChunkMetadata> getChunkMetadataList() {
     List<IChunkMetadata> timeChunkMetadata = timeseriesMetadata.getChunkMetadataList();
     List<List<IChunkMetadata>> valueChunkMetadataList = new ArrayList<>();
     for (TimeseriesMetadata metadata : valueTimeseriesMetadataList) {
       valueChunkMetadataList.add(metadata == null ? null : metadata.getChunkMetadataList());
     }
 
+    return getAlignedChunkMetadata(timeChunkMetadata, valueChunkMetadataList);
+  }
+
+  private List<AlignedChunkMetadata> getAlignedChunkMetadata(
+      List<IChunkMetadata> timeChunkMetadata, List<List<IChunkMetadata>> valueChunkMetadataList) {
     List<AlignedChunkMetadata> res = new ArrayList<>();
     for (int i = 0; i < timeChunkMetadata.size(); i++) {
       List<IChunkMetadata> chunkMetadataList = new ArrayList<>();

tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetadata.java

@@ -103,6 +103,24 @@ public ChunkMetadata(
     this.statistics = statistics;
   }
 
+  // won't clone deleteIntervalList & modified
+  public ChunkMetadata(ChunkMetadata other) {
+    this.measurementUid = other.measurementUid;
+    this.offsetOfChunkHeader = other.offsetOfChunkHeader;
+    this.tsDataType = other.tsDataType;
+    this.version = other.version;
+    this.chunkLoader = other.chunkLoader;
+    this.statistics = other.statistics;
+    this.isFromOldTsFile = other.isFromOldTsFile;
+    this.ramSize = other.ramSize;
+    this.isSeq = other.isSeq;
+    this.isClosed = other.isClosed;
+    this.filePath = other.filePath;
+    this.mask = other.mask;
+    this.tsFilePrefixPath = other.tsFilePrefixPath;
+    this.compactionVersion = other.compactionVersion;
+  }
+
   @Override
   public String toString() {
     return String.format(

tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/TimeseriesMetadata.java

@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 public class TimeseriesMetadata implements ITimeSeriesMetadata {
 
@@ -245,6 +246,12 @@ public List<IChunkMetadata> getChunkMetadataList() {
     return chunkMetadataList;
   }
 
+  public List<IChunkMetadata> getCopiedChunkMetadataList() {
+    return chunkMetadataList.stream()
+        .map(chunkMetadata -> new ChunkMetadata((ChunkMetadata) chunkMetadata))
+        .collect(Collectors.toList());
+  }
+
   @Override
   public boolean isModified() {
     return modified;