[Draft] Add the number of unseq merge times in TsFile name.

server/src/assembly/resources/conf/logback.xml

@@ -282,6 +282,7 @@
         <appender-ref ref="stdout"/>
     </root>
     <logger level="OFF" name="io.moquette.broker.metrics.MQTTMessageLogger"/>
+    <logger level="debug" name="org.apache.iotdb.db.integration.IoTDBRemovePartitionIT"/>
     <logger level="info" name="org.apache.iotdb.db.service"/>
     <logger level="info" name="org.apache.iotdb.db.conf"/>
     <logger level="info" name="org.apache.iotdb.db.cost.statistic">

server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java

@@ -143,4 +143,12 @@ private IoTDBConstant() {}
 
   // thrift
   public static final int LEFT_SIZE_IN_REQUEST = 4 * 1024 * 1024;
+
+  // change tsFile name
+  public static final int FILE_NAME_SUFFIX_INDEX = 0;
+  public static final int FILE_NAME_SUFFIX_TIME_INDEX = 0;
+  public static final int FILE_NAME_SUFFIX_VERSION_INDEX = 1;
+  public static final int FILE_NAME_SUFFIX_MERGECNT_INDEX = 2;
+  public static final int FILE_NAME_SUFFIX_UNSEQMERGECNT_INDEX = 3;
+  public static final String FILE_NAME_SUFFIX_SEPARATOR = "\\.";
 }

server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java

@@ -392,20 +392,20 @@ public void mergeEndAction(
           mergedFile.delete();
         }
         updateMergeModification(seqFile);
-        if (i == seqFiles.size() - 1) {
-          // FIXME if there is an exception, the the modification file will be not closed.
-          removeMergingModification();
-          isUnseqMerging = false;
-          Files.delete(mergeLog.toPath());
-        }
-      } catch (IOException e) {
-        logger.error(
-            "{} a merge task ends but cannot delete log {}", storageGroupName, mergeLog.toPath());
       } finally {
         doubleWriteUnlock(seqFile);
       }
     }
 
+    try {
+      removeMergingModification();
+      isUnseqMerging = false;
+      Files.delete(mergeLog.toPath());
+    } catch (IOException e) {
+      logger.error(
+          "{} a merge task ends but cannot delete log {}", storageGroupName, mergeLog.toPath());
+    }
+
     logger.info("{} a merge task ends", storageGroupName);
   }
 

server/src/main/java/org/apache/iotdb/db/engine/compaction/level/LevelCompactionTsFileManagement.java

@@ -589,6 +589,7 @@ private void merge(
     }
     isSeqMerging = true;
     long startTimeMillis = System.currentTimeMillis();
