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 3eb0df56baba8e7ab1f7c2423ac8c8031902b551 Author: JingsongLi <[email protected]> AuthorDate: Fri Mar 17 21:10:48 2023 +0800 [core] Rename paimon: table-store to paimon --- README.md | 2 +- docs/content/engines/flink.md | 2 +- docs/content/engines/hive.md | 2 +- docs/content/filesystems/oss.md | 2 +- docs/content/filesystems/s3.md | 2 +- docs/content/how-to/creating-catalogs.md | 4 ++-- docs/content/how-to/creating-tables.md | 4 ++-- docs/content/how-to/lookup-joins.md | 4 ++-- .../src/main/resources/sinks/table_store.yaml | 2 +- paimon-docs/README.md | 2 +- .../paimon/docs/configuration/ConfigOptionsDocGenerator.java | 2 +- .../test/java/org/apache/paimon/tests/E2eReaderTestBase.java | 2 +- .../src/test/java/org/apache/paimon/tests/E2eTestBase.java | 2 +- .../java/org/apache/paimon/tests/FileStoreBatchE2eTest.java | 2 +- .../apache/paimon/tests/FileStoreBuiltInFormatE2eTest.java | 2 +- .../java/org/apache/paimon/tests/FileStoreStreamE2eTest.java | 2 +- .../java/org/apache/paimon/tests/FlinkActionsE2eTest.java | 2 +- .../test/java/org/apache/paimon/tests/LogStoreE2eTest.java | 2 +- .../src/test/java/org/apache/paimon/tests/TypeE2eTest.java | 4 ++-- .../java/org/apache/paimon/connector/CatalogITCaseBase.java | 2 +- .../java/org/apache/paimon/connector/CatalogITCaseBase.java | 2 +- .../org/apache/paimon/connector/FlinkCatalogFactory.java | 2 +- .../java/org/apache/paimon/connector/action/ActionBase.java | 2 +- .../java/org/apache/paimon/connector/CatalogITCaseBase.java | 2 +- .../connector/ChangelogWithKeyFileStoreTableITCase.java | 12 ++++++------ .../org/apache/paimon/connector/FileSystemCatalogITCase.java | 2 +- .../java/org/apache/paimon/connector/LogSystemITCase.java | 2 +- .../java/org/apache/paimon/connector/MappingTableITCase.java | 12 ++++++------ .../org/apache/paimon/connector/RescaleBucketITCase.java | 2 +- .../java/org/apache/paimon/connector/TableStoreTestBase.java | 2 +- .../paimon/connector/action/MergeIntoActionITCase.java | 2 +- .../apache/paimon/connector/sink/SinkSavepointITCase.java | 4 ++-- .../apache/paimon/connector/util/ReadWriteTableTestUtil.java | 2 +- .../apache/paimon/hive/CustomHiveMetastoreClientITCase.java | 2 +- .../test/java/org/apache/paimon/hive/HiveCatalogITCase.java | 8 ++++---- .../main/java/org/apache/paimon/hive/TableStoreJobConf.java | 4 ++-- .../src/main/java/org/apache/paimon/spark/SparkSource.java | 2 +- .../src/main/java/org/apache/paimon/spark/SparkSource.java | 2 +- 38 files changed, 57 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index d281cba99..9d40869d7 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Flink Table Store is developed under the umbrella of [Apache Flink](https://flin Please check out the full [documentation](https://nightlies.apache.org/flink/paimon-docs-master/), hosted by the [ASF](https://www.apache.org/), for detailed information and user guides. -Check our [quick-start](https://nightlies.apache.org/flink/paimon-docs-master/docs/try-table-store/quick-start/) guide for simple setup instructions to get you started with the table store. +Check our [quick-start](https://nightlies.apache.org/flink/paimon-docs-master/docs/try-paimon/quick-start/) guide for simple setup instructions to get you started with the table store. ## Building diff --git a/docs/content/engines/flink.md b/docs/content/engines/flink.md index 5d603ce3c..65afd124f 100644 --- a/docs/content/engines/flink.md +++ b/docs/content/engines/flink.md @@ -114,7 +114,7 @@ You can now start Flink SQL client to execute SQL scripts. -- if you're trying out Table Store in a distributed environment, -- warehouse path should be set to a shared file system, such as HDFS or OSS CREATE CATALOG my_catalog WITH ( - 'type'='table-store', + 'type'='paimon', 'warehouse'='file:/tmp/table_store' ); diff --git a/docs/content/engines/hive.md b/docs/content/engines/hive.md index 933b5b9bd..465a66333 100644 --- a/docs/content/engines/hive.md +++ b/docs/content/engines/hive.md @@ -91,7 +91,7 @@ Execute the following Flink SQL script in Flink SQL client to define a Table Sto -- Define table store Hive catalog CREATE CATALOG my_hive WITH ( - 'type' = 'table-store', + 'type' = 'paimon', 'metastore' = 'hive', 'uri' = 'thrift://<hive-metastore-host-name>:<port>', 'warehouse' = '/path/to/table/store/warehouse' diff --git a/docs/content/filesystems/oss.md b/docs/content/filesystems/oss.md index a4224f275..56e789485 100644 --- a/docs/content/filesystems/oss.md +++ b/docs/content/filesystems/oss.md @@ -62,7 +62,7 @@ Put `paimon-oss-{{< version >}}.jar` into `lib` directory of your Flink home, an ```sql CREATE CATALOG my_catalog WITH ( - 'type' = 'table-store', + 'type' = 'paimon', 'warehouse' = 'oss://path/to/warehouse', 'fs.oss.endpoint' = 'oss-cn-hangzhou.aliyuncs.com', 'fs.oss.accessKeyId' = 'xxx', diff --git a/docs/content/filesystems/s3.md b/docs/content/filesystems/s3.md index b32ab814e..d47bafdfd 100644 --- a/docs/content/filesystems/s3.md +++ b/docs/content/filesystems/s3.md @@ -62,7 +62,7 @@ Put `paimon-s3-{{< version >}}.jar` into `lib` directory of your Flink home, and ```sql CREATE CATALOG my_catalog WITH ( - 'type' = 'table-store', + 'type' = 'paimon', 'warehouse' = 's3://path/to/warehouse', 's3.endpoint' = 'your-endpoint-hostname', 's3.access-key' = 'xxx', diff --git a/docs/content/how-to/creating-catalogs.md b/docs/content/how-to/creating-catalogs.md index 3c4915c06..8fdbba600 100644 --- a/docs/content/how-to/creating-catalogs.md +++ b/docs/content/how-to/creating-catalogs.md @@ -43,7 +43,7 @@ The following Flink SQL registers and uses a Table Store catalog named `my_catal ```sql CREATE CATALOG my_catalog WITH ( - 'type' = 'table-store', + 'type' = 'paimon', 'warehouse' = 'hdfs://path/to/warehouse' ); @@ -118,7 +118,7 @@ The following Flink SQL registers and uses a Table Store Hive catalog named `my_ ```sql CREATE CATALOG my_hive WITH ( - 'type' = 'table-store', + 'type' = 'paimon', 'metastore' = 'hive', 'uri' = 'thrift://<hive-metastore-host-name>:<port>', 'warehouse' = 'hdfs://path/to/warehouse' diff --git a/docs/content/how-to/creating-tables.md b/docs/content/how-to/creating-tables.md index 4782252ac..5253f437d 100644 --- a/docs/content/how-to/creating-tables.md +++ b/docs/content/how-to/creating-tables.md @@ -328,7 +328,7 @@ CREATE TABLE MyTable ( hh STRING, PRIMARY KEY (dt, hh, user_id) NOT ENFORCED ) WITH ( - 'connector' = 'table-store', + 'connector' = 'paimon', 'path' = 'hdfs://path/to/table', 'auto-create' = 'true' -- this table property creates table files for an empty table if table path does not exist -- currently only supported by Flink @@ -383,7 +383,7 @@ If you want to use Table Store catalog along with other tables but do not want t ```sql CREATE CATALOG my_catalog WITH ( - 'type' = 'table-store', + 'type' = 'paimon', 'warehouse' = 'hdfs://path/to/warehouse' ); diff --git a/docs/content/how-to/lookup-joins.md b/docs/content/how-to/lookup-joins.md index 7cac8709e..ed0a8a5af 100644 --- a/docs/content/how-to/lookup-joins.md +++ b/docs/content/how-to/lookup-joins.md @@ -35,13 +35,13 @@ First, let's create a Table Store table and update it in real-time. ```sql -- Create a table store catalog CREATE CATALOG my_catalog WITH ( - 'type'='table-store', + 'type'='paimon', 'warehouse'='hdfs://nn:8020/warehouse/path' -- or 'file://tmp/foo/bar' ); USE CATALOG my_catalog; --- Create a table in table-store catalog +-- Create a table in paimon catalog CREATE TABLE customers ( id INT PRIMARY KEY NOT ENFORCED, name STRING, diff --git a/paimon-benchmark/paimon-cluster-benchmark/src/main/resources/sinks/table_store.yaml b/paimon-benchmark/paimon-cluster-benchmark/src/main/resources/sinks/table_store.yaml index d9e5ec58d..74cf5c232 100644 --- a/paimon-benchmark/paimon-cluster-benchmark/src/main/resources/sinks/table_store.yaml +++ b/paimon-benchmark/paimon-cluster-benchmark/src/main/resources/sinks/table_store.yaml @@ -18,7 +18,7 @@ before: | CREATE CATALOG test_catalog WITH ( - 'type' = 'table-store', + 'type' = 'paimon', 'warehouse' = '${SINK_PATH}' ); sink-name: test_catalog.`default`.table_store_sink diff --git a/paimon-docs/README.md b/paimon-docs/README.md index f6c28de9d..cbf7d44e5 100644 --- a/paimon-docs/README.md +++ b/paimon-docs/README.md @@ -23,7 +23,7 @@ This module contains generators that create HTML files directly from Flink Table ## Configuration documentation -The `ConfigOptionsDocGenerator` can be used to generate a reference of `ConfigOptions`. By default, a separate file is generated for each `*Options` class found in `org.apache.flink.table.store`, `org.apache.paimon.connector` and `org.apache.paimon.connector.kafka`. +The `ConfigOptionsDocGenerator` can be used to generate a reference of `ConfigOptions`. By default, a separate file is generated for each `*Options` class found in `org.apache.paimon`, `org.apache.paimon.connector` and `org.apache.paimon.connector.kafka`. The `@ConfigGroups` annotation can be used to generate multiple files from a single class. To integrate an `*Options` class from another package, add another module-package argument pair to `ConfigOptionsDocGenerator#LOCATIONS`. diff --git a/paimon-docs/src/main/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGenerator.java b/paimon-docs/src/main/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGenerator.java index eb49797b0..440d4ba16 100644 --- a/paimon-docs/src/main/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGenerator.java +++ b/paimon-docs/src/main/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGenerator.java @@ -71,7 +71,7 @@ public class ConfigOptionsDocGenerator { static final OptionsClassLocation[] LOCATIONS = new OptionsClassLocation[] { new OptionsClassLocation("paimon-common", "org.apache.paimon.options"), - new OptionsClassLocation("paimon-core", "org.apache.flink.table.store"), + new OptionsClassLocation("paimon-core", "org.apache.paimon"), new OptionsClassLocation( "paimon-flink/paimon-flink-common", "org.apache.paimon.connector"), new OptionsClassLocation( diff --git a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/E2eReaderTestBase.java b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/E2eReaderTestBase.java index 8445fb6ad..e54affffb 100644 --- a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/E2eReaderTestBase.java +++ b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/E2eReaderTestBase.java @@ -30,7 +30,7 @@ public abstract class E2eReaderTestBase extends E2eTestBase { return String.join( "\n", String.format("CREATE CATALOG %s WITH (", catalog), - " 'type' = 'table-store',", + " 'type' = 'paimon',", options.length > 0 ? String.join(",", options) + "," : "", String.format(" 'warehouse' = '%s'", warehouse), ");", diff --git a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/E2eTestBase.java b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/E2eTestBase.java index 11037d762..f716e25c5 100644 --- a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/E2eTestBase.java +++ b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/E2eTestBase.java @@ -72,7 +72,7 @@ public abstract class E2eTestBase { protected static final String TEST_DATA_DIR = "/test-data"; protected static final String HDFS_ROOT = "hdfs://namenode:8020"; - private static final String PRINT_SINK_IDENTIFIER = "table-store-e2e-result"; + private static final String PRINT_SINK_IDENTIFIER = "paimon-e2e-result"; private static final int CHECK_RESULT_INTERVAL_MS = 1000; private static final int CHECK_RESULT_RETRIES = 60; private final List<String> currentResults = new ArrayList<>(); diff --git a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FileStoreBatchE2eTest.java b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FileStoreBatchE2eTest.java index 4f68a74d5..9c6554991 100644 --- a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FileStoreBatchE2eTest.java +++ b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FileStoreBatchE2eTest.java @@ -71,7 +71,7 @@ public class FileStoreBatchE2eTest extends E2eTestBase { String catalogDdl = String.format( "CREATE CATALOG ts_catalog WITH (\n" - + " 'type' = 'table-store',\n" + + " 'type' = 'paimon',\n" + " 'warehouse' = '%s'\n" + ");", TEST_DATA_DIR + "/" + UUID.randomUUID() + ".store"); diff --git a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FileStoreBuiltInFormatE2eTest.java b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FileStoreBuiltInFormatE2eTest.java index 0c2424290..3f171737f 100644 --- a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FileStoreBuiltInFormatE2eTest.java +++ b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FileStoreBuiltInFormatE2eTest.java @@ -45,7 +45,7 @@ public class FileStoreBuiltInFormatE2eTest extends E2eTestBase { String catalogDdl = String.format( "CREATE CATALOG ts_catalog WITH (\n" - + " 'type' = 'table-store',\n" + + " 'type' = 'paimon',\n" + " 'warehouse' = '%s'\n" + ");", TEST_DATA_DIR + "/" + UUID.randomUUID() + ".store"); diff --git a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FileStoreStreamE2eTest.java b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FileStoreStreamE2eTest.java index fe4f0178a..de86aa9db 100644 --- a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FileStoreStreamE2eTest.java +++ b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/FileStoreStreamE2eTest.java @@ -62,7 +62,7 @@ public class FileStoreStreamE2eTest extends E2eTestBase { String catalogDdl = String.format( "CREATE CATALOG ts_catalog WITH (\n" - + " 'type' = 'table-store',\n" + + " 'type' = 'paimon',\n" + " 'warehouse' = '%s'\n" + ");", TEST_DATA_DIR + "/" + UUID.randomUUID() + ".store"); 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 98ebd66ad..51dba9c39 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 @@ -45,7 +45,7 @@ public class FlinkActionsE2eTest extends E2eTestBase { catalogDdl = String.format( "CREATE CATALOG ts_catalog WITH (\n" - + " 'type' = 'table-store',\n" + + " 'type' = 'paimon',\n" + " 'warehouse' = '%s'\n" + ");", warehousePath); diff --git a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/LogStoreE2eTest.java b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/LogStoreE2eTest.java index 67188fc5e..bc6c074cd 100644 --- a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/LogStoreE2eTest.java +++ b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/LogStoreE2eTest.java @@ -50,7 +50,7 @@ public class LogStoreE2eTest extends E2eTestBase { String catalogDdl = String.format( "CREATE CATALOG ts_catalog WITH (\n" - + " 'type' = 'table-store',\n" + + " 'type' = 'paimon',\n" + " 'warehouse' = '%s'\n" + ");", TEST_DATA_DIR + "/" + UUID.randomUUID() + ".store"); diff --git a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/TypeE2eTest.java b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/TypeE2eTest.java index 701b843ef..dce208ded 100644 --- a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/TypeE2eTest.java +++ b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/TypeE2eTest.java @@ -52,7 +52,7 @@ public class TypeE2eTest extends E2eTestBase { String catalogDdl = String.format( "CREATE CATALOG ts_catalog WITH (\n" - + " 'type' = 'table-store',\n" + + " 'type' = 'paimon',\n" + " 'warehouse' = '%s'\n" + ");", TEST_DATA_DIR + "/" + UUID.randomUUID() + ".store"); @@ -142,7 +142,7 @@ public class TypeE2eTest extends E2eTestBase { String catalogDdl = String.format( "CREATE CATALOG ts_catalog WITH (\n" - + " 'type' = 'table-store',\n" + + " 'type' = 'paimon',\n" + " 'warehouse' = '%s'\n" + ");", TEST_DATA_DIR + "/" + UUID.randomUUID() + ".store"); diff --git a/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/connector/CatalogITCaseBase.java b/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/connector/CatalogITCaseBase.java index c820ab302..26698b250 100644 --- a/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/connector/CatalogITCaseBase.java +++ b/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/connector/CatalogITCaseBase.java @@ -66,7 +66,7 @@ public abstract class CatalogITCaseBase extends AbstractTestBase { path = getTempDirPath("table_store"); tEnv.executeSql( String.format( - "CREATE CATALOG %s WITH (" + "'type'='table-store', 'warehouse'='%s')", + "CREATE CATALOG %s WITH (" + "'type'='paimon', 'warehouse'='%s')", catalog, path)); tEnv.useCatalog(catalog); diff --git a/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/connector/CatalogITCaseBase.java b/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/connector/CatalogITCaseBase.java index c820ab302..26698b250 100644 --- a/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/connector/CatalogITCaseBase.java +++ b/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/connector/CatalogITCaseBase.java @@ -66,7 +66,7 @@ public abstract class CatalogITCaseBase extends AbstractTestBase { path = getTempDirPath("table_store"); tEnv.executeSql( String.format( - "CREATE CATALOG %s WITH (" + "'type'='table-store', 'warehouse'='%s')", + "CREATE CATALOG %s WITH (" + "'type'='paimon', 'warehouse'='%s')", catalog, path)); tEnv.useCatalog(catalog); diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkCatalogFactory.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkCatalogFactory.java index b9d90ee16..9474c667b 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkCatalogFactory.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkCatalogFactory.java @@ -31,7 +31,7 @@ import java.util.Set; /** Factory for {@link FlinkCatalog}. */ public class FlinkCatalogFactory implements org.apache.flink.table.factories.CatalogFactory { - public static final String IDENTIFIER = "table-store"; + public static final String IDENTIFIER = "paimon"; public static final ConfigOption<String> DEFAULT_DATABASE = ConfigOptions.key("default-database") diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/action/ActionBase.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/action/ActionBase.java index 10481a7e2..385b0612c 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/action/ActionBase.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/action/ActionBase.java @@ -60,7 +60,7 @@ public abstract class ActionBase implements Action { protected final FlinkCatalog flinkCatalog; - protected final String catalogName = "table-store-" + UUID.randomUUID(); + protected final String catalogName = "paimon-" + UUID.randomUUID(); protected StreamExecutionEnvironment env; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/CatalogITCaseBase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/CatalogITCaseBase.java index e783877a6..885163d24 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/CatalogITCaseBase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/CatalogITCaseBase.java @@ -67,7 +67,7 @@ public abstract class CatalogITCaseBase extends AbstractTestBase { path = getTempDirPath(); tEnv.executeSql( String.format( - "CREATE CATALOG %s WITH (" + "'type'='table-store', 'warehouse'='%s')", + "CREATE CATALOG %s WITH (" + "'type'='paimon', 'warehouse'='%s')", catalog, path)); tEnv.useCatalog(catalog); diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ChangelogWithKeyFileStoreTableITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ChangelogWithKeyFileStoreTableITCase.java index 68c58c97a..6878c227d 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ChangelogWithKeyFileStoreTableITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ChangelogWithKeyFileStoreTableITCase.java @@ -112,7 +112,7 @@ public class ChangelogWithKeyFileStoreTableITCase extends AbstractTestBase { .set(ExecutionConfigOptions.TABLE_EXEC_RESOURCE_DEFAULT_PARALLELISM, 1); bEnv.executeSql( String.format( - "CREATE CATALOG testCatalog WITH ('type'='table-store', 'warehouse'='%s')", + "CREATE CATALOG testCatalog WITH ('type'='paimon', 'warehouse'='%s')", path)); bEnv.executeSql("USE CATALOG testCatalog"); bEnv.executeSql( @@ -134,7 +134,7 @@ public class ChangelogWithKeyFileStoreTableITCase extends AbstractTestBase { .set(ExecutionConfigOptions.TABLE_EXEC_RESOURCE_DEFAULT_PARALLELISM, 1); sEnv.executeSql( String.format( - "CREATE CATALOG testCatalog WITH ('type'='table-store', 'warehouse'='%s')", + "CREATE CATALOG testCatalog WITH ('type'='paimon', 'warehouse'='%s')", path)); sEnv.executeSql("USE CATALOG testCatalog"); CloseableIterator<Row> it = sEnv.executeSql("SELECT * FROM T").collect(); @@ -180,7 +180,7 @@ public class ChangelogWithKeyFileStoreTableITCase extends AbstractTestBase { sEnv.executeSql( String.format( - "CREATE CATALOG testCatalog WITH ('type'='table-store', 'warehouse'='%s/warehouse')", + "CREATE CATALOG testCatalog WITH ('type'='paimon', 'warehouse'='%s/warehouse')", path)); sEnv.executeSql("USE CATALOG testCatalog"); sEnv.executeSql( @@ -438,7 +438,7 @@ public class ChangelogWithKeyFileStoreTableITCase extends AbstractTestBase { .set(ExecutionConfigOptions.TABLE_EXEC_RESOURCE_DEFAULT_PARALLELISM, 1); sEnv.executeSql( String.format( - "CREATE CATALOG testCatalog WITH ('type'='table-store', 'warehouse'='%s')", + "CREATE CATALOG testCatalog WITH ('type'='paimon', 'warehouse'='%s')", path)); sEnv.executeSql("USE CATALOG testCatalog"); @@ -481,7 +481,7 @@ public class ChangelogWithKeyFileStoreTableITCase extends AbstractTestBase { FailingFileIO.reset(failingName, 0, 1); tEnv.executeSql( String.format( - "CREATE CATALOG testCatalog WITH ('type'='table-store', 'warehouse'='%s')", + "CREATE CATALOG testCatalog WITH ('type'='paimon', 'warehouse'='%s')", failingPath)); tEnv.executeSql("USE CATALOG testCatalog"); tEnv.executeSql( @@ -561,7 +561,7 @@ public class ChangelogWithKeyFileStoreTableITCase extends AbstractTestBase { TableEnvironment bEnv = createBatchTableEnvironment(); bEnv.executeSql( String.format( - "CREATE CATALOG testCatalog WITH ('type'='table-store', 'warehouse'='%s')", + "CREATE CATALOG testCatalog WITH ('type'='paimon', 'warehouse'='%s')", path)); bEnv.executeSql("USE CATALOG testCatalog"); diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/FileSystemCatalogITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/FileSystemCatalogITCase.java index 6191165bd..795848ef9 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/FileSystemCatalogITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/FileSystemCatalogITCase.java @@ -52,7 +52,7 @@ public class FileSystemCatalogITCase extends KafkaTableTestBase { path = getTempDirPath(); tEnv.executeSql( String.format( - "CREATE CATALOG fs WITH ('type'='table-store', 'warehouse'='%s')", path)); + "CREATE CATALOG fs WITH ('type'='paimon', 'warehouse'='%s')", path)); tEnv.useCatalog("fs"); env.setParallelism(1); } diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/LogSystemITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/LogSystemITCase.java index 56cea1a9c..e00b709e5 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/LogSystemITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/LogSystemITCase.java @@ -39,7 +39,7 @@ public class LogSystemITCase extends KafkaTableTestBase { tEnv.executeSql( String.format( "CREATE CATALOG TABLE_STORE WITH (" - + "'type'='table-store', 'warehouse'='%s')", + + "'type'='paimon', 'warehouse'='%s')", getTempDirPath())); tEnv.useCatalog("TABLE_STORE"); } diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/MappingTableITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/MappingTableITCase.java index aae34acb5..17a614e3c 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/MappingTableITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/MappingTableITCase.java @@ -53,7 +53,7 @@ public class MappingTableITCase extends AbstractTestBase { tEnv.executeSql( String.format( "CREATE TABLE T (i INT, j INT) WITH (" - + "'connector'='table-store', 'path'='%s')", + + "'connector'='paimon', 'path'='%s')", path)); assertThrows( ValidationException.class, @@ -66,7 +66,7 @@ public class MappingTableITCase extends AbstractTestBase { tEnv.executeSql( String.format( "CREATE TABLE T (i INT, j INT) WITH (" - + "'connector'='table-store', 'path'='%s', 'auto-create'='true')", + + "'connector'='paimon', 'path'='%s', 'auto-create'='true')", path)); tEnv.executeSql("INSERT INTO T VALUES (1, 2), (3, 4)").await(); @@ -74,7 +74,7 @@ public class MappingTableITCase extends AbstractTestBase { tEnv.executeSql( String.format( "CREATE TABLE T (i INT, j INT) WITH (" - + "'connector'='table-store', 'path'='%s')", + + "'connector'='paimon', 'path'='%s')", path)); List<Row> result = ImmutableList.copyOf(tEnv.executeSql("SELECT * FROM T").collect()); @@ -87,7 +87,7 @@ public class MappingTableITCase extends AbstractTestBase { tEnv.executeSql( String.format( "CREATE TABLE T (i INT, j INT) WITH (" - + "'connector'='table-store', 'path'='%s', 'auto-create'='true')", + + "'connector'='paimon', 'path'='%s', 'auto-create'='true')", path)); tEnv.executeSql("SELECT * FROM T").collect().close(); tEnv.executeSql("DROP TABLE T"); @@ -99,7 +99,7 @@ public class MappingTableITCase extends AbstractTestBase { tEnv.executeSql( String.format( "CREATE TABLE T (i INT, j INT) WITH (" - + "'connector'='table-store', 'path'='%s', 'auto-create'='true')", + + "'connector'='paimon', 'path'='%s', 'auto-create'='true')", path)); tEnv.executeSql("SELECT * FROM T").collect().close(); tEnv.executeSql("DROP TABLE T"); @@ -107,7 +107,7 @@ public class MappingTableITCase extends AbstractTestBase { tEnv.executeSql( String.format( "CREATE TABLE T (i INT, j INT, k INT) WITH (" - + "'connector'='table-store', 'path'='%s', 'auto-create'='true')", + + "'connector'='paimon', 'path'='%s', 'auto-create'='true')", path)); assertThrows( diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/RescaleBucketITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/RescaleBucketITCase.java index bad6d109c..acfe424ca 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/RescaleBucketITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/RescaleBucketITCase.java @@ -51,7 +51,7 @@ public class RescaleBucketITCase extends CatalogITCaseBase { protected List<String> ddl() { return Arrays.asList( String.format( - "CREATE CATALOG `fs_catalog` WITH ('type' = 'table-store', 'warehouse' = '%s')", + "CREATE CATALOG `fs_catalog` WITH ('type' = 'paimon', 'warehouse' = '%s')", path), "CREATE TABLE IF NOT EXISTS `fs_catalog`.`default`.`T1` (f0 INT) WITH ('bucket' = '2')"); } diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/TableStoreTestBase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/TableStoreTestBase.java index 0613b921a..bd2185b4e 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/TableStoreTestBase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/TableStoreTestBase.java @@ -91,7 +91,7 @@ public abstract class TableStoreTestBase extends AbstractTestBase { tEnv.executeSql( String.format( - "CREATE CATALOG %s WITH ('type' = 'table-store', 'warehouse' = '%s')", + "CREATE CATALOG %s WITH ('type' = 'paimon', 'warehouse' = '%s')", CURRENT_CATALOG, rootPath)); tEnv.useCatalog(CURRENT_CATALOG); } diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/MergeIntoActionITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/MergeIntoActionITCase.java index 46779b247..ea20018d6 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/MergeIntoActionITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/MergeIntoActionITCase.java @@ -170,7 +170,7 @@ public class MergeIntoActionITCase extends ActionITCaseBase { String catalog = String.format( - "CREATE CATALOG test_cat WITH ('type' = 'table-store', 'warehouse' = '%s')", + "CREATE CATALOG test_cat WITH ('type' = 'paimon', 'warehouse' = '%s')", getTempDirPath()); String useCatalog = "USE CATALOG test_cat"; String id = diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/SinkSavepointITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/SinkSavepointITCase.java index 555c28885..c69564733 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/SinkSavepointITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/SinkSavepointITCase.java @@ -166,7 +166,7 @@ public class SinkSavepointITCase extends AbstractTestBase { String.join( "\n", "CREATE CATALOG my_catalog WITH (", - " 'type' = 'table-store',", + " 'type' = 'paimon',", " 'warehouse' = '" + failingPath + "'", ")"); FailingFileIO.retryArtificialException(() -> tEnv.executeSql(createCatalogSql)); @@ -206,7 +206,7 @@ public class SinkSavepointITCase extends AbstractTestBase { String.join( "\n", "CREATE CATALOG my_catalog WITH (", - " 'type' = 'table-store',", + " 'type' = 'paimon',", " 'warehouse' = '" + failingPath + "'", ")"); tEnv.executeSql(createCatalogSql); diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/util/ReadWriteTableTestUtil.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/util/ReadWriteTableTestUtil.java index 4c631e1f9..dbefd4a0d 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/util/ReadWriteTableTestUtil.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/util/ReadWriteTableTestUtil.java @@ -94,7 +94,7 @@ public class ReadWriteTableTestUtil { String catalog = "TABLE_STORE"; sEnv.executeSql( String.format( - "CREATE CATALOG %s WITH ('type'='table-store', 'warehouse'='%s');", + "CREATE CATALOG %s WITH ('type'='paimon', 'warehouse'='%s');", catalog, warehouse)); sEnv.useCatalog(catalog); diff --git a/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/CustomHiveMetastoreClientITCase.java b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/CustomHiveMetastoreClientITCase.java index 2970f8343..e8ae8ea63 100644 --- a/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/CustomHiveMetastoreClientITCase.java +++ b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/CustomHiveMetastoreClientITCase.java @@ -71,7 +71,7 @@ public class CustomHiveMetastoreClientITCase { String.join( "\n", "CREATE CATALOG my_hive WITH (", - " 'type' = 'table-store',", + " 'type' = 'paimon',", " 'metastore' = 'hive',", " 'uri' = '',", " 'warehouse' = '" + path + "',", diff --git a/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/HiveCatalogITCase.java b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/HiveCatalogITCase.java index 4f2dc2992..a333863cd 100644 --- a/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/HiveCatalogITCase.java +++ b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/HiveCatalogITCase.java @@ -104,7 +104,7 @@ public class HiveCatalogITCase { String.join( "\n", "CREATE CATALOG my_hive WITH (", - " 'type' = 'table-store',", + " 'type' = 'paimon',", " 'metastore' = 'hive',", " 'uri' = '',", " 'warehouse' = '" + path + "',", @@ -246,7 +246,7 @@ public class HiveCatalogITCase { String.join( "\n", "CREATE CATALOG my_hive_external WITH (", - " 'type' = 'table-store',", + " 'type' = 'paimon',", " 'metastore' = 'hive',", " 'uri' = '',", " 'warehouse' = '" + path + "',", @@ -535,7 +535,7 @@ public class HiveCatalogITCase { String.join( "\n", "CREATE CATALOG my_hive_custom_client WITH (", - " 'type' = 'table-store',", + " 'type' = 'paimon',", " 'metastore' = 'hive',", " 'uri' = '',", " 'warehouse' = '" + path + "',", @@ -566,7 +566,7 @@ public class HiveCatalogITCase { String.join( "\n", "CREATE CATALOG my_alter_hive WITH (", - " 'type' = 'table-store',", + " 'type' = 'paimon',", " 'metastore' = 'hive',", " 'uri' = '',", " 'warehouse' = '" + path + "',", diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreJobConf.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreJobConf.java index c83a910b2..3131cf80e 100644 --- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreJobConf.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreJobConf.java @@ -34,8 +34,8 @@ import java.util.Properties; */ public class TableStoreJobConf { - private static final String INTERNAL_LOCATION = "table-store.internal.location"; - private static final String INTERNAL_CATALOG_CONFIG = "table-store.catalog.config"; + private static final String INTERNAL_LOCATION = "paimon.internal.location"; + private static final String INTERNAL_CATALOG_CONFIG = "paimon.catalog.config"; private static final String TABLE_STORE_PREFIX = "tablestore."; diff --git a/paimon-spark/paimon-spark-2/src/main/java/org/apache/paimon/spark/SparkSource.java b/paimon-spark/paimon-spark-2/src/main/java/org/apache/paimon/spark/SparkSource.java index 0b53e9a33..c60d68797 100644 --- a/paimon-spark/paimon-spark-2/src/main/java/org/apache/paimon/spark/SparkSource.java +++ b/paimon-spark/paimon-spark-2/src/main/java/org/apache/paimon/spark/SparkSource.java @@ -33,7 +33,7 @@ import org.apache.spark.sql.types.StructType; /** The Spark source for table store. */ public class SparkSource implements DataSourceRegister, ReadSupport, SessionConfigSupport { - /** Not use 'table-store' here, the '-' is not allowed in SQL. */ + /** Not use 'paimon' here, the '-' is not allowed in SQL. */ private static final String SHORT_NAME = "tablestore"; @Override diff --git a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkSource.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkSource.java index 1d7d9cebe..433df840b 100644 --- a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkSource.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkSource.java @@ -36,7 +36,7 @@ import java.util.Map; /** The spark source for table store. */ public class SparkSource implements DataSourceRegister, SessionConfigSupport { - /** Not use 'table-store' here, the '-' is not allowed in SQL. */ + /** Not use 'paimon' here, the '-' is not allowed in SQL. */ private static final String SHORT_NAME = "tablestore"; @Override
