Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ protected void testOnWindows() throws IOException {
"root",
"-pw",
"root",
"-td",
"-t",
"target",
"-q",
"select * from root.test.t2 where time > 1 and time < 1000000000000",
Expand All @@ -116,7 +116,7 @@ protected void testOnWindows() throws IOException {
"root",
"-pw",
"root",
"-td",
"-t",
"target",
"-q",
"select * from root.test.t2 where time > 1 and time < 1000000000000",
Expand All @@ -143,7 +143,7 @@ protected void testOnUnix() throws IOException {
"root",
"-pw",
"root",
"-td",
"-t",
"target",
"-q",
"select * from root.**");
Expand All @@ -166,7 +166,7 @@ protected void testOnUnix() throws IOException {
"root",
"-pw",
"root",
"-td",
"-t",
"target",
"-q",
"select * from root.**");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -109,7 +109,7 @@ protected static void createBaseOptions() {
.longOpt(HOST_NAME)
.argName(HOST_NAME)
.hasArg()
.desc("Host Name")
.desc("Host Name (optional)")
.build();
options.addOption(opHost);

Expand All @@ -118,7 +118,7 @@ protected static void createBaseOptions() {
.longOpt(PORT_NAME)
.argName(PORT_NAME)
.hasArg()
.desc("Port")
.desc("Port (optional)")
.build();
options.addOption(opPort);

Expand All @@ -127,7 +127,7 @@ protected static void createBaseOptions() {
.longOpt(USERNAME_NAME)
.argName(USERNAME_NAME)
.hasArg()
.desc("Username")
.desc("Username (optional)")
.build();
options.addOption(opUsername);

Expand All @@ -137,7 +137,7 @@ protected static void createBaseOptions() {
.optionalArg(true)
.argName(PW_NAME)
.hasArg()
.desc("Password")
.desc("Password (optional)")
.build();
options.addOption(opPassword);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@

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";
Expand Down Expand Up @@ -265,7 +265,7 @@ private static void createOptions() {

Option opTimeout =
Option.builder(TIMEOUT_ARGS)
.longOpt(TIMEOUT_NAME)
.argName(TIMEOUT_NAME)
.hasArg()
.desc("Timeout for session query")
.build();
Expand Down