diff --git a/.github/workflows/flink.yml b/.github/workflows/flink.yml index 95e1f5637..2ba3f8ba8 100644 --- a/.github/workflows/flink.yml +++ b/.github/workflows/flink.yml @@ -42,7 +42,7 @@ jobs: flinkver: [ "1.18" ] javaver: [ "8" ] scalaver: [ "2.12" ] - module: [ "auron-flink-extension" ] + module: [ "auron-flink-extension/auron-flink-planner" ] sparkver: [ "spark-3.5" ] steps: diff --git a/auron-flink-extension/auron-flink-assembly/pom.xml b/auron-flink-extension/auron-flink-assembly/pom.xml new file mode 100644 index 000000000..b4aa8f0f6 --- /dev/null +++ b/auron-flink-extension/auron-flink-assembly/pom.xml @@ -0,0 +1,78 @@ + + + + 4.0.0 + + org.apache.auron + auron-flink-extension + ${project.version} + + + auron-flink-assembly + Apache Auron Flink Assembly ${flink.version} + Apache Auron Flink Project + + + org.apache.auron + auron-flink-runtime + ${project.version} + + + org.apache.auron + auron-flink-planner + ${project.version} + + + + + + + org.apache.maven.plugins + maven-shade-plugin + ${maven.plugin.shade.version} + + + + + META-INF/services/org.apache.flink.table.factories.TableFactory + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + shade + + package + + + + + + + diff --git a/auron-flink-extension/auron-flink-planner/pom.xml b/auron-flink-extension/auron-flink-planner/pom.xml new file mode 100644 index 000000000..2a82db2c6 --- /dev/null +++ b/auron-flink-extension/auron-flink-planner/pom.xml @@ -0,0 +1,298 @@ + + + + 4.0.0 + + org.apache.auron + auron-flink-extension + ${project.version} + + + auron-flink-planner + Apache Auron Flink Planner ${flink.version} + Apache Auron Flink Project + + false + 3.1.10 + 31.1-jre + 2.12 + + + --add-opens=java.base/java.lang=ALL-UNNAMED + + --add-opens=java.base/java.util=ALL-UNNAMED + + --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED + + --add-opens=java.base/java.time=ALL-UNNAMED + + --add-opens=java.base/java.math=ALL-UNNAMED + + --add-opens=java.base/java.nio=ALL-UNNAMED + + + + + + + org.apache.auron + auron-flink-runtime + ${project.version} + + + + + org.scala-lang + scala-library + ${scalaLongVersion} + provided + + + org.immutables + value + 2.8.8 + provided + + + org.immutables + value-annotations + 2.8.8 + provided + + + + org.codehaus.janino + commons-compiler + ${janino.version} + provided + + + + org.codehaus.janino + janino + ${janino.version} + provided + + + + + org.apache.flink + flink-table-api-java-bridge + ${flink.version} + provided + + + + + + org.apache.flink + flink-scala_${scala.binary.version} + ${flink.version} + provided + + + + org.checkerframework + checker-qual + 3.12.0 + provided + ${flink.markBundledAsOptional} + + + + + org.apache.flink + flink-table-planner_${scala.binary.version} + ${flink.version} + + + + + org.apache.flink + flink-table-runtime + ${flink.version} + provided + + + + + org.apache.flink + flink-table-calcite-bridge + ${flink.version} + provided + ${flink.markBundledAsOptional} + + + org.apache.calcite + calcite-core + + + + + + + org.apache.flink + flink-table-planner_${scala.binary.version} + ${flink.version} + test-jar + test + + + + org.apache.flink + flink-test-utils + ${flink.version} + test + + + org.junit.vintage + junit-vintage-engine + + + org.junit.jupiter + junit-jupiter + + + + + + + + org.apache.flink + flink-table-api-scala_${scala.binary.version} + ${flink.version} + test + + + org.apache.flink + flink-table-api-scala-bridge_${scala.binary.version} + ${flink.version} + test + + + + org.apache.flink + flink-core + ${flink.version} + test + + + + org.apache.flink + flink-table-common + ${flink.version} + test-jar + test + + + + org.apache.flink + flink-table-api-java + ${flink.version} + test-jar + test + + + + org.apache.flink + flink-table-runtime + ${flink.version} + test-jar + test + + + + org.apache.flink + flink-streaming-java + ${flink.version} + test-jar + test + + + + org.apache.flink + flink-statebackend-rocksdb + ${flink.version} + test + + + + + org.apache.flink + flink-connector-files + ${flink.version} + test + + + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + test + + + + + org.apache.arrow + arrow-c-data + + + + org.apache.arrow + arrow-compression + + + + org.apache.arrow + arrow-memory-unsafe + + + + org.apache.arrow + arrow-vector + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.plugin.surefire.version} + + + + **/*ITCase.java + + + + + + diff --git a/auron-flink-extension/src/test/java/org/apache/auron/flink/table/AuronFlinkTableTestBase.java b/auron-flink-extension/auron-flink-planner/src/test/java/org/apache/auron/flink/table/AuronFlinkTableTestBase.java similarity index 100% rename from auron-flink-extension/src/test/java/org/apache/auron/flink/table/AuronFlinkTableTestBase.java rename to auron-flink-extension/auron-flink-planner/src/test/java/org/apache/auron/flink/table/AuronFlinkTableTestBase.java diff --git a/auron-flink-extension/src/test/java/org/apache/auron/flink/table/runtime/AuronFlinkCalcITCase.java b/auron-flink-extension/auron-flink-planner/src/test/java/org/apache/auron/flink/table/runtime/AuronFlinkCalcITCase.java similarity index 100% rename from auron-flink-extension/src/test/java/org/apache/auron/flink/table/runtime/AuronFlinkCalcITCase.java rename to auron-flink-extension/auron-flink-planner/src/test/java/org/apache/auron/flink/table/runtime/AuronFlinkCalcITCase.java diff --git a/auron-flink-extension/auron-flink-runtime/pom.xml b/auron-flink-extension/auron-flink-runtime/pom.xml new file mode 100644 index 000000000..3b5dfea21 --- /dev/null +++ b/auron-flink-extension/auron-flink-runtime/pom.xml @@ -0,0 +1,43 @@ + + + + 4.0.0 + + org.apache.auron + auron-flink-extension + ${project.version} + + + auron-flink-runtime + Apache Auron Flink Runtime ${flink.version} + Apache Auron Flink Project + + + + org.apache.auron + auron-core + ${project.version} + + + org.apache.auron + proto + ${project.version} + + + + diff --git a/auron-flink-extension/pom.xml b/auron-flink-extension/pom.xml index c795614bd..95ef4d480 100644 --- a/auron-flink-extension/pom.xml +++ b/auron-flink-extension/pom.xml @@ -26,282 +26,13 @@ auron-flink-extension - jar + pom Apache Auron Flink ${flink.version} Apache Auron Flink Project - - - false - 3.1.10 - 31.1-jre - 2.12 - - - --add-opens=java.base/java.lang=ALL-UNNAMED - - --add-opens=java.base/java.util=ALL-UNNAMED - - --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED - - --add-opens=java.base/java.time=ALL-UNNAMED - - --add-opens=java.base/java.math=ALL-UNNAMED - - --add-opens=java.base/java.nio=ALL-UNNAMED - - - - - - - org.apache.auron - auron-core - ${project.version} - - - org.apache.auron - proto - ${project.version} - - - - org.scala-lang - scala-library - ${scalaLongVersion} - provided - - - org.immutables - value - 2.8.8 - provided - - - org.immutables - value-annotations - 2.8.8 - provided - - - - org.codehaus.janino - commons-compiler - ${janino.version} - provided - - - - org.codehaus.janino - janino - ${janino.version} - provided - - - - - org.apache.flink - flink-table-api-java-bridge - ${flink.version} - provided - - - - - - org.apache.flink - flink-scala_${scala.binary.version} - ${flink.version} - provided - - - - org.checkerframework - checker-qual - 3.12.0 - provided - ${flink.markBundledAsOptional} - - - - - org.apache.flink - flink-table-planner_${scala.binary.version} - ${flink.version} - - - - - org.apache.flink - flink-table-runtime - ${flink.version} - provided - - - - - org.apache.flink - flink-table-calcite-bridge - ${flink.version} - provided - ${flink.markBundledAsOptional} - - - org.apache.calcite - calcite-core - - - - - - - org.apache.flink - flink-table-planner_${scala.binary.version} - ${flink.version} - test-jar - test - - - - org.apache.flink - flink-test-utils - ${flink.version} - test - - - org.junit.vintage - junit-vintage-engine - - - org.junit.jupiter - junit-jupiter - - - - - - - - org.apache.flink - flink-table-api-scala_${scala.binary.version} - ${flink.version} - test - - - org.apache.flink - flink-table-api-scala-bridge_${scala.binary.version} - ${flink.version} - test - - - - org.apache.flink - flink-core - ${flink.version} - test - - - - org.apache.flink - flink-table-common - ${flink.version} - test-jar - test - - - - org.apache.flink - flink-table-api-java - ${flink.version} - test-jar - test - - - - org.apache.flink - flink-table-runtime - ${flink.version} - test-jar - test - - - - org.apache.flink - flink-streaming-java - ${flink.version} - test-jar - test - - - - org.apache.flink - flink-statebackend-rocksdb - ${flink.version} - test - - - - - org.apache.flink - flink-connector-files - ${flink.version} - test - - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - test - - - - - org.apache.arrow - arrow-c-data - - - - org.apache.arrow - arrow-compression - - - - org.apache.arrow - arrow-memory-unsafe - - - - org.apache.arrow - arrow-vector - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.plugin.surefire.version} - - - - **/*ITCase.java - - - - - + + auron-flink-planner + auron-flink-runtime + auron-flink-assembly +