This is an automated email from the ASF dual-hosted git repository. lzljs3620320 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git
commit d0d8faddd01c9ff30b529ca8396e9b77c95045e9 Author: JingsongLi <[email protected]> AuthorDate: Fri Mar 17 15:38:01 2023 +0800 [core] Rename paimon to test pass --- docs/content/how-to/writing-tables.md | 10 ++++++++++ .../src/main/java/org/apache/paimon/plugin/PluginLoader.java | 2 +- ...aimon.fs.FileIOLoader => org.apache.paimon.fs.FileIOLoader} | 0 ...ormatFactory => org.apache.paimon.format.FileFormatFactory} | 0 ...aimon.fs.FileIOLoader => org.apache.paimon.fs.FileIOLoader} | 0 paimon-docs/README.md | 2 +- .../docs/configuration/ConfigOptionsDocGeneratorTest.java | 3 +-- .../test/java/org/apache/paimon/tests/FlinkActionsE2eTest.java | 4 ++++ ...store.fs.FileIOLoader => org.apache.paimon.fs.FileIOLoader} | 0 ...store.fs.FileIOLoader => org.apache.paimon.fs.FileIOLoader} | 0 ...ormatFactory => org.apache.paimon.format.FileFormatFactory} | 0 11 files changed, 17 insertions(+), 4 deletions(-) diff --git a/docs/content/how-to/writing-tables.md b/docs/content/how-to/writing-tables.md index 93281e8d6..eb90f7a8a 100644 --- a/docs/content/how-to/writing-tables.md +++ b/docs/content/how-to/writing-tables.md @@ -205,6 +205,7 @@ Run the following command to submit a drop-partition job for the table. ```bash <FLINK_HOME>/bin/flink run \ -c org.apache.paimon.connector.action.FlinkActions \ + -Dclassloader.resolve-order=parent-first \ /path/to/flink-table-store-flink-**-{{< version >}}.jar \ drop-partition \ --warehouse <warehouse-path> \ @@ -222,6 +223,7 @@ For more information of drop-partition, see ```bash <FLINK_HOME>/bin/flink run \ -c org.apache.paimon.connector.action.FlinkActions \ + -Dclassloader.resolve-order=parent-first \ /path/to/flink-table-store-flink-**-{{< version >}}.jar \ drop-partition --help ``` @@ -243,6 +245,7 @@ Run the following command to submit a 'delete' job for the table. ```bash <FLINK_HOME>/bin/flink run \ -c org.apache.paimon.connector.action.FlinkActions \ + -Dclassloader.resolve-order=parent-first \ /path/to/flink-table-store-flink-**-{{< version >}}.jar \ delete \ --warehouse <warehouse-path> \ @@ -261,6 +264,7 @@ For more information of 'delete', see ```bash <FLINK_HOME>/bin/flink run \ -c org.apache.paimon.connector.action.FlinkActions \ + -Dclassloader.resolve-order=parent-first \ /path/to/flink-table-store-flink-**-{{< version >}}.jar \ delete --help ``` @@ -309,6 +313,7 @@ Run the following command to submit a 'merge-into' job for the table. ```bash <FLINK_HOME>/bin/flink run \ -c org.apache.paimon.connector.action.FlinkActions \ + -Dclassloader.resolve-order=parent-first \ /path/to/flink-table-store-flink-**-{{< version >}}.jar \ merge-into \ --warehouse <warehouse-path> \ @@ -335,6 +340,7 @@ Alternatively, you can use '--source-sql <sql> [, --source-sql <sql> ...]' to cr -- or delete if the price is under 10. ./flink run \ -c org.apache.paimon.connector.action.FlinkActions \ + -Dclassloader.resolve-order=parent-first \ /path/to/flink-table-store-flink-**-{{< version >}}.jar \ merge-into \ --warehouse <warehouse-path> \ @@ -352,6 +358,7 @@ Alternatively, you can use '--source-sql <sql> [, --source-sql <sql> ...]' to cr -- source table: ./flink run \ -c org.apache.paimon.connector.action.FlinkActions \ + -Dclassloader.resolve-order=parent-first \ /path/to/flink-table-store-flink-**-{{< version >}}.jar \ merge-into \ --warehouse <warehouse-path> \ @@ -368,6 +375,7 @@ Alternatively, you can use '--source-sql <sql> [, --source-sql <sql> ...]' to cr -- source table based on the merge-condition), decrease the price or if the mark is 'trivial', delete them: ./flink run \ -c org.apache.paimon.connector.action.FlinkActions \ + -Dclassloader.resolve-order=parent-first \ /path/to/flink-table-store-flink-**-{{< version >}}.jar \ merge-into \ --warehouse <warehouse-path> \ @@ -385,6 +393,7 @@ Alternatively, you can use '--source-sql <sql> [, --source-sql <sql> ...]' to cr -- Create a temporary view S in new catalog and use it as source table ./flink run \ -c org.apache.paimon.connector.action.FlinkActions \ + -Dclassloader.resolve-order=parent-first \ /path/to/flink-table-store-flink-**-{{< version >}}.jar \ merge-into \ --warehouse <warehouse-path> \ @@ -443,6 +452,7 @@ For more information of 'merge-into', see ```bash <FLINK_HOME>/bin/flink run \ -c org.apache.paimon.connector.action.FlinkActions \ + -Dclassloader.resolve-order=parent-first \ /path/to/flink-table-store-flink-**-{{< version >}}.jar \ merge-into --help ``` diff --git a/paimon-common/src/main/java/org/apache/paimon/plugin/PluginLoader.java b/paimon-common/src/main/java/org/apache/paimon/plugin/PluginLoader.java index e55f23a78..4e6c5cf54 100644 --- a/paimon-common/src/main/java/org/apache/paimon/plugin/PluginLoader.java +++ b/paimon-common/src/main/java/org/apache/paimon/plugin/PluginLoader.java @@ -58,7 +58,7 @@ public class PluginLoader { "org.apache.commons.lang3")) .toArray(String[]::new); - private static final String[] COMPONENT_CLASSPATH = new String[] {"org.apache.flink"}; + private static final String[] COMPONENT_CLASSPATH = new String[] {"org.apache.paimon"}; private final ClassLoader submoduleClassLoader; diff --git a/paimon-common/src/main/resources/META-INF/services/org.apache.flink.table.store.org.apache.paimon.fs.FileIOLoader b/paimon-common/src/main/resources/META-INF/services/org.apache.paimon.fs.FileIOLoader similarity index 100% rename from paimon-common/src/main/resources/META-INF/services/org.apache.flink.table.store.org.apache.paimon.fs.FileIOLoader rename to paimon-common/src/main/resources/META-INF/services/org.apache.paimon.fs.FileIOLoader diff --git a/paimon-core/src/test/resources/META-INF/services/org.apache.flink.table.store.org.apache.paimon.format.FileFormatFactory b/paimon-core/src/test/resources/META-INF/services/org.apache.paimon.format.FileFormatFactory similarity index 100% rename from paimon-core/src/test/resources/META-INF/services/org.apache.flink.table.store.org.apache.paimon.format.FileFormatFactory rename to paimon-core/src/test/resources/META-INF/services/org.apache.paimon.format.FileFormatFactory diff --git a/paimon-core/src/test/resources/META-INF/services/org.apache.flink.table.store.org.apache.paimon.fs.FileIOLoader b/paimon-core/src/test/resources/META-INF/services/org.apache.paimon.fs.FileIOLoader similarity index 100% rename from paimon-core/src/test/resources/META-INF/services/org.apache.flink.table.store.org.apache.paimon.fs.FileIOLoader rename to paimon-core/src/test/resources/META-INF/services/org.apache.paimon.fs.FileIOLoader diff --git a/paimon-docs/README.md b/paimon-docs/README.md index b69e49f9b..f6c28de9d 100644 --- a/paimon-docs/README.md +++ b/paimon-docs/README.md @@ -28,7 +28,7 @@ The `@ConfigGroups` annotation can be used to generate multiple files from a sin To integrate an `*Options` class from another package, add another module-package argument pair to `ConfigOptionsDocGenerator#LOCATIONS`. -The files can be generated by running `mvn package -Pgenerate-docs -pl flink-table-store-docs -nsu -DskipTests`, and can be integrated into the documentation using `{{ include generated/<file-name> >}}`. +The files can be generated by running `mvn package -Pgenerate-docs -pl paimon-docs -nsu -DskipTests`, and can be integrated into the documentation using `{{ include generated/<file-name> >}}`. The documentation must be regenerated whenever * an `*Options` class was added or removed diff --git a/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGeneratorTest.java b/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGeneratorTest.java index 2b6a98238..6e852442c 100644 --- a/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGeneratorTest.java +++ b/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGeneratorTest.java @@ -453,8 +453,7 @@ class ConfigOptionsDocGeneratorTest { final OptionsClassLocation[] locations = new OptionsClassLocation[] { new OptionsClassLocation( - "flink-table-store-docs", - TestCommonOptions.class.getPackage().getName()) + "paimon-docs", TestCommonOptions.class.getPackage().getName()) }; ConfigOptionsDocGenerator.generateCommonSection( projectRootDir, outputDirectory, locations, "src/test/java"); diff --git a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FlinkActionsE2eTest.java b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FlinkActionsE2eTest.java index cb1848b70..91dc2f6ab 100644 --- a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FlinkActionsE2eTest.java +++ b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FlinkActionsE2eTest.java @@ -106,6 +106,7 @@ public class FlinkActionsE2eTest extends E2eTestBase { "org.apache.paimon.connector.action.FlinkActions", "-D", "execution.checkpointing.interval=1s", + "-Dclassloader.resolve-order=parent-first", "--detached", "lib/flink-table-store.jar", "compact", @@ -168,6 +169,7 @@ public class FlinkActionsE2eTest extends E2eTestBase { "1", "-c", "org.apache.paimon.connector.action.FlinkActions", + "-Dclassloader.resolve-order=parent-first", "lib/flink-table-store.jar", "drop-partition", "--warehouse", @@ -227,6 +229,7 @@ public class FlinkActionsE2eTest extends E2eTestBase { "1", "-c", "org.apache.paimon.connector.action.FlinkActions", + "-Dclassloader.resolve-order=parent-first", "lib/flink-table-store.jar", "delete", "--warehouse", @@ -294,6 +297,7 @@ public class FlinkActionsE2eTest extends E2eTestBase { "1", "-c", "org.apache.paimon.connector.action.FlinkActions", + "-Dclassloader.resolve-order=parent-first", "lib/flink-table-store.jar", "merge-into", "--warehouse", diff --git a/paimon-filesystems/paimon-oss/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader b/paimon-filesystems/paimon-oss/src/main/resources/META-INF/services/org.apache.paimon.fs.FileIOLoader similarity index 100% rename from paimon-filesystems/paimon-oss/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader rename to paimon-filesystems/paimon-oss/src/main/resources/META-INF/services/org.apache.paimon.fs.FileIOLoader diff --git a/paimon-filesystems/paimon-s3/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader b/paimon-filesystems/paimon-s3/src/main/resources/META-INF/services/org.apache.paimon.fs.FileIOLoader similarity index 100% rename from paimon-filesystems/paimon-s3/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader rename to paimon-filesystems/paimon-s3/src/main/resources/META-INF/services/org.apache.paimon.fs.FileIOLoader diff --git a/paimon-format/src/main/resources/META-INF/services/org.apache.flink.table.store.org.apache.paimon.format.FileFormatFactory b/paimon-format/src/main/resources/META-INF/services/org.apache.paimon.format.FileFormatFactory similarity index 100% rename from paimon-format/src/main/resources/META-INF/services/org.apache.flink.table.store.org.apache.paimon.format.FileFormatFactory rename to paimon-format/src/main/resources/META-INF/services/org.apache.paimon.format.FileFormatFactory
