reimplement postback based on new tsfile structure

iotdb/pom.xml

@@ -53,33 +53,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>cn.edu.fudan.dsm</groupId>
-            <artifactId>kvmatch-iotdb</artifactId>
-            <version>1.0.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.iotdb</groupId>
-                    <artifactId>tsfile</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>

iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/RestorableTsFileIOWriter.java

@@ -202,7 +202,7 @@ public class RestorableTsFileIOWriter extends TsFileIOWriter {
         randomAccessFile.read(thriftBytes);
         ByteArrayInputStream inputStream = new ByteArrayInputStream(thriftBytes);
         TsDeviceMetadata tsDeviceMetadata = TsDeviceMetadata.deserializeFrom(inputStream);
-        groupMetaDatas.addAll(tsDeviceMetadata.getChunkGroups());
+        groupMetaDatas.addAll(tsDeviceMetadata.getChunkGroupMetaDataList());
         point = randomAccessFile.getFilePointer();
       }
       // read the tsfile position information using byte[8] which is a long.

iotdb/src/main/java/org/apache/iotdb/db/engine/overflow/ioV2/OverflowResource.java

@@ -142,7 +142,7 @@ public class OverflowResource {
       insertIO.getReader().position(position - FOOTER_LENGTH - metadataLength - POS_LENGTH);
       insertIO.getReader().read(bytesPosition, 0, POS_LENGTH);
       position = BytesUtils.bytesToLong(bytesPosition);
-      for (ChunkGroupMetaData rowGroupMetaData : tsDeviceMetadata.getChunkGroups()) {
+      for (ChunkGroupMetaData rowGroupMetaData : tsDeviceMetadata.getChunkGroupMetaDataList()) {
         String deviceId = rowGroupMetaData.getDeviceID();
         if (!insertMetadatas.containsKey(deviceId)) {
           insertMetadatas.put(deviceId, new HashMap<>());

iotdb/src/test/java/org/apache/iotdb/db/engine/bufferwrite/RestorableTsFileIOWriterTest.java

@@ -178,7 +178,7 @@ public class RestorableTsFileIOWriterTest {
     assertEquals(2, metaData.getDeviceMap().size());
     List<ChunkGroupMetaData> chunkGroups = reader
         .readTsDeviceMetaData(metaData.getDeviceMap().get("d1"))
-        .getChunkGroups();
+        .getChunkGroupMetaDataList();
     assertEquals(1, chunkGroups.size());
 
     List<ChunkMetaData> chunks = chunkGroups.get(0).getChunkMetaDataList();
@@ -192,7 +192,7 @@ public class RestorableTsFileIOWriterTest {
     assertEquals(chunks.get(1).getEndTime(), 3);
     assertEquals(chunks.get(1).getNumOfPoints(), 2);
 
-    chunkGroups = reader.readTsDeviceMetaData(metaData.getDeviceMap().get("d2")).getChunkGroups();
+    chunkGroups = reader.readTsDeviceMetaData(metaData.getDeviceMap().get("d2")).getChunkGroupMetaDataList();
     assertEquals(1, chunkGroups.size());
     chunks = chunkGroups.get(0).getChunkMetaDataList();
     assertEquals(1, chunks.size());

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

@@ -143,7 +143,7 @@ public class TsDeviceMetadata {
     }
   }
 
-  public List<ChunkGroupMetaData> getChunkGroups() {
+  public List<ChunkGroupMetaData> getChunkGroupMetaDataList() {
     return Collections.unmodifiableList(chunkGroupMetadataList);
   }
 

tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImpl.java

@@ -104,7 +104,7 @@ public class MetadataQuerierByFileImpl implements MetadataQuerier {
 
       // d1
       for (ChunkGroupMetaData chunkGroupMetaData : tsDeviceMetadata
-          .getChunkGroups()) { // TODO make this function
+          .getChunkGroupMetaDataList()) { // TODO make this function
         // better
 
         if (enough) {
@@ -159,7 +159,7 @@ public class MetadataQuerierByFileImpl implements MetadataQuerier {
 
     // get all ChunkMetaData of this path included in all ChunkGroups of this device
     List<ChunkMetaData> chunkMetaDataList = new ArrayList<>();
-    for (ChunkGroupMetaData chunkGroupMetaData : tsDeviceMetadata.getChunkGroups()) {
+    for (ChunkGroupMetaData chunkGroupMetaData : tsDeviceMetadata.getChunkGroupMetaDataList()) {
       List<ChunkMetaData> chunkMetaDataListInOneChunkGroup = chunkGroupMetaData
           .getChunkMetaDataList();
       for (ChunkMetaData chunkMetaData : chunkMetaDataListInOneChunkGroup) {

tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/Utils.java

@@ -137,12 +137,12 @@ public class Utils {
       assertEquals(metadata1.getStartTime(), metadata2.getStartTime());
       assertEquals(metadata1.getEndTime(), metadata2.getEndTime());
 
-      if (Utils.isTwoObjectsNotNULL(metadata1.getChunkGroups(), metadata2.getChunkGroups(),
+      if (Utils.isTwoObjectsNotNULL(metadata1.getChunkGroupMetaDataList(), metadata2.getChunkGroupMetaDataList(),
           "Rowgroup metadata list")) {
-        assertEquals(metadata1.getChunkGroups().size(), metadata2.getChunkGroups().size());
-        for (int i = 0; i < metadata1.getChunkGroups().size(); i++) {
-          Utils.isChunkGroupMetaDataEqual(metadata1.getChunkGroups().get(i),
-              metadata1.getChunkGroups().get(i));
+        assertEquals(metadata1.getChunkGroupMetaDataList().size(), metadata2.getChunkGroupMetaDataList().size());
+        for (int i = 0; i < metadata1.getChunkGroupMetaDataList().size(); i++) {
+          Utils.isChunkGroupMetaDataEqual(metadata1.getChunkGroupMetaDataList().get(i),
+              metadata1.getChunkGroupMetaDataList().get(i));
         }
       }
     }