[iotdb] 01/01: Enhancement: add backgroup exec for cli -e function

[ejttianyu]

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

ejttianyu pushed a commit to branch rel0.11_cli_add_back_exec
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 2eeafa187bce9121a4c69b60a76eb8b5b85198fb
Author: EJTTianyu <1653503...@qq.com>
AuthorDate: Mon Feb 8 17:03:23 2021 +0800

    Enhancement: add backgroup exec for cli -e function
---
 cli/src/main/java/org/apache/iotdb/cli/Cli.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/cli/src/main/java/org/apache/iotdb/cli/Cli.java 
b/cli/src/main/java/org/apache/iotdb/cli/Cli.java
index dbeae4b..58af6ec 100644
--- a/cli/src/main/java/org/apache/iotdb/cli/Cli.java
+++ b/cli/src/main/java/org/apache/iotdb/cli/Cli.java
@@ -108,18 +108,13 @@ public class Cli extends AbstractCli {
   }
 
   private static void serve() {
-    try (ConsoleReader reader = new ConsoleReader()) {
-      reader.setExpandEvents(false);
-
+    try {
       host = checkRequiredArg(HOST_ARGS, HOST_NAME, commandLine, false, host);
       port = checkRequiredArg(PORT_ARGS, PORT_NAME, commandLine, false, port);
       username = checkRequiredArg(USERNAME_ARGS, USERNAME_NAME, commandLine, 
true, null);
 
       password = commandLine.getOptionValue(PASSWORD_ARGS);
-      if (password == null) {
-        password = reader.readLine("please input your password:", '\0');
-      }
-      if (hasExecuteSQL) {
+      if (hasExecuteSQL && password != null) {
         try (IoTDBConnection connection = (IoTDBConnection) DriverManager
             .getConnection(Config.IOTDB_URL_PREFIX + host + ":" + port + "/", 
username, password)) {
           properties = connection.getServerProperties();
@@ -130,8 +125,13 @@ public class Cli extends AbstractCli {
           println(IOTDB_CLI_PREFIX + "> can't execute sql because" + 
e.getMessage());
         }
       }
-
-      receiveCommands(reader);
+      try (ConsoleReader reader = new ConsoleReader()) {
+        reader.setExpandEvents(false);
+        if (password == null) {
+          password = reader.readLine("please input your password:", '\0');
+        }
+        receiveCommands(reader);
+      }
     } catch (ArgsErrorException e) {
       println(IOTDB_CLI_PREFIX + "> input params error because" + 
e.getMessage());
     } catch (Exception e) {