This is an automated email from the ASF dual-hosted git repository.
haonan 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 a9d14018812 update import and export tsfile description (#12684)
a9d14018812 is described below
commit a9d1401881231ed2e6fe6482b48c829b2237d5c6
Author: Summer <[email protected]>
AuthorDate: Wed Jun 12 09:40:49 2024 +0800
update import and export tsfile description (#12684)
Co-authored-by: 2b3c511 <[email protected]>
---
.../java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java | 8 ++++----
.../main/java/org/apache/iotdb/tool/AbstractTsFileTool.java | 12 ++++++------
.../src/main/java/org/apache/iotdb/tool/ExportTsFile.java | 10 +++++-----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java
b/integration-test/src/test/java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java
index 71a3d62a382..5994d4d554e 100644
---
a/integration-test/src/test/java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java
@@ -90,7 +90,7 @@ public class ExportTsFileTestIT extends AbstractScript {
"root",
"-pw",
"root",
- "-td",
+ "-t",
"target",
"-q",
"select * from root.test.t2 where time > 1 and time <
1000000000000",
@@ -116,7 +116,7 @@ public class ExportTsFileTestIT extends AbstractScript {
"root",
"-pw",
"root",
- "-td",
+ "-t",
"target",
"-q",
"select * from root.test.t2 where time > 1 and time <
1000000000000",
@@ -143,7 +143,7 @@ public class ExportTsFileTestIT extends AbstractScript {
"root",
"-pw",
"root",
- "-td",
+ "-t",
"target",
"-q",
"select * from root.**");
@@ -166,7 +166,7 @@ public class ExportTsFileTestIT extends AbstractScript {
"root",
"-pw",
"root",
- "-td",
+ "-t",
"target",
"-q",
"select * from root.**");
diff --git
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/AbstractTsFileTool.java
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/AbstractTsFileTool.java
index 4a4ee1dbb11..fe8691ddf8b 100644
---
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/AbstractTsFileTool.java
+++
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/AbstractTsFileTool.java
@@ -42,8 +42,8 @@ public abstract class AbstractTsFileTool {
protected static final String USERNAME_ARGS = "u";
protected static final String USERNAME_NAME = "username";
- protected static final String TIMEOUT_ARGS = "t";
- protected static final String TIMEOUT_NAME = "timeout";
+ protected static final String TIMEOUT_ARGS = "timeout";
+ protected static final String TIMEOUT_NAME = "queryTimeout";
protected static final int MAX_HELP_CONSOLE_WIDTH = 92;
protected static final int CODE_OK = 0;
protected static final int CODE_ERROR = 1;
@@ -109,7 +109,7 @@ public abstract class AbstractTsFileTool {
.longOpt(HOST_NAME)
.argName(HOST_NAME)
.hasArg()
- .desc("Host Name")
+ .desc("Host Name (optional)")
.build();
options.addOption(opHost);
@@ -118,7 +118,7 @@ public abstract class AbstractTsFileTool {
.longOpt(PORT_NAME)
.argName(PORT_NAME)
.hasArg()
- .desc("Port")
+ .desc("Port (optional)")
.build();
options.addOption(opPort);
@@ -127,7 +127,7 @@ public abstract class AbstractTsFileTool {
.longOpt(USERNAME_NAME)
.argName(USERNAME_NAME)
.hasArg()
- .desc("Username")
+ .desc("Username (optional)")
.build();
options.addOption(opUsername);
@@ -137,7 +137,7 @@ public abstract class AbstractTsFileTool {
.optionalArg(true)
.argName(PW_NAME)
.hasArg()
- .desc("Password")
+ .desc("Password (optional)")
.build();
options.addOption(opPassword);
}
diff --git
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
index 5815362ac1e..723e410741e 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
@@ -61,13 +61,13 @@ import java.util.Map;
public class ExportTsFile extends AbstractTsFileTool {
- private static final String TARGET_DIR_ARGS = "td";
+ private static final String TARGET_DIR_ARGS = "t";
private static final String TARGET_DIR_NAME = "targetDirectory";
- private static final String TARGET_FILE_ARGS = "f";
- private static final String TARGET_FILE_NAME = "targetFile";
+ private static final String TARGET_FILE_ARGS = "tfn";
+ private static final String TARGET_FILE_NAME = "targetFileName";
private static final String SQL_FILE_ARGS = "s";
- private static final String SQL_FILE_NAME = "sqlfile";
+ private static final String SQL_FILE_NAME = "sourceSqlFile";
private static final String QUERY_COMMAND_ARGS = "q";
private static final String QUERY_COMMAND_NAME = "queryCommand";
private static final String DUMP_FILE_NAME_DEFAULT = "dump";
@@ -265,7 +265,7 @@ public class ExportTsFile extends AbstractTsFileTool {
Option opTimeout =
Option.builder(TIMEOUT_ARGS)
- .longOpt(TIMEOUT_NAME)
+ .argName(TIMEOUT_NAME)
.hasArg()
.desc("Timeout for session query")
.build();
