(iotdb) branch master updated: fix fail file directory when import tools failed (#12864)

[haonan]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d1df0ef84e7 fix fail file directory when import tools failed (#12864)
d1df0ef84e7 is described below

commit d1df0ef84e7fdcd98a77462a0de8258902e833bd
Author: Summer <43237967+2b3c...@users.noreply.github.com>
AuthorDate: Sat Jul 6 12:42:12 2024 +0800

    fix fail file directory when import tools failed (#12864)
    
    * fix fail file directory when import tools failed
    
    * mvn spotless::apply
    
    ---------
    
    Co-authored-by: 2b3c511 <rong...@timecho.com>
---
 iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportData.java   | 2 ++
 iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportSchema.java | 2 ++
 2 files changed, 4 insertions(+)

diff --git 
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportData.java 
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportData.java
index fac86ac07fd..ec6ef94d47c 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportData.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportData.java
@@ -268,6 +268,8 @@ public class ImportData extends AbstractDataTool {
       if (!file.isDirectory()) {
         file.mkdir();
         failedFileDirectory = file.getAbsolutePath() + File.separator;
+      } else if (!failedFileDirectory.endsWith("/") && 
!failedFileDirectory.endsWith("\\")) {
+        failedFileDirectory += File.separator;
       }
     }
     if (commandLine.getOptionValue(ALIGNED_ARGS) != null) {
diff --git 
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportSchema.java 
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportSchema.java
index 610c9e1f756..3a7b8ab60e5 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportSchema.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportSchema.java
@@ -163,6 +163,8 @@ public class ImportSchema extends AbstractSchemaTool {
       if (!file.isDirectory()) {
         file.mkdir();
         failedFileDirectory = file.getAbsolutePath() + File.separator;
+      } else if (!failedFileDirectory.endsWith("/") && 
!failedFileDirectory.endsWith("\\")) {
+        failedFileDirectory += File.separator;
       }
     }
     if (commandLine.getOptionValue(ALIGNED_ARGS) != null) {