This is an automated email from the ASF dual-hosted git repository.
fanjia pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new ebaf72c7e [bug]fix commandArgs -t(--check) conflict with flink
deployment t… (#2174)
ebaf72c7e is described below
commit ebaf72c7e2054ad4b7dd75585fe38a1152803370
Author: sandyfog <[email protected]>
AuthorDate: Sat Jul 16 20:40:05 2022 +0800
[bug]fix commandArgs -t(--check) conflict with flink deployment t…
(#2174)
* [bug]fix commandArgs -t(--check) conflict with flink deployment target
* [bug]fix commandArgs -t(--check) conflict with flink deployment target
---
.../seatunnel/core/base/command/AbstractCommandArgs.java | 2 +-
.../apache/seatunnel/core/flink/args/FlinkCommandArgsTest.java | 2 +-
.../seatunnel/core/flink/utils/CommandLineUtilsTest.java | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/core/base/command/AbstractCommandArgs.java
b/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/core/base/command/AbstractCommandArgs.java
index a19fe285f..9042b2c14 100644
---
a/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/core/base/command/AbstractCommandArgs.java
+++
b/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/core/base/command/AbstractCommandArgs.java
@@ -38,7 +38,7 @@ public abstract class AbstractCommandArgs implements
CommandArgs {
private List<String> variables = Collections.emptyList();
// todo: use command type enum
- @Parameter(names = {"-t", "--check"},
+ @Parameter(names = {"-ck", "--check"},
description = "check config")
private boolean checkConfig = false;
diff --git
a/seatunnel-core/seatunnel-core-flink/src/test/java/org/apache/seatunnel/core/flink/args/FlinkCommandArgsTest.java
b/seatunnel-core/seatunnel-core-flink/src/test/java/org/apache/seatunnel/core/flink/args/FlinkCommandArgsTest.java
index 56f4f5e63..a4dba1b27 100644
---
a/seatunnel-core/seatunnel-core-flink/src/test/java/org/apache/seatunnel/core/flink/args/FlinkCommandArgsTest.java
+++
b/seatunnel-core/seatunnel-core-flink/src/test/java/org/apache/seatunnel/core/flink/args/FlinkCommandArgsTest.java
@@ -27,7 +27,7 @@ public class FlinkCommandArgsTest {
@Test
public void testParseFlinkArgs() {
- String[] args = {"-c", "app.conf", "-t", "-i", "city=shenyang", "-i",
"date=20200202"};
+ String[] args = {"-c", "app.conf", "-ck", "-i", "city=shenyang", "-i",
"date=20200202"};
FlinkCommandArgs flinkArgs = new FlinkCommandArgs();
JCommander.newBuilder()
.addObject(flinkArgs)
diff --git
a/seatunnel-core/seatunnel-core-flink/src/test/java/org/apache/seatunnel/core/flink/utils/CommandLineUtilsTest.java
b/seatunnel-core/seatunnel-core-flink/src/test/java/org/apache/seatunnel/core/flink/utils/CommandLineUtilsTest.java
index fe206c0f5..2befcdbe8 100644
---
a/seatunnel-core/seatunnel-core-flink/src/test/java/org/apache/seatunnel/core/flink/utils/CommandLineUtilsTest.java
+++
b/seatunnel-core/seatunnel-core-flink/src/test/java/org/apache/seatunnel/core/flink/utils/CommandLineUtilsTest.java
@@ -34,14 +34,14 @@ public class CommandLineUtilsTest {
@Test
public void testParseCommandArgs() {
- String[] args = {"--detached", "-c", "app.conf", "-t", "-i",
"city=shenyang", "-i", "date=20200202",
+ String[] args = {"--detached", "-c", "app.conf", "-ck", "-i",
"city=shenyang", "-i", "date=20200202",
"-r", "run-application", "--unkown", "unkown-command"};
FlinkCommandArgs flinkCommandArgs =
CommandLineUtils.parseCommandArgs(args, FlinkJobType.JAR);
Assert.assertEquals(flinkCommandArgs.getFlinkParams(),
Arrays.asList("--detached", "--unkown", "unkown-command"));
Assert.assertEquals(flinkCommandArgs.getRunMode(),
FlinkRunMode.APPLICATION_RUN);
Assert.assertEquals(flinkCommandArgs.getVariables(),
Arrays.asList("city=shenyang", "date=20200202"));
- String[] args1 = {"--detached", "-c", "app.conf", "-t", "-i",
"city=shenyang", "-i", "date=20200202",
+ String[] args1 = {"--detached", "-c", "app.conf", "-ck", "-i",
"city=shenyang", "-i", "date=20200202",
"-r", "run-application", "--unkown", "unkown-command"};
flinkCommandArgs = CommandLineUtils.parseCommandArgs(args1,
FlinkJobType.SQL);
Assert.assertEquals(flinkCommandArgs.getFlinkParams(),
Arrays.asList("--detached", "--unkown", "unkown-command"));
@@ -51,7 +51,7 @@ public class CommandLineUtilsTest {
@Test
public void testBuildFlinkJarCommand() throws FileNotFoundException {
- String[] args = {"--detached", "-c", APP_CONF_PATH, "-t", "-i",
"city=shenyang", "-i", "date=20200202",
+ String[] args = {"--detached", "-c", APP_CONF_PATH, "-ck", "-i",
"city=shenyang", "-i", "date=20200202",
"-r", "run-application", "--unkown", "unkown-command"};
FlinkCommandArgs flinkCommandArgs =
CommandLineUtils.parseCommandArgs(args, FlinkJobType.JAR);
List<String> commands =
CommandLineUtils.buildFlinkCommand(flinkCommandArgs, "CLASS_NAME",
"/path/to/jar");
@@ -65,14 +65,14 @@ public class CommandLineUtilsTest {
Arrays.asList("${FLINK_HOME}/bin/flink", "run-application",
"--detached", "--unkown", "unkown-command", "-c",
"CLASS_NAME", "/path/to/jar", "--config", APP_CONF_PATH,
"--check", "-Dcity=shenyang", "-Ddate=20200202"));
- String[] args1 = {"--detached", "-c", "app.conf", "-t", "-i",
"city=shenyang", "-i", "date=20200202",
+ String[] args1 = {"--detached", "-c", "app.conf", "-ck", "-i",
"city=shenyang", "-i", "date=20200202",
"-r", "run-application", "--unkown", "unkown-command"};
}
@Test
public void testBuildFlinkSQLCommand() throws FileNotFoundException{
- String[] args = {"--detached", "-c", SQL_CONF_PATH, "-t", "-i",
"city=shenyang", "-i", "date=20200202",
+ String[] args = {"--detached", "-c", SQL_CONF_PATH, "-ck", "-i",
"city=shenyang", "-i", "date=20200202",
"-r", "run-application", "--unkown", "unkown-command"};
FlinkCommandArgs flinkCommandArgs =
CommandLineUtils.parseCommandArgs(args, FlinkJobType.SQL);
List<String> commands =
CommandLineUtils.buildFlinkCommand(flinkCommandArgs, "CLASS_NAME",
"/path/to/jar");
