adjust according to review

Author: THUMarkLau

example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileSequenceRead.java

@@ -53,7 +53,7 @@ public class TsFileSequenceRead {
     "squid:S106"
   }) // Suppress high Cognitive Complexity and Standard outputs warning
   public static void main(String[] args) throws IOException {
-    String filename = "C:\\Users\\MARKLAU\\Desktop\\13-13-0-0.tsfile";
+    String filename = "test.tsfile";
     if (args.length >= 1) {
       filename = args[0];
     }

server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java

@@ -506,7 +506,10 @@ public void removeModFile() throws IOException {
     modFile = null;
   }
 
-  /** Remove the data file, its resource file, and its modification file physically. */
+  /**
+   * Remove the data file, its resource file, its chunk metadata temp file, and its modification
+   * file physically.
+   */
   public boolean remove() {
     try {
       fsFactory.deleteIfExists(file);

tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java

@@ -114,7 +114,7 @@ public class TsFileIOWriter implements AutoCloseable {
   // record the total num of path in order to make bloom filter
   protected int pathCount = 0;
   protected boolean enableMemoryControl = false;
-  Path lastSerializePath = null;
+  private Path lastSerializePath = null;
   protected LinkedList<Long> endPosInCMTForDevice = new LinkedList<>();
   public static final String CHUNK_METADATA_TEMP_FILE_SUFFIX = ".cmt";
 
@@ -625,16 +625,15 @@ protected void sortAndFlushChunkMetadata() throws IOException {
       tempOutput = new LocalTsFileOutput(new FileOutputStream(chunkMetadataTempFile));
     }
     hasChunkMetadataInDisk = true;
-    // the file structure in temp file will be
-    // chunkSize | chunkBuffer
     for (Pair<Path, List<IChunkMetadata>> pair : sortedChunkMetadataList) {
       Path seriesPath = pair.left;
-      if (!seriesPath.equals(lastSerializePath)) {
+      boolean isNewPath = !seriesPath.equals(lastSerializePath);
+      if (isNewPath) {
         // record the count of path to construct bloom filter later
         pathCount++;
       }
       List<IChunkMetadata> iChunkMetadataList = pair.right;
-      writeChunkMetadataToTempFile(iChunkMetadataList, seriesPath);
+      writeChunkMetadataToTempFile(iChunkMetadataList, seriesPath, isNewPath);
       lastSerializePath = seriesPath;
       logger.debug("Flushing {}", seriesPath);
     }
@@ -646,7 +645,8 @@ protected void sortAndFlushChunkMetadata() throws IOException {
   }
 
   private void writeChunkMetadataToTempFile(
-      List<IChunkMetadata> iChunkMetadataList, Path seriesPath) throws IOException {
+      List<IChunkMetadata> iChunkMetadataList, Path seriesPath, boolean isNewPath)
+      throws IOException {
     // [DeviceId] measurementId datatype size chunkMetadataBuffer
     if (lastSerializePath == null
         || !seriesPath.getDevice().equals(lastSerializePath.getDevice())) {
@@ -656,7 +656,7 @@ private void writeChunkMetadataToTempFile(
       // for each device, we only serialize it once, in order to save io
       ReadWriteIOUtils.write(seriesPath.getDevice(), tempOutput.wrapAsStream());
     }
-    if (!seriesPath.equals(lastSerializePath) && iChunkMetadataList.size() > 0) {
+    if (isNewPath && iChunkMetadataList.size() > 0) {
       // serialize the public info of this measurement
       ReadWriteIOUtils.writeVar(seriesPath.getMeasurement(), tempOutput.wrapAsStream());
       ReadWriteIOUtils.write(iChunkMetadataList.get(0).getDataType(), tempOutput.wrapAsStream());

tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/tsmiterator/DiskTSMIterator.java

@@ -47,14 +47,14 @@ public class DiskTSMIterator extends TSMIterator {
 
   private static final Logger LOG = LoggerFactory.getLogger(DiskTSMIterator.class);
 
-  LinkedList<Long> endPosForEachDevice;
-  File cmtFile;
-  LocalTsFileInput input;
-  long fileLength = 0;
-  long currentPos = 0;
-  long nextEndPosForDevice = 0;
-  String currentDevice;
-  boolean remainsInFile = true;
+  private LinkedList<Long> endPosForEachDevice;
+  private File cmtFile;
+  private LocalTsFileInput input;
+  private long fileLength = 0;
+  private long currentPos = 0;
+  private long nextEndPosForDevice = 0;
+  private String currentDevice;
+  private boolean remainsInFile = true;
 
   protected DiskTSMIterator(
       File cmtFile,

tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/tsmiterator/TSMIterator.java

@@ -45,8 +45,8 @@
  * source from memory or disk. Static method getTSMIteratorInMemory returns a TSMIterator that reads
  * from memory, and static method getTSMIteratorInDisk returns a TSMIterator that reads from disk.
  */
-public class TSMIterator implements Iterator<Pair<String, TimeseriesMetadata>> {
-  private static Logger LOG = LoggerFactory.getLogger(TSMIterator.class);
+public class TSMIterator {
+  private static final Logger LOG = LoggerFactory.getLogger(TSMIterator.class);
   protected List<Pair<Path, List<IChunkMetadata>>> sortedChunkMetadataList;
   protected Iterator<Pair<Path, List<IChunkMetadata>>> iterator;
 
@@ -66,22 +66,15 @@ public static TSMIterator getTSMIteratorInDisk(
     return new DiskTSMIterator(cmtFile, chunkGroupMetadataList, serializePos);
   }
 
-  @Override
   public boolean hasNext() {
     return iterator.hasNext();
   }
 
-  @Override
-  public Pair<String, TimeseriesMetadata> next() {
+  public Pair<String, TimeseriesMetadata> next() throws IOException {
     Pair<Path, List<IChunkMetadata>> nextPair = iterator.next();
-    try {
-      return new Pair<>(
-          nextPair.left.getFullPath(),
-          constructOneTimeseriesMetadata(nextPair.left.getMeasurement(), nextPair.right));
-    } catch (IOException e) {
-      LOG.error("Meets IOException when getting next TimeseriesMetadata", e);
-      return null;
-    }
+    return new Pair<>(
+        nextPair.left.getFullPath(),
+        constructOneTimeseriesMetadata(nextPair.left.getMeasurement(), nextPair.right));
   }
 
   public static TimeseriesMetadata constructOneTimeseriesMetadata(