[iotdb] branch master updated: [IOTDB-1149]finish continue print for -e param when set maxPRC<=0 (#2649)

[qi...@apache.org]

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

qiaojialin 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 425b35d  [IOTDB-1149]finish continue print for -e param when set maxPRC<=0 (#2649)
425b35d is described below

commit 425b35df65e076df93bf3ff1249e69266a596958
Author: gwmh <16...@qq.com>
AuthorDate: Mon Feb 8 14:51:27 2021 +0800

    [IOTDB-1149]finish continue print for -e param when set maxPRC<=0 (#2649)
---
 cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java   | 12 +++++++++++-
 cli/src/test/java/org/apache/iotdb/cli/AbstractCliIT.java |  2 --
 2 files changed, 11 insertions(+), 3 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 dab4744..0a97fab 100644
--- a/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
+++ b/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
@@ -94,6 +94,7 @@ public abstract class AbstractCli {
   private static int fetchSize = 1000;
   static String timestampPrecision = "ms";
   static String timeFormat = RpcUtils.DEFAULT_TIME_FORMAT;
+  static private boolean continuePrint = false;
 
   private static int lineCount = 0;
   private static final String SUCCESS_MESSAGE = "The statement is executed successfully.";
@@ -204,8 +205,10 @@ public abstract class AbstractCli {
 
   static void setMaxDisplayNumber(String maxDisplayNum) {
     long tmp = Long.parseLong(maxDisplayNum.trim());
-    if (tmp > Integer.MAX_VALUE || tmp <= 0) {
+    if (tmp > Integer.MAX_VALUE) {
       throw new NumberFormatException();
+    } else if (tmp <= 0) {
+      continuePrint = true;
     } else {
       maxPrintRowCount = Integer.parseInt(maxDisplayNum.trim());
     }
@@ -458,6 +461,13 @@ public abstract class AbstractCli {
           long costTime = System.currentTimeMillis() - startTime;
           println(String.format("It costs %.3fs", costTime / 1000.0));
           while (!isReachEnd) {
+            if (continuePrint) {
+              maxSizeList = new ArrayList<>(columnLength);
+              lists = cacheResult(resultSet, maxSizeList, columnLength,
+                  resultSetMetaData, zoneId);
+              output(lists, maxSizeList);
+              continue;
+            }
             println(String.format(
                 "Reach the max_display_num = %s. Press ENTER to show more, input 'q' to quit.",
                 maxPrintRowCount));
diff --git a/cli/src/test/java/org/apache/iotdb/cli/AbstractCliIT.java b/cli/src/test/java/org/apache/iotdb/cli/AbstractCliIT.java
index 0a4142c..1998c94 100644
--- a/cli/src/test/java/org/apache/iotdb/cli/AbstractCliIT.java
+++ b/cli/src/test/java/org/apache/iotdb/cli/AbstractCliIT.java
@@ -195,13 +195,11 @@ public class AbstractCliIT {
 
     try {
       AbstractCli.setMaxDisplayNumber("-10");
-      fail();
     } catch (NumberFormatException ignored) {
     }
 
     try {
       AbstractCli.setMaxDisplayNumber("0");
-      fail();
     } catch (NumberFormatException ignored) {
     }
   }