(iotdb) branch master updated: Load: Avoid potential NPE in warn log when LoadRuntimeOutOfMemoryException occurs & load-tsfile: Polish logs (#12777)

[rong]

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

rong 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 e58d427f2f6 Load: Avoid potential NPE in warn log when 
LoadRuntimeOutOfMemoryException occurs & load-tsfile: Polish logs (#12777)
e58d427f2f6 is described below

commit e58d427f2f6b5aee552d68c4a9bfac813b6d0073
Author: Steve Yurong Su <r...@apache.org>
AuthorDate: Thu Jun 20 23:30:44 2024 +0800

    Load: Avoid potential NPE in warn log when LoadRuntimeOutOfMemoryException 
occurs & load-tsfile: Polish logs (#12777)
---
 .../java/org/apache/iotdb/tool/ImportTsFile.java   | 22 ++++++++++++----------
 .../queryengine/plan/analyze/AnalyzeVisitor.java   |  4 +++-
 .../plan/analyze/LoadTsfileAnalyzer.java           |  4 +---
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git 
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java 
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java
index 320b03334df..e0f1a906aca 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportTsFile.java
@@ -20,7 +20,6 @@
 package org.apache.iotdb.tool;
 
 import org.apache.iotdb.cli.utils.IoTPrinter;
-import org.apache.iotdb.exception.ArgsErrorException;
 import org.apache.iotdb.session.pool.SessionPool;
 
 import org.apache.commons.cli.CommandLine;
@@ -204,29 +203,32 @@ public class ImportTsFile extends AbstractTsFileTool {
       ioTPrinter.println("Encounter an error when parsing the provided 
options: " + e.getMessage());
       System.exit(CODE_ERROR);
     }
-    int resultCode = importFromTargetPath();
+
+    final int resultCode = importFromTargetPath();
     ioTPrinter.println(
         "Successfully load "
             + loadFileSuccessfulNum.sum()
-            + " files ("
+            + " file(s) (--on_success operation(s): "
             + processingLoadSuccessfulFileSuccessfulNum.sum()
-            + " files operations succeed, "
+            + " succeed, "
             + (loadFileSuccessfulNum.sum() - 
processingLoadSuccessfulFileSuccessfulNum.sum())
             + " failed)");
     ioTPrinter.println(
-        "Failed load "
+        "Failed to load "
             + loadFileFailedNum.sum()
-            + " files ("
+            + " file(s) (--on_fail operation(s): "
             + processingLoadFailedFileSuccessfulNum.sum()
-            + " files operations succeed, "
+            + " succeed, "
             + (loadFileFailedNum.sum() - 
processingLoadFailedFileSuccessfulNum.sum())
             + " failed)");
-    ioTPrinter.println("Total operation time(ms) : " + 
(System.currentTimeMillis() - startTime));
-    ioTPrinter.println("Work has been completed");
+    ioTPrinter.println("For more details, please check the log.");
+    ioTPrinter.println(
+        "Total operation time: " + (System.currentTimeMillis() - startTime) + 
" ms.");
+    ioTPrinter.println("Work has been completed!");
     System.exit(resultCode);
   }
 
-  private static void parseSpecialParams(CommandLine commandLine) throws 
ArgsErrorException {
+  private static void parseSpecialParams(CommandLine commandLine) {
     source = commandLine.getOptionValue(SOURCE_ARGS);
     if (!Files.exists(Paths.get(source))) {
       ioTPrinter.println(String.format("Source file or directory %s does not 
exist", source));
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
index bcd90ceaf1e..6071f29edea 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
@@ -2848,7 +2848,9 @@ public class AnalyzeVisitor extends 
StatementVisitor<Analysis, MPPQueryContext>
 
   @Override
   public Analysis visitLoadFile(LoadTsFileStatement loadTsFileStatement, 
MPPQueryContext context) {
-    long startTime = System.nanoTime();
+    context.setQueryType(QueryType.WRITE);
+
+    final long startTime = System.nanoTime();
     try (final LoadTsfileAnalyzer loadTsfileAnalyzer =
         new LoadTsfileAnalyzer(loadTsFileStatement, context, partitionFetcher, 
schemaFetcher)) {
       return loadTsfileAnalyzer.analyzeFileByFile();
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/LoadTsfileAnalyzer.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/LoadTsfileAnalyzer.java
index 79e84b3400d..b9b229f8705 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/LoadTsfileAnalyzer.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/LoadTsfileAnalyzer.java
@@ -136,9 +136,7 @@ public class LoadTsfileAnalyzer implements AutoCloseable {
   }
 
   public Analysis analyzeFileByFile() {
-    context.setQueryType(QueryType.WRITE);
-
-    Analysis analysis = new Analysis();
+    final Analysis analysis = new Analysis();
 
     // check if the system is read only
     if (CommonDescriptor.getInstance().getConfig().isReadOnly()) {