[incubator-iotdb] branch master updated: add compaction resource delete (#1741)

[qi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 5160615  add compaction resource delete (#1741)
5160615 is described below

commit 5160615ba5e3d4324913949e2f9912940d549673
Author: zhanglingzhe0820 <44...@qq.com>
AuthorDate: Sun Sep 20 15:05:05 2020 +0800

    add compaction resource delete (#1741)
---
 .../org/apache/iotdb/db/engine/storagegroup/TsFileResource.java   | 8 ++++++++
 .../db/engine/tsfilemanagement/level/LevelTsFileManagement.java   | 4 +---
 .../main/java/org/apache/iotdb/db/engine/upgrade/UpgradeTask.java | 4 +---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
index 0d0f5cb..2cbb7b8 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
@@ -814,4 +814,12 @@ public class TsFileResource {
     }
     return maxVersion;
   }
+
+  public void delete() throws IOException {
+    if (file.exists()) {
+      Files.delete(file.toPath());
+      Files.delete(FSFactoryProducer.getFSFactory()
+          .getFile(file.toPath() + TsFileResource.RESOURCE_SUFFIX).toPath());
+    }
+  }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/tsfilemanagement/level/LevelTsFileManagement.java b/server/src/main/java/org/apache/iotdb/db/engine/tsfilemanagement/level/LevelTsFileManagement.java
index 392373e..5e66250 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/tsfilemanagement/level/LevelTsFileManagement.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/tsfilemanagement/level/LevelTsFileManagement.java
@@ -101,9 +101,7 @@ public class LevelTsFileManagement extends TsFileManagement {
       ChunkMetadataCache.getInstance().remove(seqFile);
       FileReaderManager.getInstance().closeFileAndRemoveReader(seqFile.getTsFilePath());
       seqFile.setDeleted(true);
-      if (seqFile.getTsFile().exists()) {
-        Files.delete(seqFile.getTsFile().toPath());
-      }
+      seqFile.delete();
     } catch (IOException e) {
       logger.error(e.getMessage(), e);
     } finally {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeTask.java b/server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeTask.java
index 920e104..7f4e4ca 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeTask.java
@@ -60,9 +60,7 @@ public class UpgradeTask extends WrappedRunnable {
       String oldModificationFilePath = oldTsfilePath + ModificationFile.FILE_SUFFIX;
       try {
         // delete old TsFile and resource
-        Files.delete(FSFactoryProducer.getFSFactory().getFile(oldTsfilePath).toPath());
-        Files.delete(FSFactoryProducer.getFSFactory()
-            .getFile(oldTsfilePath + TsFileResource.RESOURCE_SUFFIX).toPath());
+        upgradeResource.delete();
         File modificationFile = FSFactoryProducer.getFSFactory().getFile(oldModificationFilePath);
         // move upgraded TsFiles and modificationFile to their own partition directories
         for (TsFileResource upgradedResource : upgradedResources) {