[incubator-iotdb] branch jira_681 created (now f574b09)

[su...@apache.org]

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

sunzesong pushed a change to branch jira_681
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


      at f574b09  [IOTDB-681] Fix bugs caused by batch manner displaying query results in CLI

This branch includes the following new commits:

     new f574b09  [IOTDB-681] Fix bugs caused by batch manner displaying query results in CLI

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.

[incubator-iotdb] 01/01: [IOTDB-681] Fix bugs caused by batch manner displaying query results in CLI

[su...@apache.org]

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

sunzesong pushed a commit to branch jira_681
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit f574b097f537dd6e91ef9c3ea0f289c38c8f7db5
Author: samperson1997 <sz...@mails.tsinghua.edu.cn>
AuthorDate: Sat May 16 23:29:41 2020 +0800

    [IOTDB-681] Fix bugs caused by batch manner displaying query results in CLI
---
 cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java b/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
index 068b5be..b1b831d 100644
--- a/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
+++ b/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
@@ -564,11 +564,12 @@ public abstract class AbstractCli {
               e.printStackTrace();
             }
           }
-          resetArgs();
         }
       }
     } catch (Exception e) {
       println("Msg: " + e.getMessage());
+    } finally {
+      resetArgs();
     }
   }
 
@@ -606,8 +607,8 @@ public abstract class AbstractCli {
       }
     }
     int j = 0;
-    isReachEnd = !resultSet.next();
     if (cursorBeforeFirst) {
+      isReachEnd = !resultSet.next();
       cursorBeforeFirst = false;
     }
     if (resultSet instanceof IoTDBJDBCResultSet) {