diff --git a/seatunnel-core/pom.xml b/seatunnel-core/pom.xml index bd1f846271d..e5ac5e7fc03 100644 --- a/seatunnel-core/pom.xml +++ b/seatunnel-core/pom.xml @@ -34,6 +34,6 @@ seatunnel-core-base seatunnel-core-flink seatunnel-core-spark - seatunnel-core-sql + seatunnel-core-flink-sql diff --git a/seatunnel-core/seatunnel-core-sql/README.md b/seatunnel-core/seatunnel-core-flink-sql/README.md similarity index 100% rename from seatunnel-core/seatunnel-core-sql/README.md rename to seatunnel-core/seatunnel-core-flink-sql/README.md diff --git a/seatunnel-core/seatunnel-core-sql/pom.xml b/seatunnel-core/seatunnel-core-flink-sql/pom.xml similarity index 97% rename from seatunnel-core/seatunnel-core-sql/pom.xml rename to seatunnel-core/seatunnel-core-flink-sql/pom.xml index 3ae7a66eed6..bd55d1e7f47 100644 --- a/seatunnel-core/seatunnel-core-sql/pom.xml +++ b/seatunnel-core/seatunnel-core-flink-sql/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - seatunnel-core-sql + seatunnel-core-flink-sql diff --git a/bin/start-seatunnel-sql.sh b/seatunnel-core/seatunnel-core-flink-sql/src/main/bin/start-seatunnel-sql.sh similarity index 97% rename from bin/start-seatunnel-sql.sh rename to seatunnel-core/seatunnel-core-flink-sql/src/main/bin/start-seatunnel-sql.sh index 1d4de6249e3..368db2afc87 100755 --- a/bin/start-seatunnel-sql.sh +++ b/seatunnel-core/seatunnel-core-flink-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/seatunnel-core/seatunnel-core-sql/src/main/java/org/apache/seatunnel/core/sql/SeatunnelSql.java b/seatunnel-core/seatunnel-core-flink-sql/src/main/java/org/apache/seatunnel/core/sql/SeatunnelSql.java similarity index 100% rename from seatunnel-core/seatunnel-core-sql/src/main/java/org/apache/seatunnel/core/sql/SeatunnelSql.java rename to seatunnel-core/seatunnel-core-flink-sql/src/main/java/org/apache/seatunnel/core/sql/SeatunnelSql.java diff --git a/seatunnel-core/seatunnel-core-sql/src/main/java/org/apache/seatunnel/core/sql/job/Executor.java b/seatunnel-core/seatunnel-core-flink-sql/src/main/java/org/apache/seatunnel/core/sql/job/Executor.java similarity index 100% rename from seatunnel-core/seatunnel-core-sql/src/main/java/org/apache/seatunnel/core/sql/job/Executor.java rename to seatunnel-core/seatunnel-core-flink-sql/src/main/java/org/apache/seatunnel/core/sql/job/Executor.java diff --git a/seatunnel-core/seatunnel-core-sql/src/main/java/org/apache/seatunnel/core/sql/job/JobInfo.java b/seatunnel-core/seatunnel-core-flink-sql/src/main/java/org/apache/seatunnel/core/sql/job/JobInfo.java similarity index 100% rename from seatunnel-core/seatunnel-core-sql/src/main/java/org/apache/seatunnel/core/sql/job/JobInfo.java rename to seatunnel-core/seatunnel-core-flink-sql/src/main/java/org/apache/seatunnel/core/sql/job/JobInfo.java diff --git a/seatunnel-core/seatunnel-core-sql/src/main/java/org/apache/seatunnel/core/sql/splitter/SqlStatementSplitter.java b/seatunnel-core/seatunnel-core-flink-sql/src/main/java/org/apache/seatunnel/core/sql/splitter/SqlStatementSplitter.java similarity index 100% rename from seatunnel-core/seatunnel-core-sql/src/main/java/org/apache/seatunnel/core/sql/splitter/SqlStatementSplitter.java rename to seatunnel-core/seatunnel-core-flink-sql/src/main/java/org/apache/seatunnel/core/sql/splitter/SqlStatementSplitter.java diff --git a/seatunnel-core/seatunnel-core-sql/src/test/java/org/apache/seatunnel/core/sql/SqlVariableSubstitutionTest.java b/seatunnel-core/seatunnel-core-flink-sql/src/test/java/org/apache/seatunnel/core/sql/SqlVariableSubstitutionTest.java similarity index 100% rename from seatunnel-core/seatunnel-core-sql/src/test/java/org/apache/seatunnel/core/sql/SqlVariableSubstitutionTest.java rename to seatunnel-core/seatunnel-core-flink-sql/src/test/java/org/apache/seatunnel/core/sql/SqlVariableSubstitutionTest.java diff --git a/seatunnel-core/seatunnel-core-sql/src/test/java/org/apache/seatunnel/core/sql/splitter/SqlStatementSplitterTest.java b/seatunnel-core/seatunnel-core-flink-sql/src/test/java/org/apache/seatunnel/core/sql/splitter/SqlStatementSplitterTest.java similarity index 100% rename from seatunnel-core/seatunnel-core-sql/src/test/java/org/apache/seatunnel/core/sql/splitter/SqlStatementSplitterTest.java rename to seatunnel-core/seatunnel-core-flink-sql/src/test/java/org/apache/seatunnel/core/sql/splitter/SqlStatementSplitterTest.java diff --git a/seatunnel-core/seatunnel-core-sql/src/test/resources/flink.sql.conf.template b/seatunnel-core/seatunnel-core-flink-sql/src/test/resources/flink.sql.conf.template similarity index 100% rename from seatunnel-core/seatunnel-core-sql/src/test/resources/flink.sql.conf.template rename to seatunnel-core/seatunnel-core-flink-sql/src/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 index d83d3643acb..5b4504c0819 100644 --- a/seatunnel-dist/src/main/assembly/assembly-bin.xml +++ b/seatunnel-dist/src/main/assembly/assembly-bin.xml @@ -59,6 +59,11 @@ /bin 0755 + + ../seatunnel-core/seatunnel-core-flink-sql/src/main/bin + /bin + 0755 + ../seatunnel-core/seatunnel-core-spark/src/main/bin /bin @@ -75,9 +80,9 @@ /lib - ../seatunnel-core/seatunnel-core-sql/target + ../seatunnel-core/seatunnel-core-flink-sql/target - seatunnel-core-sql*.jar + seatunnel-core-flink-sql*.jar %regex[.*((javadoc)|(sources))\.jar] diff --git a/seatunnel-examples/pom.xml b/seatunnel-examples/pom.xml index c4f9e65f2d2..cc6d5776584 100644 --- a/seatunnel-examples/pom.xml +++ b/seatunnel-examples/pom.xml @@ -32,7 +32,7 @@ seatunnel-flink-examples seatunnel-spark-examples - seatunnel-sql-examples + seatunnel-flink-sql-examples diff --git a/seatunnel-examples/seatunnel-sql-examples/pom.xml b/seatunnel-examples/seatunnel-flink-sql-examples/pom.xml similarity index 96% rename from seatunnel-examples/seatunnel-sql-examples/pom.xml rename to seatunnel-examples/seatunnel-flink-sql-examples/pom.xml index 48609bda8af..a42d1de777d 100644 --- a/seatunnel-examples/seatunnel-sql-examples/pom.xml +++ b/seatunnel-examples/seatunnel-flink-sql-examples/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - seatunnel-sql-examples + seatunnel-flink-sql-examples compile @@ -40,7 +40,7 @@ org.apache.seatunnel - seatunnel-core-sql + seatunnel-core-flink-sql ${project.version} diff --git a/seatunnel-examples/seatunnel-sql-examples/src/main/java/org/apache/seatunnel/example/flink/LocalSqlExample.java b/seatunnel-examples/seatunnel-flink-sql-examples/src/main/java/org/apache/seatunnel/example/flink/LocalSqlExample.java similarity index 95% rename from seatunnel-examples/seatunnel-sql-examples/src/main/java/org/apache/seatunnel/example/flink/LocalSqlExample.java rename to seatunnel-examples/seatunnel-flink-sql-examples/src/main/java/org/apache/seatunnel/example/flink/LocalSqlExample.java index c9732216a4f..60a570b8d3a 100644 --- a/seatunnel-examples/seatunnel-sql-examples/src/main/java/org/apache/seatunnel/example/flink/LocalSqlExample.java +++ b/seatunnel-examples/seatunnel-flink-sql-examples/src/main/java/org/apache/seatunnel/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/seatunnel-examples/seatunnel-sql-examples/src/main/resources/examples/flink.sql.conf.template b/seatunnel-examples/seatunnel-flink-sql-examples/src/main/resources/examples/flink.sql.conf.template similarity index 100% rename from seatunnel-examples/seatunnel-sql-examples/src/main/resources/examples/flink.sql.conf.template rename to seatunnel-examples/seatunnel-flink-sql-examples/src/main/resources/examples/flink.sql.conf.template