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:44:26 UTC
[iotdb] branch fix_name created (now 89f832d6b7)
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 89f832d6b7 fix function name
This branch includes the following new commits:
new 89f832d6b7 fix function name
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: fix function name
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 89f832d6b72a359405858800bd9099bb8ba9a39a
Author: qiaojialin <64...@qq.com>
AuthorDate: Mon Jun 13 19:44:08 2022 +0800
fix function name
---
.../src/main/java/org/apache/iotdb/commons/utils/FileUtils.java | 6 ++++--
.../db/mpp/plan/scheduler/{IScheduler.java => IDispatcher.java} | 0
2 files changed, 4 insertions(+), 2 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..7c4d3a6bad 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,12 +57,14 @@ 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()
&& Objects.requireNonNull(parentFolder.listFiles()).length == 0) {
- parentFolder.delete();
+ if (!parentFolder.delete()) {
+ logger.warn("Delete folder failed: {}", parentFolder.getAbsolutePath());
+ }
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/IScheduler.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/IDispatcher.java
similarity index 100%
rename from server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/IScheduler.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/IDispatcher.java