You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ge...@apache.org on 2020/01/16 10:34:21 UTC

[incubator-iotdb] 01/01: fix client display.

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

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

commit 659e859376697da6e70e6223df2735b4d460e27a
Author: zhutianci <zh...@gmail.com>
AuthorDate: Thu Jan 16 18:33:55 2020 +0800

    fix client display.
---
 .../org/apache/iotdb/client/AbstractClient.java    | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/client/src/main/java/org/apache/iotdb/client/AbstractClient.java b/client/src/main/java/org/apache/iotdb/client/AbstractClient.java
index 96f29f2..df0d2c9 100644
--- a/client/src/main/java/org/apache/iotdb/client/AbstractClient.java
+++ b/client/src/main/java/org/apache/iotdb/client/AbstractClient.java
@@ -511,20 +511,16 @@ public abstract class AbstractClient {
     if (align) {
       if (printTimestamp) {
         blockLine.append("+").append(StringUtils.repeat('-', maxTimeLength)).append("+");
-      } else {
-        blockLine.append("+");
-      }
-      if (resultSetMetaData.getColumnName(2).equals(GROUPBY_DEVICE_COLUMN_NAME)) {
-        maxValueLength = measurementColumnLength;
-      } else {
-        int tmp = Integer.MIN_VALUE;
-        for (int i = 1; i <= colCount; i++) {
-          int len = resultSetMetaData.getColumnLabel(i).length();
-          tmp = Math.max(tmp, len);
+        if (resultSetMetaData.getColumnName(2).equals(GROUPBY_DEVICE_COLUMN_NAME)) {
+          maxValueLength = measurementColumnLength;
+        } else {
+          int tmp = Integer.MIN_VALUE;
+          for (int i = 1; i <= colCount; i++) {
+            int len = resultSetMetaData.getColumnLabel(i).length();
+            tmp = Math.max(tmp, len);
+          }
+          maxValueLength = tmp;
         }
-        maxValueLength = tmp;
-      }
-      if (printTimestamp) {
         for (int i = 2; i <= colCount; i++) {
           if (i == 2 && resultSetMetaData.getColumnName(2).equals(GROUPBY_DEVICE_COLUMN_NAME)) {
             blockLine.append(StringUtils.repeat('-', deviceColumnLength)).append("+");
@@ -533,8 +529,9 @@ public abstract class AbstractClient {
           }
         }
       } else {
+        blockLine.append("+");
         for (int i = 1; i <= colCount; i++) {
-            blockLine.append(StringUtils.repeat('-', maxValueLength)).append("+");
+          blockLine.append(StringUtils.repeat('-', maxValueLength)).append("+");
         }
       }
     }