This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch rel/1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.2 by this push:
new 26a86700582 [To rel/1.2] Change display nums to fixed 1000 (#11039)
26a86700582 is described below
commit 26a86700582af11d481193d1febda6d991c91aa5
Author: CritasWang <[email protected]>
AuthorDate: Wed Sep 6 20:26:55 2023 +0800
[To rel/1.2] Change display nums to fixed 1000 (#11039)
---
.../apache/iotdb/cli/it/StartClientScriptIT.java | 32 -------------
.../cli/src/assembly/resources/sbin/start-cli.sh | 2 +-
.../java/org/apache/iotdb/cli/AbstractCli.java | 56 +---------------------
.../src/main/java/org/apache/iotdb/cli/Cli.java | 3 --
.../java/org/apache/iotdb/cli/AbstractCliIT.java | 39 ---------------
5 files changed, 2 insertions(+), 130 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/cli/it/StartClientScriptIT.java
b/integration-test/src/test/java/org/apache/iotdb/cli/it/StartClientScriptIT.java
index 82db931632a..fff637de71b 100644
---
a/integration-test/src/test/java/org/apache/iotdb/cli/it/StartClientScriptIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/cli/it/StartClientScriptIT.java
@@ -102,8 +102,6 @@ public class StartClientScriptIT extends AbstractScript {
ip,
"-p",
port,
- "-maxPRC",
- "0",
"-e",
"\"flush\"",
"&",
@@ -111,22 +109,6 @@ public class StartClientScriptIT extends AbstractScript {
"%^errorlevel%");
builder2.environment().put("CLASSPATH", libPath);
testOutput(builder2, output2, 0);
-
- final String[] output3 = {
- "Error: error format of max print row count, it should be an integer
number"
- };
- ProcessBuilder builder3 =
- new ProcessBuilder(
- "cmd.exe",
- "/c",
- sbinPath + File.separator + "start-cli.bat",
- "-maxPRC",
- "-1111111111111111111111111111",
- "&",
- "exit",
- "%^errorlevel%");
- builder3.environment().put("CLASSPATH", libPath);
- testOutput(builder3, output3, 1);
}
@Override
@@ -158,23 +140,9 @@ public class StartClientScriptIT extends AbstractScript {
ip,
"-p",
port,
- "-maxPRC",
- "0",
"-e",
"\"flush\"");
builder2.environment().put("CLASSPATH", libPath);
testOutput(builder2, output2, 0);
-
- final String[] output3 = {
- "Error: error format of max print row count, it should be an integer
number"
- };
- ProcessBuilder builder3 =
- new ProcessBuilder(
- "sh",
- sbinPath + File.separator + "start-cli.sh",
- "-maxPRC",
- "-1111111111111111111111111111");
- builder3.environment().put("CLASSPATH", libPath);
- testOutput(builder3, output3, 1);
}
}
diff --git a/iotdb-client/cli/src/assembly/resources/sbin/start-cli.sh
b/iotdb-client/cli/src/assembly/resources/sbin/start-cli.sh
index e384cfa728e..fd92cb15fbb 100755
--- a/iotdb-client/cli/src/assembly/resources/sbin/start-cli.sh
+++ b/iotdb-client/cli/src/assembly/resources/sbin/start-cli.sh
@@ -78,7 +78,7 @@ while true; do
shift 2
;;
--help)
- echo "Usage: $0 [-h <ip>] [-p <port>] [-u <username>] [-pw
<password>] [-D <name=value>] [-c] [-e sql] [-maxPRC <PRC size>]"
+ echo "Usage: $0 [-h <ip>] [-p <port>] [-u <username>] [-pw
<password>] [-D <name=value>] [-c] [-e sql]"
exit 0
;;
"")
diff --git
a/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
b/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
index 443a4c51f36..b9663cb3514 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
@@ -78,13 +78,10 @@ public abstract class AbstractCli {
static final String ISO8601_ARGS = "disableISO8601";
static final List<String> AGGREGRATE_TIME_LIST = new ArrayList<>();
- static final String MAX_PRINT_ROW_COUNT_ARGS = "maxPRC";
- private static final String MAX_PRINT_ROW_COUNT_NAME = "maxPrintRowCount";
static final String RPC_COMPRESS_ARGS = "c";
private static final String RPC_COMPRESS_NAME = "rpcCompressed";
static final String TIMEOUT_ARGS = "timeout";
private static final String TIMEOUT_NAME = "queryTimeout";
- static final String SET_MAX_DISPLAY_NUM = "set max_display_num";
static final String SET_TIMESTAMP_DISPLAY = "set time_display_type";
static final String SHOW_TIMESTAMP_DISPLAY = "show time_display_type";
static final String SET_TIME_ZONE = "set time_zone";
@@ -135,7 +132,6 @@ public abstract class AbstractCli {
keywordSet.add("-" + USERNAME_ARGS);
keywordSet.add("-" + EXECUTE_ARGS);
keywordSet.add("-" + ISO8601_ARGS);
- keywordSet.add("-" + MAX_PRINT_ROW_COUNT_ARGS);
keywordSet.add("-" + RPC_COMPRESS_ARGS);
}
@@ -186,14 +182,6 @@ public abstract class AbstractCli {
.build();
options.addOption(execute);
- Option maxPrintCount =
- Option.builder(MAX_PRINT_ROW_COUNT_ARGS)
- .argName(MAX_PRINT_ROW_COUNT_NAME)
- .hasArg()
- .desc("Maximum number of rows displayed (optional)")
- .build();
- options.addOption(maxPrintCount);
-
Option isRpcCompressed =
Option.builder(RPC_COMPRESS_ARGS)
.argName(RPC_COMPRESS_NAME)
@@ -261,17 +249,6 @@ public abstract class AbstractCli {
return CODE_OK;
}
- static void setMaxDisplayNumber(String maxDisplayNum) {
- long tmp = Long.parseLong(maxDisplayNum.trim());
- if (tmp > Integer.MAX_VALUE) {
- throw new NumberFormatException();
- } else if (tmp <= 0) {
- continuePrint = true;
- } else {
- maxPrintRowCount = Integer.parseInt(maxDisplayNum.trim());
- }
- }
-
static void setQueryTimeout(String timeoutString) {
long timeout = Long.parseLong(timeoutString.trim());
if (timeout > Integer.MAX_VALUE || timeout < 0) {
@@ -389,11 +366,6 @@ public abstract class AbstractCli {
return OperationResult.CONTINUE_OPER;
}
- if (specialCmd.startsWith(SET_MAX_DISPLAY_NUM)) {
- lastProcessStatus = setMaxDisplayNum(specialCmd, cmd);
- return OperationResult.CONTINUE_OPER;
- }
-
if (specialCmd.startsWith(SHOW_TIMEZONE)) {
lastProcessStatus = showTimeZone(connection);
return OperationResult.CONTINUE_OPER;
@@ -431,10 +403,6 @@ public abstract class AbstractCli {
String.format(
" %s=xxx\t\t set fetch size when querying data from server.",
SET_FETCH_SIZE));
println(String.format(" %s\t\t show fetch size", SHOW_FETCH_SIZE));
- println(
- String.format(
- " %s=xxx\t eg. set max lines for cli to ouput, -1 equals to
unlimited.",
- SET_MAX_DISPLAY_NUM));
}
private static int setTimestampDisplay(String specialCmd, String cmd) {
@@ -480,25 +448,6 @@ public abstract class AbstractCli {
return CODE_OK;
}
- private static int setMaxDisplayNum(String specialCmd, String cmd) {
- String[] values = specialCmd.split("=");
- if (values.length != 2) {
- println(
- String.format(
- "Max display number format error, please input like %s = 10000",
- SET_MAX_DISPLAY_NUM));
- return CODE_ERROR;
- }
- try {
- setMaxDisplayNumber(cmd.split("=")[1]);
- } catch (Exception e) {
- println(String.format("Max display number format error, %s",
e.getMessage()));
- return CODE_ERROR;
- }
- println("Max display number has set to " + values[1].trim());
- return CODE_OK;
- }
-
private static int showTimeZone(IoTDBConnection connection) {
try {
println("Current time zone: " + connection.getTimeZone());
@@ -558,10 +507,7 @@ public abstract class AbstractCli {
output(lists, maxSizeList);
continue;
}
- println(
- String.format(
- "Reach the max_display_num = %s. Press ENTER to show more,
input 'q' to quit.",
- maxPrintRowCount));
+ println("This display 1000 rows. Press ENTER to show more, input
'q' to quit.");
BufferedReader br = new BufferedReader(new
InputStreamReader(System.in));
try {
if ("".equals(br.readLine())) {
diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/Cli.java
b/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/Cli.java
index 41c358777e8..b65d16ad288 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/Cli.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/Cli.java
@@ -108,9 +108,6 @@ public class Cli extends AbstractCli {
if (commandLine.hasOption(ISO8601_ARGS)) {
timeFormat = RpcUtils.setTimeFormat("long");
}
- if (commandLine.hasOption(MAX_PRINT_ROW_COUNT_ARGS)) {
-
setMaxDisplayNumber(commandLine.getOptionValue(MAX_PRINT_ROW_COUNT_ARGS));
- }
if (commandLine.hasOption(TIMEOUT_ARGS)) {
setQueryTimeout(commandLine.getOptionValue(TIMEOUT_ARGS));
}
diff --git
a/iotdb-client/cli/src/test/java/org/apache/iotdb/cli/AbstractCliIT.java
b/iotdb-client/cli/src/test/java/org/apache/iotdb/cli/AbstractCliIT.java
index 5423dffbdc2..3eff61ceaf2 100644
--- a/iotdb-client/cli/src/test/java/org/apache/iotdb/cli/AbstractCliIT.java
+++ b/iotdb-client/cli/src/test/java/org/apache/iotdb/cli/AbstractCliIT.java
@@ -67,7 +67,6 @@ public class AbstractCliIT {
AbstractCli.PW_ARGS,
AbstractCli.USERNAME_ARGS,
AbstractCli.ISO8601_ARGS,
- AbstractCli.MAX_PRINT_ROW_COUNT_ARGS,
};
for (String keyword : keywords) {
if (!AbstractCli.keywordSet.contains("-" + keyword)) {
@@ -168,20 +167,6 @@ public class AbstractCliIT {
AbstractCli.handleInputCmd(
String.format("%s=default", AbstractCli.SET_TIMESTAMP_DISPLAY),
connection));
- assertEquals(
- OperationResult.CONTINUE_OPER,
- AbstractCli.handleInputCmd(
- String.format("%s=", AbstractCli.SET_MAX_DISPLAY_NUM),
connection));
- assertEquals(
- OperationResult.CONTINUE_OPER,
- AbstractCli.handleInputCmd(
- String.format("%s=xxx", AbstractCli.SET_MAX_DISPLAY_NUM),
connection));
- assertEquals(
- OperationResult.CONTINUE_OPER,
- AbstractCli.handleInputCmd(
- String.format("%s=1", AbstractCli.SET_MAX_DISPLAY_NUM),
connection));
- testSetMaxDisplayNumber();
-
assertEquals(
OperationResult.CONTINUE_OPER,
AbstractCli.handleInputCmd(AbstractCli.SHOW_TIMEZONE, connection));
@@ -209,28 +194,4 @@ public class AbstractCliIT {
AbstractCli.handleInputCmd(
String.format("%s=111", AbstractCli.SET_FETCH_SIZE), connection));
}
-
- private void testSetMaxDisplayNumber() {
- try {
- AbstractCli.setMaxDisplayNumber("10");
- } catch (NumberFormatException e) {
- fail();
- }
-
- try {
- AbstractCli.setMaxDisplayNumber("111111111111111");
- fail();
- } catch (NumberFormatException ignored) {
- }
-
- try {
- AbstractCli.setMaxDisplayNumber("-10");
- } catch (NumberFormatException ignored) {
- }
-
- try {
- AbstractCli.setMaxDisplayNumber("0");
- } catch (NumberFormatException ignored) {
- }
- }
}
