You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/06/13 11:52:01 UTC
[iotdb] branch fix_name created (now 3926a295e3)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch fix_name
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 3926a295e3 Rename deleteDirectoryAndParent to deleteDirectoryAndEmptyParent in FileUtils
This branch includes the following new commits:
new 3926a295e3 Rename deleteDirectoryAndParent to deleteDirectoryAndEmptyParent in FileUtils
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: Rename deleteDirectoryAndParent to deleteDirectoryAndEmptyParent in FileUtils
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch fix_name
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 3926a295e35d63d5db07bae77bdba0d229f3fdd7
Author: qiaojialin <64...@qq.com>
AuthorDate: Mon Jun 13 19:51:43 2022 +0800
Rename deleteDirectoryAndParent to deleteDirectoryAndEmptyParent in FileUtils
---
.../src/main/java/org/apache/iotdb/commons/utils/FileUtils.java | 2 +-
.../main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/utils/FileUtils.java b/node-commons/src/main/java/org/apache/iotdb/commons/utils/FileUtils.java
index aa70788e6e..cfc112e352 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/utils/FileUtils.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/utils/FileUtils.java
@@ -57,7 +57,7 @@ public class FileUtils {
}
}
- public static void deleteDirectoryAndParent(File folder) {
+ public static void deleteDirectoryAndEmptyParent(File folder) {
deleteDirectory(folder);
final File parentFolder = folder.getParentFile();
if (parentFolder.isDirectory()
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
index 93abb953b0..09150a2c5e 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
@@ -1621,7 +1621,7 @@ public class DataRegion {
File dataRegionSystemFolder =
SystemFileFactory.INSTANCE.getFile(
systemDir + File.separator + logicalStorageGroupName, dataRegionId);
- org.apache.iotdb.commons.utils.FileUtils.deleteDirectoryAndParent(dataRegionSystemFolder);
+ org.apache.iotdb.commons.utils.FileUtils.deleteDirectoryAndEmptyParent(dataRegionSystemFolder);
} finally {
writeUnlock();
}
@@ -1677,7 +1677,7 @@ public class DataRegion {
File dataRegionDataFolder =
fsFactory.getFile(tsfilePath, logicalStorageGroupName + File.separator + dataRegionId);
if (dataRegionDataFolder.exists()) {
- org.apache.iotdb.commons.utils.FileUtils.deleteDirectoryAndParent(dataRegionDataFolder);
+ org.apache.iotdb.commons.utils.FileUtils.deleteDirectoryAndEmptyParent(dataRegionDataFolder);
}
}
}