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
The following commit(s) were added to refs/heads/master by this push:
new cb224db22 [core] Replace table_store with paimon in docs and classes
(#656)
cb224db22 is described below
commit cb224db22835917e525d99d93f86e4d98623eae0
Author: Shammon FY <[email protected]>
AuthorDate: Mon Mar 20 16:40:04 2023 +0800
[core] Replace table_store with paimon in docs and classes (#656)
---
docs/content/engines/flink.md | 2 +-
docs/content/engines/spark2.md | 4 ++--
docs/content/engines/spark3.md | 6 +++---
paimon-benchmark/paimon-cluster-benchmark/README.md | 2 +-
.../src/main/java/org/apache/paimon/benchmark/Benchmark.java | 2 +-
.../src/main/resources/sinks/{table_store.yaml => paimon.yaml} | 2 +-
.../src/test/java/org/apache/paimon/tests/HiveE2eTest.java | 8 ++++----
.../src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java | 4 ++--
.../src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java | 4 ++--
.../org/apache/paimon/flink/sink/FullChangelogStoreSinkWrite.java | 3 +--
.../src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java | 2 +-
.../src/test/java/org/apache/paimon/flink/CatalogTableITCase.java | 2 +-
.../src/test/java/org/apache/paimon/flink/LogSystemITCase.java | 4 ++--
.../java/org/apache/paimon/flink/util/ReadWriteTableTestUtil.java | 2 +-
.../src/main/java/org/apache/paimon/hive/PaimonJobConf.java | 6 +++---
15 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/docs/content/engines/flink.md b/docs/content/engines/flink.md
index 913e5dc8d..a5f1dd599 100644
--- a/docs/content/engines/flink.md
+++ b/docs/content/engines/flink.md
@@ -115,7 +115,7 @@ You can now start Flink SQL client to execute SQL scripts.
-- warehouse path should be set to a shared file system, such as HDFS or OSS
CREATE CATALOG my_catalog WITH (
'type'='paimon',
- 'warehouse'='file:/tmp/table_store'
+ 'warehouse'='file:/tmp/paimon'
);
USE CATALOG my_catalog;
diff --git a/docs/content/engines/spark2.md b/docs/content/engines/spark2.md
index 00872a3fe..bfe802305 100644
--- a/docs/content/engines/spark2.md
+++ b/docs/content/engines/spark2.md
@@ -70,7 +70,7 @@ If you are using HDFS, make sure that the environment
variable `HADOOP_HOME` or
Paimon currently only supports reading tables through Spark2. To create a
Paimon table with records, please follow our [Flink quick start guide]({{< ref
"engines/flink#quick-start" >}}).
-After the guide, all table files should be stored under the path
`/tmp/table_store`, or the warehouse path you've specified.
+After the guide, all table files should be stored under the path
`/tmp/paimon`, or the warehouse path you've specified.
**Step 2: Specify Paimon Jar File**
@@ -87,7 +87,7 @@ Alternatively, you can copy `paimon-spark-2-{{< version
>}}.jar` under `spark/ja
Paimon with Spark 2.4 does not support DDL. You can use the `Dataset` reader
and register the `Dataset` as a temporary table. In spark shell:
```scala
-val dataset =
spark.read.format("paimon").load("file:/tmp/table_store/default.db/word_count")
+val dataset =
spark.read.format("paimon").load("file:/tmp/paimon/default.db/word_count")
dataset.createOrReplaceTempView("word_count")
spark.sql("SELECT * FROM word_count").show()
```
diff --git a/docs/content/engines/spark3.md b/docs/content/engines/spark3.md
index c9d013d69..5efb877e7 100644
--- a/docs/content/engines/spark3.md
+++ b/docs/content/engines/spark3.md
@@ -82,12 +82,12 @@ Alternatively, you can copy `paimon-spark-3.3-{{< version
>}}.jar` under `spark/
**Step 2: Specify Paimon Catalog**
-When starting `spark-sql`, use the following command to register Paimon’s
Spark catalog with the name `paimon`. Table files of the warehouse is stored
under `/tmp/table_store`.
+When starting `spark-sql`, use the following command to register Paimon’s
Spark catalog with the name `paimon`. Table files of the warehouse is stored
under `/tmp/paimon`.
```bash
spark-sql ... \
--conf spark.sql.catalog.paimon=org.apache.paimon.spark.SparkCatalog \
- --conf spark.sql.catalog.paimon.warehouse=file:/tmp/table_store
+ --conf spark.sql.catalog.paimon.warehouse=file:/tmp/paimon
```
After `spark-sql` command line has started, run the following SQL to create
and switch to database `paimon.default`.
@@ -142,7 +142,7 @@ spark-shell ... --jars /path/to/paimon-spark-3.3-{{<
version >}}.jar
```
```scala
-val dataset =
spark.read.format("paimon").load("file:/tmp/table_store/default.db/my_table")
+val dataset =
spark.read.format("paimon").load("file:/tmp/paimon/default.db/my_table")
dataset.createOrReplaceTempView("my_table")
spark.sql("SELECT * FROM my_table").show()
```
diff --git a/paimon-benchmark/paimon-cluster-benchmark/README.md
b/paimon-benchmark/paimon-cluster-benchmark/README.md
index b1eb6b7bd..2907639c1 100644
--- a/paimon-benchmark/paimon-cluster-benchmark/README.md
+++ b/paimon-benchmark/paimon-cluster-benchmark/README.md
@@ -30,7 +30,7 @@ This is the cluster benchmark module for Paimon. Inspired by
[Nexmark](https://g
* Run `paimon-benchmark/bin/setup_cluster.sh` in master node. This activates
the CPU metrics collector in worker nodes. Note that if you restart your Flink
cluster, you must also restart the CPU metrics collectors. To stop CPU metrics
collectors, run `paimon-benchmark/bin/shutdown_cluster.sh` in master node.
### Run Benchmark
-* Run `paimon-benchmark/bin/run_benchmark.sh <query> <sink>` to run `<query>`
for `<sink>`. Currently `<query>` can be `q1` or `all`, and sink can only be
`table_store`.
+* Run `paimon-benchmark/bin/run_benchmark.sh <query> <sink>` to run `<query>`
for `<sink>`. Currently `<query>` can be `q1` or `all`, and sink can only be
`paimon`.
* By default, each query writes for 30 minutes and then reads all records back
from the sink to measure read throughput.
## Queries
diff --git
a/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/Benchmark.java
b/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/Benchmark.java
index e5fa97ae8..cace7e9f6 100644
---
a/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/Benchmark.java
+++
b/paimon-benchmark/paimon-cluster-benchmark/src/main/java/org/apache/paimon/benchmark/Benchmark.java
@@ -59,7 +59,7 @@ public class Benchmark {
public static void main(String[] args) throws Exception {
if (args.length != 6) {
throw new RuntimeException(
- "Usage: --location /path/to/benchmark --queries q1,q3
--sinks table_store,hudi_merge_on_read");
+ "Usage: --location /path/to/benchmark --queries q1,q3
--sinks paimon,hudi_merge_on_read");
}
Options options = getOptions();
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/paimon.yaml
similarity index 95%
rename from
paimon-benchmark/paimon-cluster-benchmark/src/main/resources/sinks/table_store.yaml
rename to
paimon-benchmark/paimon-cluster-benchmark/src/main/resources/sinks/paimon.yaml
index 74cf5c232..d21659d62 100644
---
a/paimon-benchmark/paimon-cluster-benchmark/src/main/resources/sinks/table_store.yaml
+++
b/paimon-benchmark/paimon-cluster-benchmark/src/main/resources/sinks/paimon.yaml
@@ -21,6 +21,6 @@ before: |
'type' = 'paimon',
'warehouse' = '${SINK_PATH}'
);
-sink-name: test_catalog.`default`.table_store_sink
+sink-name: test_catalog.`default`.paimon_sink
sink-properties: |
'bucket' = '16'
diff --git
a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/HiveE2eTest.java
b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/HiveE2eTest.java
index 20b139d26..9910d3f10 100644
--- a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/HiveE2eTest.java
+++ b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/HiveE2eTest.java
@@ -35,7 +35,7 @@ import java.util.UUID;
@DisabledIfSystemProperty(named = "test.flink.version", matches = "1.14.*")
public class HiveE2eTest extends E2eReaderTestBase {
- private static final String TABLE_STORE_HIVE_CONNECTOR_JAR_NAME =
"paimon-hive-connector.jar";
+ private static final String PAIMON_HIVE_CONNECTOR_JAR_NAME =
"paimon-hive-connector.jar";
public HiveE2eTest() {
super(false, true, false);
@@ -50,13 +50,13 @@ public class HiveE2eTest extends E2eReaderTestBase {
"/bin/bash",
"-c",
"mkdir /opt/hive/auxlib && cp /jars/"
- + TABLE_STORE_HIVE_CONNECTOR_JAR_NAME
+ + PAIMON_HIVE_CONNECTOR_JAR_NAME
+ " /opt/hive/auxlib");
}
@Test
public void testReadExternalTable() throws Exception {
- final String table = "table_store_pk";
+ final String table = "paimon_pk";
String paimonPkPath = HDFS_ROOT + "/" + UUID.randomUUID() + ".store";
String paimonPkDdl =
String.format(
@@ -69,7 +69,7 @@ public class HiveE2eTest extends E2eReaderTestBase {
+ " 'bucket' = '2'\n"
+ ");",
table);
- runSql(createInsertSql(table), createCatalogSql("table_store",
paimonPkPath), paimonPkDdl);
+ runSql(createInsertSql(table), createCatalogSql("paimon",
paimonPkPath), paimonPkDdl);
String externalTablePkDdl =
String.format(
diff --git
a/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
b/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
index 4927655dc..7b9e2fb72 100644
---
a/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
+++
b/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
@@ -61,8 +61,8 @@ public abstract class CatalogITCaseBase extends
AbstractTestBase {
@Before
public void before() throws IOException {
tEnv =
TableEnvironment.create(EnvironmentSettings.newInstance().inBatchMode().build());
- String catalog = "TABLE_STORE";
- path = getTempDirPath("table_store");
+ String catalog = "PAIMON";
+ path = getTempDirPath("paimon");
tEnv.executeSql(
String.format(
"CREATE CATALOG %s WITH (" + "'type'='paimon',
'warehouse'='%s')",
diff --git
a/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
b/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
index 4927655dc..7b9e2fb72 100644
---
a/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
+++
b/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
@@ -61,8 +61,8 @@ public abstract class CatalogITCaseBase extends
AbstractTestBase {
@Before
public void before() throws IOException {
tEnv =
TableEnvironment.create(EnvironmentSettings.newInstance().inBatchMode().build());
- String catalog = "TABLE_STORE";
- path = getTempDirPath("table_store");
+ String catalog = "PAIMON";
+ path = getTempDirPath("paimon");
tEnv.executeSql(
String.format(
"CREATE CATALOG %s WITH (" + "'type'='paimon',
'warehouse'='%s')",
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/FullChangelogStoreSinkWrite.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/FullChangelogStoreSinkWrite.java
index dfc99f3a1..6e988dd05 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/FullChangelogStoreSinkWrite.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/sink/FullChangelogStoreSinkWrite.java
@@ -97,8 +97,7 @@ public class FullChangelogStoreSinkWrite extends
StoreSinkWriteImpl {
context.getOperatorStateStore()
.getListState(
new ListStateDescriptor<>(
- "table_store_written_buckets",
- writtenBucketStateSerializer));
+ "paimon_written_buckets",
writtenBucketStateSerializer));
writtenBuckets = new TreeMap<>();
writtenBucketState
.get()
diff --git
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
index 41cafa67f..4d74ac561 100644
---
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
+++
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogITCaseBase.java
@@ -62,7 +62,7 @@ public abstract class CatalogITCaseBase extends
AbstractTestBase {
@BeforeEach
public void before() throws IOException {
tEnv =
TableEnvironment.create(EnvironmentSettings.newInstance().inBatchMode().build());
- String catalog = "TABLE_STORE";
+ String catalog = "PAIMON";
path = getTempDirPath();
tEnv.executeSql(
String.format(
diff --git
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
index 4a02bebf0..d7d94d100 100644
---
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
+++
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
@@ -99,7 +99,7 @@ public class CatalogTableITCase extends CatalogITCaseBase {
assertThat(sql("SHOW CREATE TABLE T$schemas").toString())
.isEqualTo(
- "[+I[CREATE TABLE `TABLE_STORE`.`default`.`T$schemas`
(\n"
+ "[+I[CREATE TABLE `PAIMON`.`default`.`T$schemas` (\n"
+ " `schema_id` BIGINT NOT NULL,\n"
+ " `fields` VARCHAR(2147483647) NOT NULL,\n"
+ " `partition_keys` VARCHAR(2147483647) NOT
NULL,\n"
diff --git
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/LogSystemITCase.java
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/LogSystemITCase.java
index 1ffce28a7..e58c779a9 100644
---
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/LogSystemITCase.java
+++
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/LogSystemITCase.java
@@ -38,9 +38,9 @@ public class LogSystemITCase extends KafkaTableTestBase {
public void before() throws IOException {
tEnv.executeSql(
String.format(
- "CREATE CATALOG TABLE_STORE WITH (" +
"'type'='paimon', 'warehouse'='%s')",
+ "CREATE CATALOG PAIMON WITH (" + "'type'='paimon',
'warehouse'='%s')",
getTempDirPath()));
- tEnv.useCatalog("TABLE_STORE");
+ tEnv.useCatalog("PAIMON");
}
@Test
diff --git
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/util/ReadWriteTableTestUtil.java
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/util/ReadWriteTableTestUtil.java
index d258929f5..270ee48c3 100644
---
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/util/ReadWriteTableTestUtil.java
+++
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/util/ReadWriteTableTestUtil.java
@@ -91,7 +91,7 @@ public class ReadWriteTableTestUtil {
bEnv = StreamTableEnvironment.create(bExeEnv,
EnvironmentSettings.inBatchMode());
ReadWriteTableTestUtil.warehouse = warehouse;
- String catalog = "TABLE_STORE";
+ String catalog = "PAIMON";
sEnv.executeSql(
String.format(
"CREATE CATALOG %s WITH ('type'='paimon',
'warehouse'='%s');",
diff --git
a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonJobConf.java
b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonJobConf.java
index d48118500..f831b5cd9 100644
---
a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonJobConf.java
+++
b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonJobConf.java
@@ -38,7 +38,7 @@ public class PaimonJobConf {
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 = "paimon.";
+ private static final String PAIMON_PREFIX = "paimon.";
private final JobConf jobConf;
@@ -65,9 +65,9 @@ public class PaimonJobConf {
Map<String, String> configMap = new HashMap<>();
for (Map.Entry<String, String> entry : hiveConf) {
String name = entry.getKey();
- if (name.startsWith(TABLE_STORE_PREFIX)) {
+ if (name.startsWith(PAIMON_PREFIX)) {
String value = hiveConf.get(name);
- name = name.substring(TABLE_STORE_PREFIX.length());
+ name = name.substring(PAIMON_PREFIX.length());
configMap.put(name, value);
}
}
