This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch rc/1.3.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rc/1.3.3 by this push:
new 2e6d3d91505 hide cli throw about history Exception (#13235)
2e6d3d91505 is described below
commit 2e6d3d91505616e01201fc46fd27fbbbc078b5d7
Author: CritasWang <[email protected]>
AuthorDate: Tue Aug 20 12:13:31 2024 +0800
hide cli throw about history Exception (#13235)
---
iotdb-client/cli/src/main/java/org/apache/iotdb/cli/Cli.java | 5 +++++
.../cli/src/main/java/org/apache/iotdb/cli/utils/JlineUtils.java | 4 ++++
2 files changed, 9 insertions(+)
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 bca535ad3bb..02f2fa46dfd 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
@@ -223,6 +223,11 @@ public class Cli extends AbstractCli {
} catch (EndOfFileException e) {
// Exit on EOF (usually by pressing CTRL+D).
ctx.exit(CODE_OK);
+ } catch (IllegalArgumentException e) {
+ if (e.getMessage().contains("history")) {
+ return false;
+ }
+ throw e;
}
return false;
}
diff --git
a/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/utils/JlineUtils.java
b/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/utils/JlineUtils.java
index d46d72bcdcd..d7b061f5c1e 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/utils/JlineUtils.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/cli/utils/JlineUtils.java
@@ -36,6 +36,8 @@ import java.io.File;
import java.io.IOException;
import java.util.Objects;
import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@ -54,6 +56,8 @@ public class JlineUtils {
public static LineReader getLineReader(CliContext ctx, String username,
String host, String port)
throws IOException {
+ Logger.getLogger("org.jline").setLevel(Level.OFF);
+
// Defaulting to a dumb terminal when a supported terminal can not be
correctly created
// see https://github.com/jline/jline3/issues/291
Terminal terminal;