+    CompactionLogger compactionLogger = null;
     try {
       logger.info("{} start to filter compaction condition", storageGroupName);
       for (int i = 0; i < currMaxLevel - 1; i++) {
@@ -600,14 +601,13 @@ private void merge(
             isSeqMerging = false;
             merge(isForceFullMerge, getTsFileList(true), mergeResources.get(i), Long.MAX_VALUE);
           } else {
-            CompactionLogger compactionLogger =
-                new CompactionLogger(storageGroupDir, storageGroupName);
+            compactionLogger = new CompactionLogger(storageGroupDir, storageGroupName);
             // log source file list and target file for recover
             for (TsFileResource mergeResource : mergeResources.get(i)) {
               compactionLogger.logFile(SOURCE_NAME, mergeResource.getTsFile());
             }
             File newLevelFile =
-                createNewTsFileName(mergeResources.get(i).get(0).getTsFile(), i + 1);
+                TsFileResource.modifyTsFileNameMergeCnt(mergeResources.get(i).get(0).getTsFile());
             compactionLogger.logSequence(sequence);
             compactionLogger.logFile(TARGET_NAME, newLevelFile);
             List<TsFileResource> toMergeTsFiles = mergeResources.get(i);
@@ -664,6 +664,13 @@ private void merge(
         }
       }
     } catch (Exception e) {
+      if (compactionLogger != null) {
+        try {
+          compactionLogger.close();
+        } catch (IOException ioException) {
+          logger.error("{} Compaction log close fail", storageGroupName + COMPACTION_LOG_NAME);
+        }
+      }
       restoreCompaction();
       logger.error("Error occurred in Compaction Merge thread", e);
     } finally {
@@ -677,13 +684,6 @@ private void merge(
     }
   }
 
-  /** if level < maxLevel-1, the file need compaction else, the file can be merged later */
-  private File createNewTsFileName(File sourceFile, int level) {
-    String path = sourceFile.getPath();
-    String prefixPath = path.substring(0, path.lastIndexOf(FILE_NAME_SEPARATOR) + 1);
-    return new File(prefixPath + level + TSFILE_SUFFIX);
-  }
-
   private List<SortedSet<TsFileResource>> newSequenceTsFileResources(Long k) {
     List<SortedSet<TsFileResource>> newSequenceTsFileResources = new CopyOnWriteArrayList<>();
     for (int i = 0; i < seqLevelNum; i++) {

server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java

@@ -49,12 +49,14 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import static org.apache.iotdb.db.engine.storagegroup.TsFileResource.modifyTsFileNameUnseqMergCnt;
+
 /**
  * MergeFileTask merges the merge temporary files with the seqFiles, either move the merged chunks
  * in the temp files into the seqFiles or move the unmerged chunks into the merge temp files,
  * depending on which one is the majority.
  */
-class MergeFileTask {
+public class MergeFileTask {
 
   private static final Logger logger = LoggerFactory.getLogger(MergeFileTask.class);
 
@@ -196,11 +198,20 @@ private void moveMergedToOld(TsFileResource seqFile) throws IOException {
       }
       updateStartTimeAndEndTime(seqFile, oldFileWriter);
       oldFileWriter.endFile();
-
       updatePlanIndexes(seqFile);
       seqFile.serialize();
       mergeLogger.logFileMergeEnd();
       logger.debug("{} moved merged chunks of {} to the old file", taskName, seqFile);
+
+      newFileWriter.getFile().delete();
+      // change tsFile name
+      File nextMergeVersionFile = modifyTsFileNameUnseqMergCnt(seqFile.getTsFile());
+      fsFactory.moveFile(seqFile.getTsFile(), nextMergeVersionFile);
+      fsFactory.moveFile(
+          fsFactory.getFile(seqFile.getTsFile().getAbsolutePath() + TsFileResource.RESOURCE_SUFFIX),
+          fsFactory.getFile(
+              nextMergeVersionFile.getAbsolutePath() + TsFileResource.RESOURCE_SUFFIX));
+      seqFile.setFile(nextMergeVersionFile);
     } catch (Exception e) {
       restoreOldFile(seqFile);
       throw e;
@@ -327,20 +338,26 @@ private void moveUnmergedToNew(TsFileResource seqFile) throws IOException {
     }
     updateStartTimeAndEndTime(seqFile, fileWriter);
     resource.removeFileReader(seqFile);
+    FileReaderManager.getInstance().closeFileAndRemoveReader(seqFile.getTsFilePath());
     fileWriter.endFile();
 
     updatePlanIndexes(seqFile);
-    seqFile.serialize();
     mergeLogger.logFileMergeEnd();
     logger.debug("{} moved unmerged chunks of {} to the new file", taskName, seqFile);
 
     seqFile.writeLock();
     try {
-      FileReaderManager.getInstance().closeFileAndRemoveReader(seqFile.getTsFilePath());
-      File newMergeFile = seqFile.getTsFile();
-      newMergeFile.delete();
-      fsFactory.moveFile(fileWriter.getFile(), newMergeFile);
-      seqFile.setFile(newMergeFile);
+      seqFile.serialize();
+
+      // change tsFile name
+      seqFile.getTsFile().delete();
+      File nextMergeVersionFile = modifyTsFileNameUnseqMergCnt(seqFile.getTsFile());
+      fsFactory.moveFile(fileWriter.getFile(), nextMergeVersionFile);
+      fsFactory.moveFile(
+          fsFactory.getFile(seqFile.getTsFile().getAbsolutePath() + TsFileResource.RESOURCE_SUFFIX),
+          fsFactory.getFile(
+              nextMergeVersionFile.getAbsolutePath() + TsFileResource.RESOURCE_SUFFIX));
+      seqFile.setFile(nextMergeVersionFile);
     } catch (Exception e) {
       logger.error(e.getMessage(), e);
     } finally {

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

@@ -1239,7 +1239,7 @@ private String getNewTsFileName(long timePartitionId) {
   }
 
   private String getNewTsFileName(long time, long version, int mergeCnt) {
-    return time + FILE_NAME_SEPARATOR + version + FILE_NAME_SEPARATOR + mergeCnt + TSFILE_SUFFIX;
+    return TsFileResource.getNewTsFileName(System.currentTimeMillis(), version, 0, 0);
   }
 
   public void syncCloseOneTsFileProcessor(boolean sequence, TsFileProcessor tsFileProcessor) {
@@ -2466,7 +2466,8 @@ private String getFileNameForLoadingFile(
       return tsfileName;
     }
 
-    return getNewTsFileName(preTime + ((subsequenceTime - preTime) >> 1), subsequenceVersion, 0);
+    return TsFileResource.getNewTsFileName(
+        preTime + ((subsequenceTime - preTime) >> 1), subsequenceVersion, 0, 0);
   }
 
   /**

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

@@ -59,6 +59,15 @@
 import java.util.Random;
 import java.util.Set;
 
+import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SEPARATOR;
+import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SUFFIX_INDEX;
+import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SUFFIX_MERGECNT_INDEX;
+import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SUFFIX_SEPARATOR;
+import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SUFFIX_TIME_INDEX;
+import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SUFFIX_UNSEQMERGECNT_INDEX;
+import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SUFFIX_VERSION_INDEX;
+import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX;
+
 @SuppressWarnings("java:S1135") // ignore todos
 public class TsFileResource {
 
@@ -754,4 +763,127 @@ public long getVersion() {
   public void setTimeIndex(ITimeIndex timeIndex) {
     this.timeIndex = timeIndex;
   }
+
+  // change tsFile name
+
+  public static String getNewTsFileName(long time, long version, int mergeCnt, int unSeqMergeCnt) {
+    return time
+        + FILE_NAME_SEPARATOR
+        + version
+        + FILE_NAME_SEPARATOR
+        + mergeCnt
+        + FILE_NAME_SEPARATOR
+        + unSeqMergeCnt
+        + TSFILE_SUFFIX;
+  }
+
+  public static TsFileName getTsFileName(String FileName) {
+    String[] fileName =
+        FileName.split(FILE_NAME_SUFFIX_SEPARATOR)[FILE_NAME_SUFFIX_INDEX].split(
+            FILE_NAME_SEPARATOR);
+    TsFileName tsFileName =
+        new TsFileName(
+            Long.parseLong(fileName[FILE_NAME_SUFFIX_TIME_INDEX]),
+            Long.parseLong(fileName[FILE_NAME_SUFFIX_VERSION_INDEX]),
+            Integer.parseInt(fileName[FILE_NAME_SUFFIX_MERGECNT_INDEX]),
+            Integer.parseInt(fileName[FILE_NAME_SUFFIX_UNSEQMERGECNT_INDEX]));
+    return tsFileName;
+  }
+
+  public static TsFileResource modifyTsFileNameUnseqMergCnt(TsFileResource tsFileResource) {
+    File tsFile = tsFileResource.getTsFile();
+    String path = tsFile.getParent();
+    TsFileName tsFileName = getTsFileName(tsFileResource.getTsFile().getName());
+    tsFileName.setUnSeqMergeCnt(tsFileName.getUnSeqMergeCnt() + 1);
+    tsFileResource.setFile(
+        new File(
+            path,
+            tsFileName.time
+                + FILE_NAME_SEPARATOR
+                + tsFileName.version
+                + FILE_NAME_SEPARATOR
+                + tsFileName.mergeCnt
+                + FILE_NAME_SEPARATOR
+                + tsFileName.unSeqMergeCnt
+                + TSFILE_SUFFIX));
+    return tsFileResource;
+  }
+
+  public static File modifyTsFileNameUnseqMergCnt(File tsFile) {
+    String path = tsFile.getParent();
+    TsFileName tsFileName = getTsFileName(tsFile.getName());
+    tsFileName.setUnSeqMergeCnt(tsFileName.getUnSeqMergeCnt() + 1);
+    return new File(
+        path,
+        tsFileName.time
+            + FILE_NAME_SEPARATOR
+            + tsFileName.version
+            + FILE_NAME_SEPARATOR
+            + tsFileName.mergeCnt
+            + FILE_NAME_SEPARATOR
+            + tsFileName.unSeqMergeCnt
+            + TSFILE_SUFFIX);
+  }
+
+  public static File modifyTsFileNameMergeCnt(File tsFile) {
+    String path = tsFile.getParent();
+    TsFileName tsFileName = getTsFileName(tsFile.getName());
+    tsFileName.setMergeCnt(tsFileName.getMergeCnt() + 1);
+    return new File(
+        path,
+        tsFileName.time
+            + FILE_NAME_SEPARATOR
+            + tsFileName.version
+            + FILE_NAME_SEPARATOR
+            + tsFileName.mergeCnt
+            + FILE_NAME_SEPARATOR
+            + tsFileName.unSeqMergeCnt
+            + TSFILE_SUFFIX);
+  }
+
+  public static class TsFileName {
+    private long time;
+    private long version;
+    private int mergeCnt;
+    private int unSeqMergeCnt;
+
+    public TsFileName(long time, long version, int mergeCnt, int unSeqMergeCnt) {
+      this.time = time;
+      this.version = version;
+      this.mergeCnt = mergeCnt;
+      this.unSeqMergeCnt = unSeqMergeCnt;
+    }
+
+    public long getTime() {
+      return time;
+    }
+
+    public long getVersion() {
+      return version;
+    }
+
+    public int getMergeCnt() {
+      return mergeCnt;
+    }
+
+    public int getUnSeqMergeCnt() {
+      return unSeqMergeCnt;
+    }
+
+    public void setTime(long time) {
+      this.time = time;
+    }
+
+    public void setVersion(long version) {
+      this.version = version;
+    }
+
+    public void setMergeCnt(int mergeCnt) {
+      this.mergeCnt = mergeCnt;
+    }
+
+    public void setUnSeqMergeCnt(int unSeqMergeCnt) {
+      this.unSeqMergeCnt = unSeqMergeCnt;
+    }
+  }
 }

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

@@ -251,7 +251,7 @@ public static List<AggregateResult> mergeRecordByPath(
 
   public static long splitAndGetTsFileVersion(String tsFileName) {
     String[] names = tsFileName.split(FILE_NAME_SEPARATOR);
-    if (names.length != 3) {
+    if (names.length != 4) {
       return 0;
     }
     return Long.parseLong(names[1]);

server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionChunkTest.java

@@ -85,6 +85,8 @@ public void testAppendMerge() throws IOException, IllegalPathException {
                     + 0
                     + IoTDBConstant.FILE_NAME_SEPARATOR
                     + 1
+                    + IoTDBConstant.FILE_NAME_SEPARATOR
+                    + 0
                     + ".tsfile"));
     TsFileResource targetTsfileResource = new TsFileResource(file);
     RateLimiter compactionWriteRateLimiter = MergeManager.getINSTANCE().getMergeWriteRateLimiter();
@@ -168,6 +170,8 @@ public void testDeserializeMerge() throws IOException, IllegalPathException {
                     + 0
                     + IoTDBConstant.FILE_NAME_SEPARATOR
                     + 1
+                    + IoTDBConstant.FILE_NAME_SEPARATOR
+                    + 0
                     + ".tsfile"));
     TsFileResource targetTsfileResource = new TsFileResource(file);
     RateLimiter compactionWriteRateLimiter = MergeManager.getINSTANCE().getMergeWriteRateLimiter();

server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionMoreDataTest.java

@@ -101,6 +101,8 @@ void prepareFiles(int seqFileNum, int unseqFileNum) throws IOException, WritePro
                       + i
                       + IoTDBConstant.FILE_NAME_SEPARATOR
                       + 0
+                      + IoTDBConstant.FILE_NAME_SEPARATOR
+                      + 0
                       + ".tsfile"));
       TsFileResource tsFileResource = new TsFileResource(file);
       tsFileResource.setClosed(true);
@@ -117,6 +119,8 @@ void prepareFiles(int seqFileNum, int unseqFileNum) throws IOException, WritePro
                       + (10000 + i)
                       + IoTDBConstant.FILE_NAME_SEPARATOR
                       + 0
+                      + IoTDBConstant.FILE_NAME_SEPARATOR
+                      + 0
                       + ".tsfile"));
       TsFileResource tsFileResource = new TsFileResource(file);
       tsFileResource.setClosed(true);
@@ -133,6 +137,8 @@ void prepareFiles(int seqFileNum, int unseqFileNum) throws IOException, WritePro
                     + unseqFileNum
                     + IoTDBConstant.FILE_NAME_SEPARATOR
                     + 0
+                    + IoTDBConstant.FILE_NAME_SEPARATOR
+                    + 0
                     + ".tsfile"));
     TsFileResource tsFileResource = new TsFileResource(file);
     tsFileResource.setClosed(true);