You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by ty...@apache.org on 2023/01/10 11:16:39 UTC

[incubator-seatunnel] branch dev updated (f976d14f9 -> cda1db6d7)

This is an automated email from the ASF dual-hosted git repository.

tyrantlucifer pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git


    from f976d14f9 [Feature][connector][kafka] Supplement the test case in json format (#3889)
     add cda1db6d7 [Feature][Core][Starter] Refactor starter module (#3798)

No new revisions were added by this update.

Summary of changes:
 docs/en/start-v2/kubernetes/kubernetes.mdx         |   2 +-
 .../org/apache/seatunnel/common/config/Common.java |   4 +-
 .../apache/seatunnel/common/config/DeployMode.java |  33 +++---
 seatunnel-core/seatunnel-core-starter/pom.xml      |   7 +-
 .../starter/{Seatunnel.java => SeaTunnel.java}     |   2 +-
 .../org/apache/seatunnel/core/starter/Starter.java |   5 +-
 .../core/starter/command/AbstractCommandArgs.java  |  85 ++++++---------
 .../seatunnel/core/starter/command/Command.java    |   9 +-
 .../core/starter/command/CommandArgs.java          |  39 ++++++-
 .../core/starter/command/CommandBuilder.java       |  25 -----
 .../core/starter/command/DeployModeConverter.java  |  34 ------
 .../core/starter/command/UsageFormatter.java       |  87 +++++++++++++++
 .../core/starter/config/ConfigChecker.java         |  37 -------
 .../core/starter/config/EnvironmentFactory.java    |  82 --------------
 ...nstants.java => SeaTunnelStarterConstants.java} |   2 +-
 .../core/starter/{config => enums}/EngineType.java |  25 ++++-
 .../seatunnel/core/starter/enums/MasterType.java   |  41 +++----
 .../core/starter/{config => enums}/PluginType.java |   9 +-
 .../core/starter/exception/CommandException.java   |   2 +-
 .../starter/exception/TaskExecuteException.java    |   2 +-
 .../starter}/execution/PluginExecuteProcessor.java |  21 ++--
 .../core/starter/execution/RuntimeEnvironment.java |  30 ++++--
 .../core/starter/execution/TaskExecution.java      |   3 +
 .../core/starter/utils/CommandLineUtils.java       |  14 +--
 .../starter/{config => utils}/ConfigBuilder.java   |  49 ++++-----
 .../seatunnel/core/starter/utils/FileUtils.java    |  16 +--
 .../core/starter/utils/FileUtilsTest.java          |   6 ++
 seatunnel-core/seatunnel-flink-starter/pom.xml     |  64 +++++++----
 .../seatunnel/core/starter/flink/FlinkStarter.java |  42 ++++----
 .../{SeatunnelFlink.java => SeaTunnelFlink.java}   |  17 ++-
 .../core/starter/flink/args/FlinkCommandArgs.java  | 120 ++++++++++++++-------
 .../starter/flink/command/FlinkCommandBuilder.java |  34 ------
 ...eCommand.java => FlinkConfValidateCommand.java} |  11 +-
 ...teCommand.java => FlinkTaskExecuteCommand.java} |  20 ++--
 .../flink/config/FlinkApiConfigChecker.java        |  31 ------
 .../core/starter/flink/config/FlinkCommon.java     |  42 --------
 .../flink/config/FlinkEnvironmentFactory.java      |  35 ------
 .../core/starter/flink/config/FlinkRunMode.java    |  43 --------
 .../core/starter/flink/config/StarterConstant.java |  24 -----
 ...va => FlinkAbstractPluginExecuteProcessor.java} |  56 ++++++----
 .../starter/flink/execution/FlinkExecution.java    |  53 ++++-----
 .../flink/execution/FlinkRuntimeEnvironment.java   |  97 +++++++----------
 .../flink/execution/PluginExecuteProcessor.java    |  44 --------
 .../flink/execution/SinkExecuteProcessor.java      |   8 +-
 .../flink/execution/SourceExecuteProcessor.java    |  24 +++--
 .../flink/execution/TransformExecuteProcessor.java |   6 +-
 .../core/starter}/flink/util/ConfigKeyName.java    |   2 +-
 .../core/starter}/flink/util/EnvironmentUtil.java  |   2 +-
 .../core/starter}/flink/util/SchemaUtil.java       |  35 +++++-
 .../core/starter}/flink/util/TableUtil.java        |  16 +--
 .../core/starter/flink/FlinkStarterTest.java       |  60 +++++++----
 .../starter/flink/args/FlinkCommandArgsTest.java   |   3 +-
 seatunnel-core/seatunnel-spark-starter/pom.xml     |  37 +------
 .../{SeatunnelSpark.java => SeaTunnelSpark.java}   |  15 ++-
 .../seatunnel/core/starter/spark/SparkStarter.java |  22 ++--
 .../core/starter/spark/args/SparkCommandArgs.java  |  69 +++++++-----
 .../starter/spark/command/SparkCommandBuilder.java |  35 ------
 ...eCommand.java => SparkConfValidateCommand.java} |  11 +-
 ...teCommand.java => SparkTaskExecuteCommand.java} |  19 ++--
 .../spark/config/SparkApiConfigChecker.java        |  31 ------
 .../spark/config/SparkEnvironmentFactory.java      |  35 ------
 .../core/starter/spark/config/StarterConstant.java |  24 -----
 .../spark/execution/SinkExecuteProcessor.java      |  38 +++----
 .../spark/execution/SourceExecuteProcessor.java    |  13 ++-
 ...va => SparkAbstractPluginExecuteProcessor.java} |  31 +++---
 .../starter/spark/execution/SparkExecution.java    |  32 +++---
 .../spark/execution/SparkRuntimeEnvironment.java   | 105 ++++++++----------
 .../spark/execution/TransformExecuteProcessor.java |  13 ++-
 .../starter/spark/utils/CommandLineUtilsTest.java  |   3 +-
 .../src/test/resources/spark_application.conf      |  41 ++-----
 .../core/starter/seatunnel/CommandLineUtils.java   |  74 -------------
 .../core/starter/seatunnel/SeaTunnelClient.java    |  13 ++-
 .../core/starter/seatunnel/SeaTunnelServer.java    |  13 ++-
 .../starter/seatunnel/args/ClientCommandArgs.java  | 104 ++++++++++--------
 .../seatunnel/args/ExecutionModeConverter.java     |  34 ------
 .../starter/seatunnel/args/ServerCommandArgs.java  |  34 ++----
 .../seatunnel/command/ClientCommandBuilder.java    |  33 ------
 .../seatunnel/command/ClientExecuteCommand.java    |   8 +-
 ...mand.java => SeaTunnelConfValidateCommand.java} |  10 +-
 .../seatunnel/command/ServerCommandBuilder.java    |  30 ------
 .../config/SeaTunnelApiConfigChecker.java          |  31 ------
 .../seatunnel/constant/SeaTunnelConstant.java      |  22 ----
 .../connector/cdc/sqlserver/SqlServerCDCIT.java    |   4 +-
 .../seatunnel/e2e/connector/doris/DorisIT.java     |   2 +-
 .../seatunnel/e2e/connector/iotdb/IoTDBIT.java     |   2 +-
 .../seatunnel/e2e/flink/v2/jdbc/JdbcMysqlIT.java   |   4 +-
 .../seatunnel/e2e/flink/v2/jdbc/JdbcSqliteIT.java  |   6 +-
 .../jdbc/jdbc_mysql_source_and_sink_parallel.conf  |  12 +--
 ...mysql_source_and_sink_parallel_upper_lower.conf |  11 +-
 .../jdbc_postgres_source_and_sink_parallel.conf    |  11 +-
 ...tgres_source_and_sink_parallel_upper_lower.conf |  10 +-
 .../seatunnel/e2e/spark/v2/jdbc/JdbcMysqlIT.java   |   4 +-
 .../seatunnel/e2e/spark/v2/jdbc/JdbcSqliteIT.java  |   6 +-
 .../jdbc/jdbc_mysql_source_and_sink_parallel.conf  |   9 +-
 ...mysql_source_and_sink_parallel_upper_lower.conf |   9 +-
 .../jdbc_postgres_source_and_sink_parallel.conf    |   9 +-
 ...tgres_source_and_sink_parallel_upper_lower.conf |   8 +-
 .../engine/core/parse/JobConfigParser.java         |   4 +-
 .../example/engine/SeaTunnelEngineExample.java     |  12 +--
 .../engine/SeaTunnelEngineServerExample.java       |   8 +-
 .../example/flink/v2/SeaTunnelApiExample.java      |   8 +-
 .../seatunnel/example/spark/v2/ExampleUtils.java   |   8 +-
 seatunnel-plugin-discovery/pom.xml                 |  13 ---
 .../plugin/discovery/AbstractPluginDiscovery.java  |  15 +--
 .../flink/FlinkAbstractPluginDiscovery.java        |  40 -------
 .../discovery/flink/FlinkSinkPluginDiscovery.java  |  32 ------
 .../flink/FlinkSourcePluginDiscovery.java          |  31 ------
 .../SeaTunnelFlinkTransformPluginDiscovery.java    |  32 ------
 .../discovery/spark/SparkSinkPluginDiscovery.java  |  33 ------
 .../spark/SparkSourcePluginDiscovery.java          |  33 ------
 .../spark/SparkTransformPluginDiscovery.java       |  46 --------
 tools/dependencies/known-dependencies.txt          |   1 -
 112 files changed, 1003 insertions(+), 1960 deletions(-)
 rename seatunnel-core/seatunnel-core-starter/src/main/java/org/apache/seatunnel/core/starter/{Seatunnel.java => SeaTunnel.java} (99%)
 delete mode 100644 seatunnel-core/seatunnel-core-starter/src/main/java/org/apache/seatunnel/core/starter/command/CommandBuilder.java
 delete mode 100644 seatunnel-core/seatunnel-core-starter/src/main/java/org/apache/seatunnel/core/starter/command/DeployModeConverter.java
 create mode 100644 seatunnel-core/seatunnel-core-starter/src/main/java/org/apache/seatunnel/core/starter/command/UsageFormatter.java
 delete mode 100644 seatunnel-core/seatunnel-core-starter/src/main/java/org/apache/seatunnel/core/starter/config/ConfigChecker.java
 delete mode 100644 seatunnel-core/seatunnel-core-starter/src/main/java/org/apache/seatunnel/core/starter/config/EnvironmentFactory.java
 rename seatunnel-core/seatunnel-core-starter/src/main/java/org/apache/seatunnel/core/starter/constants/{Constants.java => SeaTunnelStarterConstants.java} (95%)
 rename seatunnel-core/seatunnel-core-starter/src/main/java/org/apache/seatunnel/core/starter/{config => enums}/EngineType.java (56%)
 copy seatunnel-engine/seatunnel-engine-core/src/main/java/org/apache/seatunnel/engine/core/checkpoint/CheckpointType.java => seatunnel-core/seatunnel-core-starter/src/main/java/org/apache/seatunnel/core/starter/enums/MasterType.java (56%)
 rename seatunnel-core/seatunnel-core-starter/src/main/java/org/apache/seatunnel/core/starter/{config => enums}/PluginType.java (87%)
 rename seatunnel-core/{seatunnel-spark-starter/src/main/java/org/apache/seatunnel/core/starter/spark => seatunnel-core-starter/src/main/java/org/apache/seatunnel/core/starter}/execution/PluginExecuteProcessor.java (65%)
 copy seatunnel-apis/seatunnel-api-base/src/main/java/org/apache/seatunnel/apis/base/env/RuntimeEnv.java => seatunnel-core/seatunnel-core-starter/src/main/java/org/apache/seatunnel/core/starter/execution/RuntimeEnvironment.java (57%)
 rename seatunnel-core/seatunnel-core-starter/src/main/java/org/apache/seatunnel/core/starter/{config => utils}/ConfigBuilder.java (51%)
 rename seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/{SeatunnelFlink.java => SeaTunnelFlink.java} (69%)
 delete mode 100644 seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/command/FlinkCommandBuilder.java
 rename seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/command/{FlinkApiConfValidateCommand.java => FlinkConfValidateCommand.java} (74%)
 rename seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/command/{FlinkApiTaskExecuteCommand.java => FlinkTaskExecuteCommand.java} (71%)
 delete mode 100644 seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkApiConfigChecker.java
 delete mode 100644 seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkCommon.java
 delete mode 100644 seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkEnvironmentFactory.java
 delete mode 100644 seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkRunMode.java
 delete mode 100644 seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/StarterConstant.java
 rename seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/{AbstractPluginExecuteProcessor.java => FlinkAbstractPluginExecuteProcessor.java} (56%)
 copy seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/FlinkEnvironment.java => seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/FlinkRuntimeEnvironment.java (81%)
 delete mode 100644 seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/PluginExecuteProcessor.java
 copy {seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel => seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter}/flink/util/ConfigKeyName.java (98%)
 copy {seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel => seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter}/flink/util/EnvironmentUtil.java (98%)
 copy {seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel => seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter}/flink/util/SchemaUtil.java (92%)
 copy {seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel => seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter}/flink/util/TableUtil.java (71%)
 rename seatunnel-core/seatunnel-spark-starter/src/main/java/org/apache/seatunnel/core/starter/spark/{SeatunnelSpark.java => SeaTunnelSpark.java} (66%)
 delete mode 100644 seatunnel-core/seatunnel-spark-starter/src/main/java/org/apache/seatunnel/core/starter/spark/command/SparkCommandBuilder.java
 rename seatunnel-core/seatunnel-spark-starter/src/main/java/org/apache/seatunnel/core/starter/spark/command/{SparkApiConfValidateCommand.java => SparkConfValidateCommand.java} (74%)
 rename seatunnel-core/seatunnel-spark-starter/src/main/java/org/apache/seatunnel/core/starter/spark/command/{SparkApiTaskExecuteCommand.java => SparkTaskExecuteCommand.java} (74%)
 delete mode 100644 seatunnel-core/seatunnel-spark-starter/src/main/java/org/apache/seatunnel/core/starter/spark/config/SparkApiConfigChecker.java
 delete mode 100644 seatunnel-core/seatunnel-spark-starter/src/main/java/org/apache/seatunnel/core/starter/spark/config/SparkEnvironmentFactory.java
 delete mode 100644 seatunnel-core/seatunnel-spark-starter/src/main/java/org/apache/seatunnel/core/starter/spark/config/StarterConstant.java
 rename seatunnel-core/seatunnel-spark-starter/src/main/java/org/apache/seatunnel/core/starter/spark/execution/{AbstractPluginExecuteProcessor.java => SparkAbstractPluginExecuteProcessor.java} (66%)
 copy seatunnel-apis/seatunnel-api-spark/src/main/java/org/apache/seatunnel/spark/SparkEnvironment.java => seatunnel-core/seatunnel-spark-starter/src/main/java/org/apache/seatunnel/core/starter/spark/execution/SparkRuntimeEnvironment.java (56%)
 delete mode 100644 seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/CommandLineUtils.java
 delete mode 100644 seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/args/ExecutionModeConverter.java
 delete mode 100644 seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/command/ClientCommandBuilder.java
 rename seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/command/{ApiConfValidateCommand.java => SeaTunnelConfValidateCommand.java} (76%)
 delete mode 100644 seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/command/ServerCommandBuilder.java
 delete mode 100644 seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/config/SeaTunnelApiConfigChecker.java
 delete mode 100644 seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/constant/SeaTunnelConstant.java
 delete mode 100644 seatunnel-plugin-discovery/src/main/java/org/apache/seatunnel/plugin/discovery/flink/FlinkAbstractPluginDiscovery.java
 delete mode 100644 seatunnel-plugin-discovery/src/main/java/org/apache/seatunnel/plugin/discovery/flink/FlinkSinkPluginDiscovery.java
 delete mode 100644 seatunnel-plugin-discovery/src/main/java/org/apache/seatunnel/plugin/discovery/flink/FlinkSourcePluginDiscovery.java
 delete mode 100644 seatunnel-plugin-discovery/src/main/java/org/apache/seatunnel/plugin/discovery/seatunnel/SeaTunnelFlinkTransformPluginDiscovery.java
 delete mode 100644 seatunnel-plugin-discovery/src/main/java/org/apache/seatunnel/plugin/discovery/spark/SparkSinkPluginDiscovery.java
 delete mode 100644 seatunnel-plugin-discovery/src/main/java/org/apache/seatunnel/plugin/discovery/spark/SparkSourcePluginDiscovery.java
 delete mode 100644 seatunnel-plugin-discovery/src/main/java/org/apache/seatunnel/plugin/discovery/spark/SparkTransformPluginDiscovery.java