From e71e7101f0a183384c445c74d694da7649ea5c94 Mon Sep 17 00:00:00 2001
From: qiaojialin <646274302@qq.com>
Date: Wed, 15 Jul 2020 17:47:12 +0800
Subject: [PATCH] rename upgrade to tmp suffix

---
 .../iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 4 ++--
 .../iotdb/db/engine/storagegroup/TsFileProcessor.java       | 6 +++---
 .../apache/iotdb/db/sync/sender/manage/SyncFileManager.java | 2 +-
 .../apache/iotdb/tsfile/common/constant/TsFileConstant.java | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index ab79aecd3a..90ef9515aa 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -22,7 +22,7 @@ import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SEPARATOR;
 import static org.apache.iotdb.db.engine.merge.task.MergeTask.MERGE_SUFFIX;
 import static org.apache.iotdb.db.engine.storagegroup.TsFileResource.TEMP_SUFFIX;
 import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.MERGED_SUFFIX;
-import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.PATH_UPGRADE;
+import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TMP_SUFFIX;
 import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX;
 import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.VM_SUFFIX;
 
@@ -553,7 +553,7 @@ public class StorageGroupProcessor {
         for (File partitionFolder : subFiles) {
           if (partitionFolder.isDirectory()) {
             for (File tmpFile : fsFactory.listFilesBySuffix(partitionFolder.getAbsolutePath(),
-                PATH_UPGRADE)) {
+                TMP_SUFFIX)) {
               Files.delete(tmpFile.toPath());
             }
             for (File mergedFile : fsFactory.listFilesBySuffix(partitionFolder.getAbsolutePath(),
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
index 14670983af..48b4b580e0 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.engine.storagegroup;
 import static org.apache.iotdb.db.conf.adapter.IoTDBConfigDynamicAdapter.MEMTABLE_NUM_FOR_EACH_PARTITION;
 import static org.apache.iotdb.db.engine.flush.VmLogger.VM_LOG_NAME;
 import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.MERGED_SUFFIX;
-import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.PATH_UPGRADE;
+import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TMP_SUFFIX;
 import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.VM_SUFFIX;
 
 import java.io.File;
@@ -683,7 +683,7 @@ public class TsFileProcessor {
         }
       } else {
         File[] tmpFiles = FSFactoryProducer.getFSFactory()
-            .listFilesBySuffix(writer.getFile().getParent(), PATH_UPGRADE);
+            .listFilesBySuffix(writer.getFile().getParent(), TMP_SUFFIX);
         if (tmpFiles.length > 0) {
           for (File file : tmpFiles) {
             Files.delete(file.toPath());
@@ -1178,7 +1178,7 @@ public class TsFileProcessor {
             writer.getFile().getName() + IoTDBConstant.FILE_NAME_SEPARATOR + System
                 .currentTimeMillis()
                 + VM_SUFFIX + IoTDBConstant.PATH_SEPARATOR
-                + PATH_UPGRADE);
+                + TMP_SUFFIX);
       } catch (InterruptedException e) {
         logger.error("{}: {}, closing task is interrupted.",
             storageGroupName, tsFileResource.getTsFile().getName(), e);
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManager.java b/server/src/main/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManager.java
index de5e41da57..bdc1520e8f 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/sender/manage/SyncFileManager.java
@@ -94,7 +94,7 @@ public class SyncFileManager implements ISyncFileManager {
         .listFiles();
     for (File sgFolder : allSgFolders) {
       if (!sgFolder.getName().startsWith(IoTDBConstant.PATH_ROOT) || sgFolder.getName()
-          .equals(TsFileConstant.PATH_UPGRADE)) {
+          .equals(TsFileConstant.TMP_SUFFIX)) {
         continue;
       }
       allSGs.putIfAbsent(sgFolder.getName(), new HashSet<>());
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/TsFileConstant.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/TsFileConstant.java
index 88bf7f7154..b5251721cb 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/TsFileConstant.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/constant/TsFileConstant.java
@@ -25,7 +25,7 @@ public class TsFileConstant {
   public static final String TSFILE_CONF = "TSFILE_CONF";
   public static final String VM_SUFFIX = ".vm";
   public static final String PATH_ROOT = "root";
-  public static final String PATH_UPGRADE = "tmp";
+  public static final String TMP_SUFFIX = "tmp";
   public static final String MERGED_SUFFIX = ".merged";
   public static final String FLUSH_SUFFIX = ".flush";
   public static final String PATH_SEPARATOR = ".";
-- 
GitLab