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 5df46e752ac35b36a5349b4065590e13e5cf0ce3 Author: JingsongLi <[email protected]> AuthorDate: Fri Mar 17 12:09:56 2023 +0800 [core] Rename paimon spark --- docs/content/engines/spark3.md | 2 +- docs/content/filesystems/oss.md | 2 +- docs/content/filesystems/s3.md | 2 +- docs/content/how-to/creating-catalogs.md | 4 ++-- .../java/org/apache/flink/table/store/tests/SparkE2eTest.java | 2 +- .../paimon-spark-2}/pom.xml | 0 .../java/org/apache/paimon}/spark/SparkDataSourceReader.java | 2 +- .../java/org/apache/paimon}/spark/SparkInputPartition.java | 2 +- .../src/main/java/org/apache/paimon}/spark/SparkSource.java | 2 +- .../org.apache.spark.sql.sources.DataSourceRegister | 2 +- .../java/org/apache/paimon}/spark/SimpleTableTestHelper.java | 2 +- .../org/apache/paimon}/spark/SparkFilterConverterTest.java | 2 +- .../java/org/apache/paimon}/spark/SparkInternalRowTest.java | 4 ++-- .../test/java/org/apache/paimon}/spark/SparkReadITCase.java | 2 +- .../src/test/java/org/apache/paimon}/spark/SparkTypeTest.java | 4 ++-- .../paimon-spark-2}/src/test/resources/log4j2-test.properties | 0 .../paimon-spark-3.1}/pom.xml | 0 .../paimon-spark-3.2}/pom.xml | 0 .../paimon-spark-3.3}/pom.xml | 0 .../paimon-spark-common}/pom.xml | 0 .../src/main/java/org/apache/paimon}/spark/SparkArrayData.java | 4 ++-- .../src/main/java/org/apache/paimon}/spark/SparkCatalog.java | 4 ++-- .../java/org/apache/paimon}/spark/SparkFilterConverter.java | 2 +- .../java/org/apache/paimon}/spark/SparkInputPartition.java | 2 +- .../main/java/org/apache/paimon}/spark/SparkInternalRow.java | 2 +- .../main/java/org/apache/paimon}/spark/SparkReaderFactory.java | 2 +- .../src/main/java/org/apache/paimon}/spark/SparkRow.java | 2 +- .../src/main/java/org/apache/paimon}/spark/SparkScan.java | 2 +- .../main/java/org/apache/paimon}/spark/SparkScanBuilder.java | 2 +- .../src/main/java/org/apache/paimon}/spark/SparkSource.java | 2 +- .../src/main/java/org/apache/paimon}/spark/SparkTable.java | 2 +- .../src/main/java/org/apache/paimon}/spark/SparkTypeUtils.java | 2 +- .../src/main/java/org/apache/paimon}/spark/SparkWrite.java | 2 +- .../main/java/org/apache/paimon}/spark/SparkWriteBuilder.java | 2 +- .../org/apache/paimon}/spark/SpecializedGettersReader.java | 2 +- .../services/org.apache.spark.sql.sources.DataSourceRegister | 2 +- .../test/java/org/apache/paimon}/spark/MinioTestContainer.java | 2 +- .../org/apache/paimon}/spark/SparkFilterConverterTest.java | 2 +- .../java/org/apache/paimon}/spark/SparkInternalRowTest.java | 4 ++-- .../test/java/org/apache/paimon}/spark/SparkReadITCase.java | 2 +- .../test/java/org/apache/paimon}/spark/SparkReadTestBase.java | 2 +- .../src/test/java/org/apache/paimon}/spark/SparkS3ITCase.java | 2 +- .../org/apache/paimon}/spark/SparkSchemaEvolutionITCase.java | 2 +- .../src/test/java/org/apache/paimon}/spark/SparkTypeTest.java | 6 +++--- .../test/java/org/apache/paimon}/spark/SparkWriteITCase.java | 2 +- .../src/test/resources/log4j2-test.properties | 0 {flink-table-store-spark => paimon-spark}/pom.xml | 10 +++++----- pom.xml | 2 +- 48 files changed, 53 insertions(+), 53 deletions(-) diff --git a/docs/content/engines/spark3.md b/docs/content/engines/spark3.md index dc03da95b..323ba8db7 100644 --- a/docs/content/engines/spark3.md +++ b/docs/content/engines/spark3.md @@ -86,7 +86,7 @@ When starting `spark-sql`, use the following command to register Table Store’s ```bash spark-sql ... \ - --conf spark.sql.catalog.tablestore=org.apache.flink.table.store.spark.SparkCatalog \ + --conf spark.sql.catalog.tablestore=org.apache.paimon.spark.SparkCatalog \ --conf spark.sql.catalog.tablestore.warehouse=file:/tmp/table_store ``` diff --git a/docs/content/filesystems/oss.md b/docs/content/filesystems/oss.md index 8bc148896..9de958a9c 100644 --- a/docs/content/filesystems/oss.md +++ b/docs/content/filesystems/oss.md @@ -78,7 +78,7 @@ Place `flink-table-store-oss-{{< version >}}.jar` together with `flink-table-sto ```shell spark-sql \ - --conf spark.sql.catalog.tablestore=org.apache.flink.table.store.spark.SparkCatalog \ + --conf spark.sql.catalog.tablestore=org.apache.paimon.spark.SparkCatalog \ --conf spark.sql.catalog.tablestore.warehouse=oss://<bucket-name>/ \ --conf spark.sql.catalog.tablestore.fs.oss.endpoint=oss-cn-hangzhou.aliyuncs.com \ --conf spark.sql.catalog.tablestore.fs.oss.accessKeyId=xxx \ diff --git a/docs/content/filesystems/s3.md b/docs/content/filesystems/s3.md index f0618fad4..a0ed85508 100644 --- a/docs/content/filesystems/s3.md +++ b/docs/content/filesystems/s3.md @@ -78,7 +78,7 @@ Place `flink-table-store-s3-{{< version >}}.jar` together with `flink-table-stor ```shell spark-sql \ - --conf spark.sql.catalog.tablestore=org.apache.flink.table.store.spark.SparkCatalog \ + --conf spark.sql.catalog.tablestore=org.apache.paimon.spark.SparkCatalog \ --conf spark.sql.catalog.tablestore.warehouse=s3://<bucket>/<endpoint> \ --conf spark.sql.catalog.tablestore.s3.endpoint=your-endpoint-hostname \ --conf spark.sql.catalog.tablestore.s3.access-key=xxx \ diff --git a/docs/content/how-to/creating-catalogs.md b/docs/content/how-to/creating-catalogs.md index 6a9c6a09a..df89481fe 100644 --- a/docs/content/how-to/creating-catalogs.md +++ b/docs/content/how-to/creating-catalogs.md @@ -58,7 +58,7 @@ The following shell command registers a Table Store catalog named `tablestore`. ```bash spark-sql ... \ - --conf spark.sql.catalog.tablestore=org.apache.flink.table.store.spark.SparkCatalog \ + --conf spark.sql.catalog.tablestore=org.apache.paimon.spark.SparkCatalog \ --conf spark.sql.catalog.tablestore.warehouse=hdfs://path/to/warehouse ``` @@ -137,7 +137,7 @@ The following shell command registers a Table tore Hive catalog named `tablestor ```bash spark-sql ... \ - --conf spark.sql.catalog.tablestore=org.apache.flink.table.store.spark.SparkCatalog \ + --conf spark.sql.catalog.tablestore=org.apache.paimon.spark.SparkCatalog \ --conf spark.sql.catalog.tablestore.warehouse=hdfs://path/to/warehouse \ --conf spark.sql.catalog.tablestore.metastore=hive \ --conf spark.sql.catalog.tablestore.uri=thrift://<hive-metastore-host-name>:<port> diff --git a/flink-table-store-e2e-tests/src/test/java/org/apache/flink/table/store/tests/SparkE2eTest.java b/flink-table-store-e2e-tests/src/test/java/org/apache/flink/table/store/tests/SparkE2eTest.java index 3761b837e..f26526a02 100644 --- a/flink-table-store-e2e-tests/src/test/java/org/apache/flink/table/store/tests/SparkE2eTest.java +++ b/flink-table-store-e2e-tests/src/test/java/org/apache/flink/table/store/tests/SparkE2eTest.java @@ -60,7 +60,7 @@ public class SparkE2eTest extends E2eReaderTestBase { "--master", "spark://spark-master:7077", "--conf", - "spark.sql.catalog.tablestore=org.apache.flink.table.store.spark.SparkCatalog", + "spark.sql.catalog.tablestore=org.apache.paimon.spark.SparkCatalog", "--conf", "spark.sql.catalog.tablestore.warehouse=file:" + warehousePath, diff --git a/flink-table-store-spark/flink-table-store-spark-2/pom.xml b/paimon-spark/paimon-spark-2/pom.xml similarity index 100% rename from flink-table-store-spark/flink-table-store-spark-2/pom.xml rename to paimon-spark/paimon-spark-2/pom.xml diff --git a/flink-table-store-spark/flink-table-store-spark-2/src/main/java/org/apache/flink/table/store/spark/SparkDataSourceReader.java b/paimon-spark/paimon-spark-2/src/main/java/org/apache/paimon/spark/SparkDataSourceReader.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-2/src/main/java/org/apache/flink/table/store/spark/SparkDataSourceReader.java rename to paimon-spark/paimon-spark-2/src/main/java/org/apache/paimon/spark/SparkDataSourceReader.java index 1c2c3ba14..788a9c8df 100644 --- a/flink-table-store-spark/flink-table-store-spark-2/src/main/java/org/apache/flink/table/store/spark/SparkDataSourceReader.java +++ b/paimon-spark/paimon-spark-2/src/main/java/org/apache/paimon/spark/SparkDataSourceReader.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.file.predicate.Predicate; import org.apache.flink.table.store.table.Table; diff --git a/flink-table-store-spark/flink-table-store-spark-2/src/main/java/org/apache/flink/table/store/spark/SparkInputPartition.java b/paimon-spark/paimon-spark-2/src/main/java/org/apache/paimon/spark/SparkInputPartition.java similarity index 98% rename from flink-table-store-spark/flink-table-store-spark-2/src/main/java/org/apache/flink/table/store/spark/SparkInputPartition.java rename to paimon-spark/paimon-spark-2/src/main/java/org/apache/paimon/spark/SparkInputPartition.java index 3c7e572a6..d1a1b074b 100644 --- a/flink-table-store-spark/flink-table-store-spark-2/src/main/java/org/apache/flink/table/store/spark/SparkInputPartition.java +++ b/paimon-spark/paimon-spark-2/src/main/java/org/apache/paimon/spark/SparkInputPartition.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.data.InternalRow; import org.apache.flink.table.store.reader.RecordReader; diff --git a/flink-table-store-spark/flink-table-store-spark-2/src/main/java/org/apache/flink/table/store/spark/SparkSource.java b/paimon-spark/paimon-spark-2/src/main/java/org/apache/paimon/spark/SparkSource.java similarity index 98% rename from flink-table-store-spark/flink-table-store-spark-2/src/main/java/org/apache/flink/table/store/spark/SparkSource.java rename to paimon-spark/paimon-spark-2/src/main/java/org/apache/paimon/spark/SparkSource.java index 5e9203f8e..b498eb4a0 100644 --- a/flink-table-store-spark/flink-table-store-spark-2/src/main/java/org/apache/flink/table/store/spark/SparkSource.java +++ b/paimon-spark/paimon-spark-2/src/main/java/org/apache/paimon/spark/SparkSource.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.catalog.CatalogContext; import org.apache.flink.table.store.options.Options; diff --git a/flink-table-store-spark/flink-table-store-spark-2/src/main/resources/META-INF.services/org.apache.spark.sql.sources.DataSourceRegister b/paimon-spark/paimon-spark-2/src/main/resources/META-INF.services/org.apache.spark.sql.sources.DataSourceRegister similarity index 94% rename from flink-table-store-spark/flink-table-store-spark-2/src/main/resources/META-INF.services/org.apache.spark.sql.sources.DataSourceRegister rename to paimon-spark/paimon-spark-2/src/main/resources/META-INF.services/org.apache.spark.sql.sources.DataSourceRegister index e0626103b..f2046daf3 100644 --- a/flink-table-store-spark/flink-table-store-spark-2/src/main/resources/META-INF.services/org.apache.spark.sql.sources.DataSourceRegister +++ b/paimon-spark/paimon-spark-2/src/main/resources/META-INF.services/org.apache.spark.sql.sources.DataSourceRegister @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.flink.table.store.spark.SparkSource +org.apache.paimon.spark.SparkSource diff --git a/flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SimpleTableTestHelper.java b/paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SimpleTableTestHelper.java similarity index 98% rename from flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SimpleTableTestHelper.java rename to paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SimpleTableTestHelper.java index 777d98eb1..f4c0269c2 100644 --- a/flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SimpleTableTestHelper.java +++ b/paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SimpleTableTestHelper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.CoreOptions; import org.apache.flink.table.store.data.InternalRow; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkFilterConverterTest.java b/paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SparkFilterConverterTest.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkFilterConverterTest.java rename to paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SparkFilterConverterTest.java index c38d2dc73..8fca67ae8 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkFilterConverterTest.java +++ b/paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SparkFilterConverterTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.data.Timestamp; import org.apache.flink.table.store.file.predicate.Predicate; diff --git a/flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SparkInternalRowTest.java b/paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SparkInternalRowTest.java similarity index 97% rename from flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SparkInternalRowTest.java rename to paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SparkInternalRowTest.java index 2b14043b9..a1d88d55d 100644 --- a/flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SparkInternalRowTest.java +++ b/paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SparkInternalRowTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.data.BinaryString; import org.apache.flink.table.store.data.Decimal; @@ -45,7 +45,7 @@ import java.util.stream.Stream; import scala.Function1; import static org.apache.flink.table.store.data.BinaryString.fromString; -import static org.apache.flink.table.store.spark.SparkTypeTest.ALL_TYPES; +import static org.apache.paimon.spark.SparkTypeTest.ALL_TYPES; import static org.assertj.core.api.Assertions.assertThat; /** Test for {@link SparkInternalRow}. */ diff --git a/flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SparkReadITCase.java b/paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SparkReadITCase.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SparkReadITCase.java rename to paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SparkReadITCase.java index 08c186f5e..0f3a14cad 100644 --- a/flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SparkReadITCase.java +++ b/paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SparkReadITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.data.BinaryString; import org.apache.flink.table.store.data.GenericRow; diff --git a/flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SparkTypeTest.java b/paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SparkTypeTest.java similarity index 97% rename from flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SparkTypeTest.java rename to paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SparkTypeTest.java index c2bb43352..16cb18ff9 100644 --- a/flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SparkTypeTest.java +++ b/paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SparkTypeTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.types.DataTypes; import org.apache.flink.table.store.types.RowType; @@ -24,7 +24,7 @@ import org.apache.flink.table.store.types.RowType; import org.apache.spark.sql.types.StructType; import org.junit.jupiter.api.Test; -import static org.apache.flink.table.store.spark.SparkTypeUtils.fromFlinkRowType; +import static org.apache.paimon.spark.SparkTypeUtils.fromFlinkRowType; import static org.assertj.core.api.Assertions.assertThat; /** Test for {@link SparkTypeUtils}. */ diff --git a/flink-table-store-spark/flink-table-store-spark-2/src/test/resources/log4j2-test.properties b/paimon-spark/paimon-spark-2/src/test/resources/log4j2-test.properties similarity index 100% rename from flink-table-store-spark/flink-table-store-spark-2/src/test/resources/log4j2-test.properties rename to paimon-spark/paimon-spark-2/src/test/resources/log4j2-test.properties diff --git a/flink-table-store-spark/flink-table-store-spark-3.1/pom.xml b/paimon-spark/paimon-spark-3.1/pom.xml similarity index 100% rename from flink-table-store-spark/flink-table-store-spark-3.1/pom.xml rename to paimon-spark/paimon-spark-3.1/pom.xml diff --git a/flink-table-store-spark/flink-table-store-spark-3.2/pom.xml b/paimon-spark/paimon-spark-3.2/pom.xml similarity index 100% rename from flink-table-store-spark/flink-table-store-spark-3.2/pom.xml rename to paimon-spark/paimon-spark-3.2/pom.xml diff --git a/flink-table-store-spark/flink-table-store-spark-3.3/pom.xml b/paimon-spark/paimon-spark-3.3/pom.xml similarity index 100% rename from flink-table-store-spark/flink-table-store-spark-3.3/pom.xml rename to paimon-spark/paimon-spark-3.3/pom.xml diff --git a/flink-table-store-spark/flink-table-store-spark-common/pom.xml b/paimon-spark/paimon-spark-common/pom.xml similarity index 100% rename from flink-table-store-spark/flink-table-store-spark-common/pom.xml rename to paimon-spark/paimon-spark-common/pom.xml diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkArrayData.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkArrayData.java similarity index 97% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkArrayData.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkArrayData.java index e46afe1e6..e9bf44923 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkArrayData.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkArrayData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.data.InternalArray; import org.apache.flink.table.store.types.ArrayType; @@ -33,9 +33,9 @@ import org.apache.spark.sql.types.Decimal; import org.apache.spark.unsafe.types.CalendarInterval; import org.apache.spark.unsafe.types.UTF8String; -import static org.apache.flink.table.store.spark.SparkInternalRow.fromFlink; import static org.apache.flink.table.store.utils.RowDataUtils.copyArray; import static org.apache.flink.table.store.utils.TypeUtils.timestampPrecision; +import static org.apache.paimon.spark.SparkInternalRow.fromFlink; /** Spark {@link ArrayData} to wrap flink {@code ArrayData}. */ public class SparkArrayData extends ArrayData { diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkCatalog.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkCatalog.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkCatalog.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkCatalog.java index ab76c8fb1..e5762dca6 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkCatalog.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkCatalog.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.catalog.CatalogContext; import org.apache.flink.table.store.file.catalog.Catalog; @@ -61,7 +61,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static org.apache.flink.table.store.spark.SparkTypeUtils.toFlinkType; +import static org.apache.paimon.spark.SparkTypeUtils.toFlinkType; /** Spark {@link TableCatalog} for table store. */ public class SparkCatalog implements TableCatalog, SupportsNamespaces { diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkFilterConverter.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkFilterConverter.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkFilterConverter.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkFilterConverter.java index 155be0fd5..67c06464d 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkFilterConverter.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkFilterConverter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.file.predicate.Predicate; import org.apache.flink.table.store.file.predicate.PredicateBuilder; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkInputPartition.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkInputPartition.java similarity index 96% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkInputPartition.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkInputPartition.java index 4f992945d..8f3c6e9a7 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkInputPartition.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkInputPartition.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.table.source.Split; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkInternalRow.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkInternalRow.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkInternalRow.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkInternalRow.java index d3da03b2a..0ed8d9185 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkInternalRow.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkInternalRow.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.data.BinaryString; import org.apache.flink.table.store.data.InternalArray; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkReaderFactory.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkReaderFactory.java similarity index 98% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkReaderFactory.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkReaderFactory.java index 83f325dec..d7369012a 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkReaderFactory.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkReaderFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.data.InternalRow; import org.apache.flink.table.store.reader.RecordReader; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkRow.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkRow.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkRow.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkRow.java index afa81b90d..4379fb5ca 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkRow.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkRow.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.data.BinaryString; import org.apache.flink.table.store.data.Decimal; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkScan.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkScan.java similarity index 98% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkScan.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkScan.java index 383fc0bd6..006994ba3 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkScan.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkScan.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.table.source.ReadBuilder; import org.apache.flink.table.store.table.source.Split; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkScanBuilder.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkScanBuilder.java similarity index 98% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkScanBuilder.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkScanBuilder.java index 0ffa77cd9..6182c6c83 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkScanBuilder.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkScanBuilder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.file.predicate.Predicate; import org.apache.flink.table.store.table.Table; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkSource.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkSource.java similarity index 98% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkSource.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkSource.java index af5bb2352..4ef360904 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkSource.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkSource.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.catalog.CatalogContext; import org.apache.flink.table.store.file.operation.Lock; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkTable.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkTable.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkTable.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkTable.java index 84bd9c274..27309f1d1 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkTable.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkTable.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.file.operation.Lock; import org.apache.flink.table.store.file.predicate.Predicate; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkTypeUtils.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkTypeUtils.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkTypeUtils.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkTypeUtils.java index d4fb0a445..9e6d59cda 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkTypeUtils.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkTypeUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.types.ArrayType; import org.apache.flink.table.store.types.BigIntType; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkWrite.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkWrite.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkWrite.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkWrite.java index e59a85fe5..cf37b9da7 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkWrite.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkWrite.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.file.operation.Lock; import org.apache.flink.table.store.table.Table; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkWriteBuilder.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkWriteBuilder.java similarity index 97% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkWriteBuilder.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkWriteBuilder.java index 3d4a460a6..a3c09b8f4 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SparkWriteBuilder.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkWriteBuilder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.file.operation.Lock; import org.apache.flink.table.store.table.Table; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SpecializedGettersReader.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SpecializedGettersReader.java similarity index 98% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SpecializedGettersReader.java rename to paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SpecializedGettersReader.java index 7ed3633a5..388d10bfd 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/java/org/apache/flink/table/store/spark/SpecializedGettersReader.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SpecializedGettersReader.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.spark.sql.catalyst.expressions.SpecializedGetters; import org.apache.spark.sql.types.ArrayType; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister b/paimon-spark/paimon-spark-common/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister similarity index 94% rename from flink-table-store-spark/flink-table-store-spark-common/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister rename to paimon-spark/paimon-spark-common/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister index e0626103b..f2046daf3 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister +++ b/paimon-spark/paimon-spark-common/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.flink.table.store.spark.SparkSource +org.apache.paimon.spark.SparkSource diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/MinioTestContainer.java b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/MinioTestContainer.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/MinioTestContainer.java rename to paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/MinioTestContainer.java index 329ad1153..253c0dd5f 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/MinioTestContainer.java +++ b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/MinioTestContainer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.testutils.junit.DockerImageVersions; import org.apache.flink.table.store.utils.Preconditions; diff --git a/flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SparkFilterConverterTest.java b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkFilterConverterTest.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SparkFilterConverterTest.java rename to paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkFilterConverterTest.java index c38d2dc73..8fca67ae8 100644 --- a/flink-table-store-spark/flink-table-store-spark-2/src/test/java/org/apache/flink/table/store/spark/SparkFilterConverterTest.java +++ b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkFilterConverterTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.data.Timestamp; import org.apache.flink.table.store.file.predicate.Predicate; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkInternalRowTest.java b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkInternalRowTest.java similarity index 97% rename from flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkInternalRowTest.java rename to paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkInternalRowTest.java index f4d70d2a1..f19ff7fd6 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkInternalRowTest.java +++ b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkInternalRowTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.data.BinaryString; import org.apache.flink.table.store.data.Decimal; @@ -42,7 +42,7 @@ import java.util.stream.Stream; import scala.Function1; import static org.apache.flink.table.store.data.BinaryString.fromString; -import static org.apache.flink.table.store.spark.SparkTypeTest.ALL_TYPES; +import static org.apache.paimon.spark.SparkTypeTest.ALL_TYPES; import static org.assertj.core.api.Assertions.assertThat; /** Test for {@link SparkInternalRow}. */ diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkReadITCase.java b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkReadITCase.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkReadITCase.java rename to paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkReadITCase.java index d830d91e2..5aa833bfc 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkReadITCase.java +++ b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkReadITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.file.schema.TableSchema; import org.apache.flink.table.store.fs.Path; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkReadTestBase.java b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkReadTestBase.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkReadTestBase.java rename to paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkReadTestBase.java index fb6dc4f5b..f5d8aebc4 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkReadTestBase.java +++ b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkReadTestBase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.data.BinaryString; import org.apache.flink.table.store.data.GenericRow; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkS3ITCase.java b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkS3ITCase.java similarity index 98% rename from flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkS3ITCase.java rename to paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkS3ITCase.java index 313cba740..4b3fd4798 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkS3ITCase.java +++ b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkS3ITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.fs.Path; import org.apache.flink.table.store.testutils.junit.parameterized.ParameterizedTestExtension; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkSchemaEvolutionITCase.java b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkSchemaEvolutionITCase.java similarity index 99% rename from flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkSchemaEvolutionITCase.java rename to paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkSchemaEvolutionITCase.java index 4b8f8a6f0..983544847 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkSchemaEvolutionITCase.java +++ b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkSchemaEvolutionITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.commons.lang3.StringUtils; import org.apache.spark.sql.AnalysisException; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkTypeTest.java b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkTypeTest.java similarity index 96% rename from flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkTypeTest.java rename to paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkTypeTest.java index 50ab89404..3cae8f457 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkTypeTest.java +++ b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkTypeTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.types.DataTypes; import org.apache.flink.table.store.types.RowType; @@ -26,8 +26,8 @@ import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicInteger; -import static org.apache.flink.table.store.spark.SparkTypeUtils.fromFlinkRowType; -import static org.apache.flink.table.store.spark.SparkTypeUtils.toFlinkType; +import static org.apache.paimon.spark.SparkTypeUtils.fromFlinkRowType; +import static org.apache.paimon.spark.SparkTypeUtils.toFlinkType; import static org.assertj.core.api.Assertions.assertThat; /** Test for {@link SparkTypeUtils}. */ diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkWriteITCase.java b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkWriteITCase.java similarity index 98% rename from flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkWriteITCase.java rename to paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkWriteITCase.java index 0307841aa..bf36df4cf 100644 --- a/flink-table-store-spark/flink-table-store-spark-common/src/test/java/org/apache/flink/table/store/spark/SparkWriteITCase.java +++ b/paimon-spark/paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkWriteITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.spark; +package org.apache.paimon.spark; import org.apache.flink.table.store.fs.Path; diff --git a/flink-table-store-spark/flink-table-store-spark-common/src/test/resources/log4j2-test.properties b/paimon-spark/paimon-spark-common/src/test/resources/log4j2-test.properties similarity index 100% rename from flink-table-store-spark/flink-table-store-spark-common/src/test/resources/log4j2-test.properties rename to paimon-spark/paimon-spark-common/src/test/resources/log4j2-test.properties diff --git a/flink-table-store-spark/pom.xml b/paimon-spark/pom.xml similarity index 91% rename from flink-table-store-spark/pom.xml rename to paimon-spark/pom.xml index bd00d1b95..1283cab61 100644 --- a/flink-table-store-spark/pom.xml +++ b/paimon-spark/pom.xml @@ -38,11 +38,11 @@ under the License. </properties> <modules> - <module>flink-table-store-spark-common</module> - <module>flink-table-store-spark-2</module> - <module>flink-table-store-spark-3.3</module> - <module>flink-table-store-spark-3.1</module> - <module>flink-table-store-spark-3.2</module> + <module>paimon-spark-common</module> + <module>paimon-spark-2</module> + <module>paimon-spark-3.3</module> + <module>paimon-spark-3.1</module> + <module>paimon-spark-3.2</module> </modules> <dependencies> diff --git a/pom.xml b/pom.xml index 45b3d919c..fc0915605 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ under the License. <module>flink-table-store-format</module> <module>flink-table-store-shade</module> <module>flink-table-store-hive</module> - <module>flink-table-store-spark</module> + <module>paimon-spark</module> <module>paimon-test-utils</module> </modules>
