[Improvement][core] Rename seatunnel-core-sql to seatunnel-core-flink…

…-sql (apache#1609) * Rename seatunnel-core-sql to seatunnel-core-flink-sql * Modified assembly
ruanwenjun · Mar 29, 2022 · 687d7d2 · 687d7d2
1 parent 7b47c34
commit 687d7d2
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 9 deletions.
diff --git a/seatunnel-core/pom.xml b/seatunnel-core/pom.xml
@@ -34,6 +34,6 @@
         <module>seatunnel-core-base</module>
         <module>seatunnel-core-flink</module>
         <module>seatunnel-core-spark</module>
-        <module>seatunnel-core-sql</module>
+        <module>seatunnel-core-flink-sql</module>
     </modules>
 </project>
diff --git a/seatunnel-core/seatunnel-core-sql/README.md → ...l-core/seatunnel-core-flink-sql/README.md b/seatunnel-core/seatunnel-core-sql/README.md → ...l-core/seatunnel-core-flink-sql/README.md
diff --git a/seatunnel-core/seatunnel-core-sql/pom.xml → ...nel-core/seatunnel-core-flink-sql/pom.xml b/seatunnel-core/seatunnel-core-sql/pom.xml → ...nel-core/seatunnel-core-flink-sql/pom.xml
@@ -28,7 +28,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>seatunnel-core-sql</artifactId>
+    <artifactId>seatunnel-core-flink-sql</artifactId>
 
     <dependencies>
         <dependency>

diff --git a/bin/start-seatunnel-sql.sh → ...k-sql/src/main/bin/start-seatunnel-sql.sh b/bin/start-seatunnel-sql.sh → ...k-sql/src/main/bin/start-seatunnel-sql.sh
@@ -83,7 +83,7 @@ PLUGINS_DIR=${APP_DIR}/lib
 DEFAULT_CONFIG=${CONF_DIR}/application.conf
 CONFIG_FILE=${CONFIG_FILE:-$DEFAULT_CONFIG}
 
-assemblyJarName=$(find ${PLUGINS_DIR} -name seatunnel-core-sql*.jar)
+assemblyJarName=$(find ${PLUGINS_DIR} -name seatunnel-core-flink-sql*.jar)
 
 source ${CONF_DIR}/seatunnel-env.sh
 

diff --git a/...ache/seatunnel/core/sql/SeatunnelSql.java → ...ache/seatunnel/core/sql/SeatunnelSql.java b/...ache/seatunnel/core/sql/SeatunnelSql.java → ...ache/seatunnel/core/sql/SeatunnelSql.java
diff --git a/...ache/seatunnel/core/sql/job/Executor.java → ...ache/seatunnel/core/sql/job/Executor.java b/...ache/seatunnel/core/sql/job/Executor.java → ...ache/seatunnel/core/sql/job/Executor.java
diff --git a/...pache/seatunnel/core/sql/job/JobInfo.java → ...pache/seatunnel/core/sql/job/JobInfo.java b/...pache/seatunnel/core/sql/job/JobInfo.java → ...pache/seatunnel/core/sql/job/JobInfo.java
diff --git a/...re/sql/splitter/SqlStatementSplitter.java → ...re/sql/splitter/SqlStatementSplitter.java b/...re/sql/splitter/SqlStatementSplitter.java → ...re/sql/splitter/SqlStatementSplitter.java
diff --git a/...core/sql/SqlVariableSubstitutionTest.java → ...core/sql/SqlVariableSubstitutionTest.java b/...core/sql/SqlVariableSubstitutionTest.java → ...core/sql/SqlVariableSubstitutionTest.java
diff --git a/...ql/splitter/SqlStatementSplitterTest.java → ...ql/splitter/SqlStatementSplitterTest.java b/...ql/splitter/SqlStatementSplitterTest.java → ...ql/splitter/SqlStatementSplitterTest.java
diff --git a/...rc/test/resources/flink.sql.conf.template → ...rc/test/resources/flink.sql.conf.template b/...rc/test/resources/flink.sql.conf.template → ...rc/test/resources/flink.sql.conf.template
diff --git a/seatunnel-dist/src/main/assembly/assembly-bin.xml b/seatunnel-dist/src/main/assembly/assembly-bin.xml
@@ -59,6 +59,11 @@
             <outputDirectory>/bin</outputDirectory>
             <fileMode>0755</fileMode>
         </fileSet>
+        <fileSet>
+            <directory>../seatunnel-core/seatunnel-core-flink-sql/src/main/bin</directory>
+            <outputDirectory>/bin</outputDirectory>
+            <fileMode>0755</fileMode>
+        </fileSet>
         <fileSet>
             <directory>../seatunnel-core/seatunnel-core-spark/src/main/bin</directory>
             <outputDirectory>/bin</outputDirectory>
@@ -75,9 +80,9 @@
             <outputDirectory>/lib</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../seatunnel-core/seatunnel-core-sql/target</directory>
+            <directory>../seatunnel-core/seatunnel-core-flink-sql/target</directory>
             <includes>
-                <include>seatunnel-core-sql*.jar</include>
+                <include>seatunnel-core-flink-sql*.jar</include>
             </includes>
             <excludes>
                 <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>

diff --git a/seatunnel-examples/pom.xml b/seatunnel-examples/pom.xml
@@ -32,7 +32,7 @@
     <modules>
         <module>seatunnel-flink-examples</module>
         <module>seatunnel-spark-examples</module>
-        <module>seatunnel-sql-examples</module>
+        <module>seatunnel-flink-sql-examples</module>
     </modules>
     <build>
         <plugins>

diff --git a/...l-examples/seatunnel-sql-examples/pom.xml → ...ples/seatunnel-flink-sql-examples/pom.xml b/...l-examples/seatunnel-sql-examples/pom.xml → ...ples/seatunnel-flink-sql-examples/pom.xml
@@ -27,7 +27,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>seatunnel-sql-examples</artifactId>
+    <artifactId>seatunnel-flink-sql-examples</artifactId>
     <properties>
         <flink.scope>compile</flink.scope>
     </properties>
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-core-sql</artifactId>
+            <artifactId>seatunnel-core-flink-sql</artifactId>
             <version>${project.version}</version>
         </dependency>
         <!--flink-->

diff --git a/...tunnel/example/flink/LocalSqlExample.java → ...tunnel/example/flink/LocalSqlExample.java b/...tunnel/example/flink/LocalSqlExample.java → ...tunnel/example/flink/LocalSqlExample.java
@@ -28,7 +28,7 @@
 
 public class LocalSqlExample {
 
-    public static final String TEST_RESOURCE_DIR = "/seatunnel-examples/seatunnel-sql-examples/src/main/resources/examples/";
+    public static final String TEST_RESOURCE_DIR = "/seatunnel-examples/seatunnel-flink-sql-examples/src/main/resources/examples/";
 
     public static void main(String[] args) throws IOException {
         String configFile = getTestConfigFile("flink.sql.conf.template");

diff --git a/...esources/examples/flink.sql.conf.template → ...esources/examples/flink.sql.conf.template b/...esources/examples/flink.sql.conf.template → ...esources/examples/flink.sql.conf.template