[Optimization-2567][core] Merge dinky-executor into dinky-core (DataL…

…inkDC#2568) * [Optimization-2567][core] Merge dinky-executor into dinky-core * fix pom * fix pom --------- Co-authored-by: wenmo <32723967+wenmo@users.noreply.github.com>
jsying1570 · Nov 23, 2023 · 8dfad8c · 8dfad8c
1 parent 3f9bf1c
commit 8dfad8c
Show file tree

Hide file tree

Showing 42 changed files with 49 additions and 181 deletions.
diff --git a/dinky-admin/pom.xml b/dinky-admin/pom.xml
@@ -194,10 +194,6 @@
             <groupId>com.alibaba.fastjson2</groupId>
             <artifactId>fastjson2</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.dinky</groupId>
-            <artifactId>dinky-executor</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.dinky</groupId>
             <artifactId>dinky-alert-base</artifactId>

diff --git a/dinky-admin/src/main/java/org/dinky/service/TaskService.java b/dinky-admin/src/main/java/org/dinky/service/TaskService.java
@@ -66,8 +66,7 @@ public interface TaskService extends ISuperService<Task> {
     /**
      * Submit the given task and return the job result.
      *
-     * @param id The ID of the task to submit.
-     * @param savePointPath The path of the save point for the job execution.
+     * @param submitDto The param of the task to submit.
      * @return A {@link JobResult} object representing the result of the submitted task.
      * @throws ExcuteException If there is an error executing the task.
      */

diff --git a/dinky-app/dinky-app-base/pom.xml b/dinky-app/dinky-app-base/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>org.dinky</groupId>
-            <artifactId>dinky-executor</artifactId>
+            <artifactId>dinky-core</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>com.github.xiaoymin</groupId>

diff --git a/dinky-core/pom.xml b/dinky-core/pom.xml
@@ -28,16 +28,30 @@
     <artifactId>dinky-core</artifactId>
     <packaging>jar</packaging>
     <name>Dinky : Core</name>
-
+    <properties>
+        <hadoop.version>3.1.0</hadoop.version>
+    </properties>
     <dependencies>
-        <dependency>
+        <!--<dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy</artifactId>
             <version>3.0.9</version>
+        </dependency>-->
+        <dependency>
+            <groupId>org.dinky</groupId>
+            <artifactId>dinky-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dinky</groupId>
+            <artifactId>dinky-cdc-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.dinky</groupId>
-            <artifactId>dinky-executor</artifactId>
+            <artifactId>dinky-gateway</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dinky</groupId>
+            <artifactId>dinky-metadata-base</artifactId>
             <scope>${scope.runtime}</scope>
         </dependency>
         <dependency>
@@ -179,6 +193,36 @@
             <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-common</artifactId>
+            <version>${hadoop.version}</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-jexl3</artifactId>
+        </dependency>
     </dependencies>
 
     <profiles>
@@ -230,7 +274,6 @@
                     <artifactId>dinky-flink-1.14</artifactId>
                     <scope>${scope.runtime}</scope>
                 </dependency>
-
                 <dependency>
                     <groupId>org.dinky</groupId>
                     <artifactId>dinky-client-1.15</artifactId>

diff --git a/...intnet/sink/PrintNetDynamicTableSink.java → ...intnet/sink/PrintNetDynamicTableSink.java b/...intnet/sink/PrintNetDynamicTableSink.java → ...intnet/sink/PrintNetDynamicTableSink.java
diff --git a/...sink/PrintNetDynamicTableSinkFactory.java → ...sink/PrintNetDynamicTableSinkFactory.java b/...sink/PrintNetDynamicTableSinkFactory.java → ...sink/PrintNetDynamicTableSinkFactory.java
diff --git a/...r/printnet/sink/PrintNetSinkFunction.java → ...r/printnet/sink/PrintNetSinkFunction.java b/...r/printnet/sink/PrintNetSinkFunction.java → ...r/printnet/sink/PrintNetSinkFunction.java
diff --git a/...ava/org/dinky/constant/FlinkConstant.java → ...ava/org/dinky/constant/FlinkConstant.java b/...ava/org/dinky/constant/FlinkConstant.java → ...ava/org/dinky/constant/FlinkConstant.java
diff --git a/.../org/dinky/constant/FlinkSQLConstant.java → .../org/dinky/constant/FlinkSQLConstant.java b/.../org/dinky/constant/FlinkSQLConstant.java → .../org/dinky/constant/FlinkSQLConstant.java
diff --git a/...a/org/dinky/exception/FlinkException.java → ...a/org/dinky/exception/FlinkException.java b/...a/org/dinky/exception/FlinkException.java → ...a/org/dinky/exception/FlinkException.java
diff --git a/.../org/dinky/executor/AppBatchExecutor.java → .../org/dinky/executor/AppBatchExecutor.java b/.../org/dinky/executor/AppBatchExecutor.java → .../org/dinky/executor/AppBatchExecutor.java
diff --git a/...org/dinky/executor/AppStreamExecutor.java → ...org/dinky/executor/AppStreamExecutor.java b/...org/dinky/executor/AppStreamExecutor.java → ...org/dinky/executor/AppStreamExecutor.java
diff --git a/.../CustomExtendedOperationExecutorImpl.java → .../CustomExtendedOperationExecutorImpl.java b/.../CustomExtendedOperationExecutorImpl.java → .../CustomExtendedOperationExecutorImpl.java
diff --git a/...ain/java/org/dinky/executor/Executor.java → ...ain/java/org/dinky/executor/Executor.java b/...ain/java/org/dinky/executor/Executor.java → ...ain/java/org/dinky/executor/Executor.java
diff --git a/...va/org/dinky/executor/ExecutorConfig.java → ...va/org/dinky/executor/ExecutorConfig.java b/...va/org/dinky/executor/ExecutorConfig.java → ...va/org/dinky/executor/ExecutorConfig.java
diff --git a/...a/org/dinky/executor/ExecutorFactory.java → ...a/org/dinky/executor/ExecutorFactory.java b/...a/org/dinky/executor/ExecutorFactory.java → ...a/org/dinky/executor/ExecutorFactory.java
diff --git a/...rg/dinky/executor/LocalBatchExecutor.java → ...rg/dinky/executor/LocalBatchExecutor.java b/...rg/dinky/executor/LocalBatchExecutor.java → ...rg/dinky/executor/LocalBatchExecutor.java
diff --git a/...g/dinky/executor/LocalStreamExecutor.java → ...g/dinky/executor/LocalStreamExecutor.java b/...g/dinky/executor/LocalStreamExecutor.java → ...g/dinky/executor/LocalStreamExecutor.java
diff --git a/...g/dinky/executor/RemoteBatchExecutor.java → ...g/dinky/executor/RemoteBatchExecutor.java b/...g/dinky/executor/RemoteBatchExecutor.java → ...g/dinky/executor/RemoteBatchExecutor.java
diff --git a/.../dinky/executor/RemoteStreamExecutor.java → .../dinky/executor/RemoteStreamExecutor.java b/.../dinky/executor/RemoteStreamExecutor.java → .../dinky/executor/RemoteStreamExecutor.java
diff --git a/...a/org/dinky/executor/VariableManager.java → ...a/org/dinky/executor/VariableManager.java b/...a/org/dinky/executor/VariableManager.java → ...a/org/dinky/executor/VariableManager.java
diff --git a/...g/dinky/interceptor/FlinkInterceptor.java → ...g/dinky/interceptor/FlinkInterceptor.java b/...g/dinky/interceptor/FlinkInterceptor.java → ...g/dinky/interceptor/FlinkInterceptor.java
diff --git a/...y/interceptor/FlinkInterceptorResult.java → ...y/interceptor/FlinkInterceptorResult.java b/...y/interceptor/FlinkInterceptorResult.java → ...y/interceptor/FlinkInterceptorResult.java
diff --git a/...inky/parser/CreateCDCSourceSqlParser.java → ...inky/parser/CreateCDCSourceSqlParser.java b/...inky/parser/CreateCDCSourceSqlParser.java → ...inky/parser/CreateCDCSourceSqlParser.java
diff --git a/...n/java/org/dinky/parser/SetSqlParser.java → ...n/java/org/dinky/parser/SetSqlParser.java b/...n/java/org/dinky/parser/SetSqlParser.java → ...n/java/org/dinky/parser/SetSqlParser.java
diff --git a/.../org/dinky/parser/ShowFragmentParser.java → .../org/dinky/parser/ShowFragmentParser.java b/.../org/dinky/parser/ShowFragmentParser.java → .../org/dinky/parser/ShowFragmentParser.java
diff --git a/.../dinky/parser/SingleSqlParserFactory.java → .../dinky/parser/SingleSqlParserFactory.java b/.../dinky/parser/SingleSqlParserFactory.java → .../dinky/parser/SingleSqlParserFactory.java
diff --git a/.../main/java/org/dinky/trans/Operation.java → .../main/java/org/dinky/trans/Operation.java b/.../main/java/org/dinky/trans/Operation.java → .../main/java/org/dinky/trans/Operation.java
diff --git a/...main/java/org/dinky/trans/Operations.java → ...main/java/org/dinky/trans/Operations.java b/...main/java/org/dinky/trans/Operations.java → ...main/java/org/dinky/trans/Operations.java
diff --git a/...n/java/org/dinky/trans/ddl/CDCSource.java → ...n/java/org/dinky/trans/ddl/CDCSource.java b/...n/java/org/dinky/trans/ddl/CDCSource.java → ...n/java/org/dinky/trans/ddl/CDCSource.java
diff --git a/...y/trans/ddl/CreateCDCSourceOperation.java → ...y/trans/ddl/CreateCDCSourceOperation.java b/...y/trans/ddl/CreateCDCSourceOperation.java → ...y/trans/ddl/CreateCDCSourceOperation.java
diff --git a/...nky/trans/show/ShowFragmentOperation.java → ...nky/trans/show/ShowFragmentOperation.java b/...nky/trans/show/ShowFragmentOperation.java → ...nky/trans/show/ShowFragmentOperation.java
diff --git a/...ky/trans/show/ShowFragmentsOperation.java → ...ky/trans/show/ShowFragmentsOperation.java b/...ky/trans/show/ShowFragmentsOperation.java → ...ky/trans/show/ShowFragmentsOperation.java
diff --git a/...in/java/org/dinky/utils/KerberosUtil.java → ...in/java/org/dinky/utils/KerberosUtil.java b/...in/java/org/dinky/utils/KerberosUtil.java → ...in/java/org/dinky/utils/KerberosUtil.java
diff --git a/.../org.apache.flink.table.factories.Factory → .../org.apache.flink.table.factories.Factory b/.../org.apache.flink.table.factories.Factory → .../org.apache.flink.table.factories.Factory
diff --git a/...rg/dinky/executor/ExecutorConfigTest.java → ...rg/dinky/executor/ExecutorConfigTest.java b/...rg/dinky/executor/ExecutorConfigTest.java → ...rg/dinky/executor/ExecutorConfigTest.java
diff --git a/...org/dinky/interceptor/CdcSourceTests.java → ...org/dinky/interceptor/CdcSourceTests.java b/...org/dinky/interceptor/CdcSourceTests.java → ...org/dinky/interceptor/CdcSourceTests.java
diff --git a/...nky/interceptor/FlinkInterceptorTest.java → ...nky/interceptor/FlinkInterceptorTest.java b/...nky/interceptor/FlinkInterceptorTest.java → ...nky/interceptor/FlinkInterceptorTest.java
diff --git a/...est/java/org/dinky/parse/SqlTypeTest.java → ...est/java/org/dinky/parse/SqlTypeTest.java b/...est/java/org/dinky/parse/SqlTypeTest.java → ...est/java/org/dinky/parse/SqlTypeTest.java
diff --git a/...mporalTableFunctionParseStrategyTest.java → ...mporalTableFunctionParseStrategyTest.java b/...mporalTableFunctionParseStrategyTest.java → ...mporalTableFunctionParseStrategyTest.java
diff --git a/dinky-executor/pom.xml b/dinky-executor/pom.xml
diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,6 @@
         <module>dinky-function</module>
         <module>dinky-metadata</module>
         <module>dinky-connectors</module>
-        <module>dinky-executor</module>
         <module>dinky-extends</module>
         <module>dinky-alert</module>
         <module>dinky-daemon</module>
@@ -507,11 +506,6 @@
                 <artifactId>dinky-gateway</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.dinky</groupId>
-                <artifactId>dinky-executor</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.dinky</groupId>
                 <artifactId>dinky-client-hadoop</artifactId>