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

[qiaojialin]

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

qiaojialin pushed a commit to branch rel/0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.11 by this push:
     new f74c60f  [IOTDB-1149]finish continue print for -e param when set 
maxPRC<=0 rel/0.11 (#2650)
f74c60f is described below

commit f74c60fb3833560741e0eb870da5b0451bf39b8d
Author: gwmh <1653503...@qq.com>
AuthorDate: Mon Feb 8 14:51:00 2021 +0800

    [IOTDB-1149]finish continue print for -e param when set maxPRC<=0 rel/0.11 
(#2650)
---
 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 f385799..25eeed7 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 String timeFormat = DEFAULT_TIME_FORMAT;
   static int maxPrintRowCount = 1000;
   private static int fetchSize = 1000;
+  static private boolean continuePrint = false;
   static int maxTimeLength = ISO_DATETIME_LEN;
   static int maxValueLength = 15;
   static String TIMESTAMP_PRECISION = "ms";
@@ -305,8 +306,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());
     }
@@ -559,6 +562,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 342fe0c..d4857a0 100644
--- a/cli/src/test/java/org/apache/iotdb/cli/AbstractCliIT.java
+++ b/cli/src/test/java/org/apache/iotdb/cli/AbstractCliIT.java
@@ -222,13 +222,11 @@ public class AbstractCliIT {
 
     try {
       AbstractCli.setMaxDisplayNumber("-10");
-      fail();
     } catch (NumberFormatException e) {
     }
 
     try {
       AbstractCli.setMaxDisplayNumber("0");
-      fail();
     } catch (NumberFormatException e) {
     }
   }