This is an automated email from the ASF dual-hosted git repository. xingtanzjr pushed a commit to branch compaction_worker_refactor_0928 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d7a71c64a292c8fdbc7d8fab9906743cc099577e Author: Jinrui.Zhang <[email protected]> AuthorDate: Sat Oct 7 17:49:05 2023 +0800 remove resource.delete() method --- .../db/storageengine/dataregion/tsfile/TsFileResource.java | 11 ----------- .../RewriteCrossSpaceCompactionRecoverCompatibleTest.java | 4 ++-- .../recover/SizeTieredCompactionRecoverCompatibleTest.java | 4 ++-- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResource.java index bbd3a17d017..ac29a91e959 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResource.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResource.java @@ -912,17 +912,6 @@ public class TsFileResource { return ramSize; } - public void delete() throws IOException { - forceMarkDeleted(); - if (file.exists()) { - Files.delete(file.toPath()); - Files.delete( - FSFactoryProducer.getFSFactory() - .getFile(file.toPath() + TsFileResource.RESOURCE_SUFFIX) - .toPath()); - } - } - public long getMaxPlanIndex() { return maxPlanIndex; } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/recover/RewriteCrossSpaceCompactionRecoverCompatibleTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/recover/RewriteCrossSpaceCompactionRecoverCompatibleTest.java index f1e8ab7e402..ed90707cd3c 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/recover/RewriteCrossSpaceCompactionRecoverCompatibleTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/recover/RewriteCrossSpaceCompactionRecoverCompatibleTest.java @@ -180,7 +180,7 @@ public class RewriteCrossSpaceCompactionRecoverCompatibleTest extends AbstractCo logWriter.close(); // First seq files lost - seqResources.get(0).delete(); + seqResources.get(0).remove(); for (int i = 0; i < seqResources.size(); i++) { Map<String, Pair<Long, Long>> deleteMap = new HashMap<>(); @@ -352,7 +352,7 @@ public class RewriteCrossSpaceCompactionRecoverCompatibleTest extends AbstractCo logWriter.close(); // First seq files lost - seqResources.get(0).delete(); + seqResources.get(0).remove(); for (int i = 0; i < seqResources.size(); i++) { Map<String, Pair<Long, Long>> deleteMap = new HashMap<>(); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/recover/SizeTieredCompactionRecoverCompatibleTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/recover/SizeTieredCompactionRecoverCompatibleTest.java index 931ab53e85a..35793690f82 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/recover/SizeTieredCompactionRecoverCompatibleTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/recover/SizeTieredCompactionRecoverCompatibleTest.java @@ -138,7 +138,7 @@ public class SizeTieredCompactionRecoverCompatibleTest extends AbstractCompactio Collections.singletonList(targetResource), true, COMPACTION_TEST_SG); // first source file does not exist - seqResources.get(0).delete(); + seqResources.get(0).remove(); for (int i = 0; i < seqResources.size(); i++) { Map<String, Pair<Long, Long>> deleteMap = new HashMap<>(); @@ -236,7 +236,7 @@ public class SizeTieredCompactionRecoverCompatibleTest extends AbstractCompactio Collections.singletonList(targetResource), true, "root.compactionTest"); // first source file does not exist - unseqResources.get(0).delete(); + unseqResources.get(0).remove(); for (int i = 0; i < unseqResources.size(); i++) { Map<String, Pair<Long, Long>> deleteMap = new HashMap<>();
