merge dev branch

apache · Sep 26, 2024 · 6b3d78d · 6b3d78d
1 parent a871e16
commit 6b3d78d
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 7 deletions.
diff --git a/...5-starter/src/test/java/org/apache/seatunnel/core/starter/flink/FlinkCommandArgsTest.java b/...5-starter/src/test/java/org/apache/seatunnel/core/starter/flink/FlinkCommandArgsTest.java
@@ -20,7 +20,6 @@
 import org.apache.seatunnel.shade.com.typesafe.config.ConfigException;
 
 import org.apache.seatunnel.core.starter.SeaTunnel;
-import org.apache.seatunnel.core.starter.enums.MasterType;
 import org.apache.seatunnel.core.starter.flink.args.FlinkCommandArgs;
 import org.apache.seatunnel.core.starter.flink.multitable.MultiTableSinkTest;
 
@@ -59,7 +58,6 @@ public void testExecuteClientCommandArgsWithoutPluginName()
 
     private static FlinkCommandArgs buildFlinkCommandArgs(String configFile) {
         FlinkCommandArgs flinkCommandArgs = new FlinkCommandArgs();
-        flinkCommandArgs.setMasterType(MasterType.REMOTE);
         flinkCommandArgs.setConfigFile(configFile);
         flinkCommandArgs.setCheckConfig(false);
         flinkCommandArgs.setVariables(null);

diff --git a/.../src/test/java/org/apache/seatunnel/core/starter/flink/multitable/MultiTableSinkTest.java b/.../src/test/java/org/apache/seatunnel/core/starter/flink/multitable/MultiTableSinkTest.java
@@ -18,7 +18,6 @@
 package org.apache.seatunnel.core.starter.flink.multitable;
 
 import org.apache.seatunnel.core.starter.SeaTunnel;
-import org.apache.seatunnel.core.starter.enums.MasterType;
 import org.apache.seatunnel.core.starter.exception.CommandException;
 import org.apache.seatunnel.core.starter.flink.args.FlinkCommandArgs;
 import org.apache.seatunnel.e2e.sink.inmemory.InMemoryAggregatedCommitter;
@@ -45,7 +44,6 @@ public void testMultiTableSink()
         String configurePath = "/config/fake_to_inmemory_multi_table.conf";
         String configFile = getTestConfigFile(configurePath);
         FlinkCommandArgs flinkCommandArgs = new FlinkCommandArgs();
-        flinkCommandArgs.setMasterType(MasterType.REMOTE);
         flinkCommandArgs.setConfigFile(configFile);
         flinkCommandArgs.setCheckConfig(false);
         flinkCommandArgs.setVariables(null);

diff --git a/...src/main/java/org/apache/seatunnel/core/starter/flink/execution/SinkExecuteProcessor.java b/...src/main/java/org/apache/seatunnel/core/starter/flink/execution/SinkExecuteProcessor.java
@@ -229,7 +229,6 @@ public SeaTunnelSink fallbackCreateSink(
         return source;
     }
 
-
     public void handleSaveMode(SeaTunnelSink seaTunnelSink) {
         if (seaTunnelSink instanceof SupportSaveMode) {
             SupportSaveMode saveModeSink = (SupportSaveMode) seaTunnelSink;
@@ -268,7 +267,6 @@ private PluginDiscovery<SeaTunnelSink> getSeaTunnelSinkPluginDiscovery(
                         jarPaths, cfg, ADD_URL_TO_CLASSLOADER);
             default:
                 throw new IllegalArgumentException("unsupported discovery type: " + discoveryType);
-
         }
     }
 }
diff --git a/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel-connector.sh b/seatunnel-core/seatunnel-starter/src/main/bin/seatunnel-connector.sh
@@ -48,4 +48,4 @@ fi
 set +u
 CLASS_PATH=${APP_DIR}/connectors/*:${APP_JAR}:${APP_DIR}/lib/seatunnel-transforms-v2.jar
 
-java -cp ${CLASS_PATH} ${LOAD_CLASS} ${args} | grep -v 'org\.apache\.seatunnel\.plugin\.discovery\.AbstractPluginDiscovery'
+java -cp ${CLASS_PATH} ${LOAD_CLASS} ${args} | grep -v 'org\.apache\.seatunnel\.plugin\.discovery\.AbstractPluginLocalDiscovery'