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 e41980ab1368ffe69d8c254b21c725ce68e4f45d Author: JingsongLi <[email protected]> AuthorDate: Fri Mar 17 12:29:29 2023 +0800 [core] Rename paimon filesystems --- .../paimon-hadoop-shaded}/pom.xml | 0 .../paimon-hadoop-shaded}/src/main/resources/META-INF/NOTICE | 0 .../src/main/resources/META-INF/licenses/LICENSE-re2j | 0 .../src/main/resources/META-INF/licenses/LICENSE-stax2api | 0 .../paimon-oss-impl}/pom.xml | 4 ++-- .../java/org/apache/paimon/oss}/HadoopCompliantFileIO.java | 2 +- .../src/main/java/org/apache/paimon}/oss/OSSFileIO.java | 2 +- .../paimon-oss-impl}/src/main/resources/META-INF/NOTICE | 0 .../src/main/resources/META-INF/licenses/LICENSE.jdom | 0 .../paimon-oss}/pom.xml | 0 .../src/main/java/org/apache/paimon}/oss/OSSLoader.java | 4 ++-- .../services/org.apache.flink.table.store.fs.FileIOLoader | 2 +- .../paimon-s3-impl}/pom.xml | 0 .../services/s3/model/transform/XmlResponsesSaxParser.java | 0 .../main/java/org/apache/paimon/s3}/HadoopCompliantFileIO.java | 2 +- .../src/main/java/org/apache/paimon}/s3/S3FileIO.java | 2 +- .../paimon-s3-impl}/src/main/resources/META-INF/NOTICE | 0 .../src/main/resources/META-INF/licenses/LICENSE-re2j | 0 .../src/main/resources/META-INF/licenses/LICENSE-stax2api | 0 .../src/main/resources/META-INF/licenses/LICENSE.jaxb | 0 .../paimon-s3}/pom.xml | 0 .../src/main/java/org/apache/paimon}/s3/S3Loader.java | 4 ++-- .../services/org.apache.flink.table.store.fs.FileIOLoader | 2 +- {flink-table-store-filesystems => paimon-filesystems}/pom.xml | 10 +++++----- {flink-table-store-shade => paimon-shade}/pom.xml | 0 pom.xml | 4 ++-- 26 files changed, 19 insertions(+), 19 deletions(-) diff --git a/flink-table-store-filesystems/flink-table-store-hadoop-shaded/pom.xml b/paimon-filesystems/paimon-hadoop-shaded/pom.xml similarity index 100% rename from flink-table-store-filesystems/flink-table-store-hadoop-shaded/pom.xml rename to paimon-filesystems/paimon-hadoop-shaded/pom.xml diff --git a/flink-table-store-filesystems/flink-table-store-hadoop-shaded/src/main/resources/META-INF/NOTICE b/paimon-filesystems/paimon-hadoop-shaded/src/main/resources/META-INF/NOTICE similarity index 100% rename from flink-table-store-filesystems/flink-table-store-hadoop-shaded/src/main/resources/META-INF/NOTICE rename to paimon-filesystems/paimon-hadoop-shaded/src/main/resources/META-INF/NOTICE diff --git a/flink-table-store-filesystems/flink-table-store-hadoop-shaded/src/main/resources/META-INF/licenses/LICENSE-re2j b/paimon-filesystems/paimon-hadoop-shaded/src/main/resources/META-INF/licenses/LICENSE-re2j similarity index 100% rename from flink-table-store-filesystems/flink-table-store-hadoop-shaded/src/main/resources/META-INF/licenses/LICENSE-re2j rename to paimon-filesystems/paimon-hadoop-shaded/src/main/resources/META-INF/licenses/LICENSE-re2j diff --git a/flink-table-store-filesystems/flink-table-store-hadoop-shaded/src/main/resources/META-INF/licenses/LICENSE-stax2api b/paimon-filesystems/paimon-hadoop-shaded/src/main/resources/META-INF/licenses/LICENSE-stax2api similarity index 100% rename from flink-table-store-filesystems/flink-table-store-hadoop-shaded/src/main/resources/META-INF/licenses/LICENSE-stax2api rename to paimon-filesystems/paimon-hadoop-shaded/src/main/resources/META-INF/licenses/LICENSE-stax2api diff --git a/flink-table-store-filesystems/flink-table-store-oss-impl/pom.xml b/paimon-filesystems/paimon-oss-impl/pom.xml similarity index 96% rename from flink-table-store-filesystems/flink-table-store-oss-impl/pom.xml rename to paimon-filesystems/paimon-oss-impl/pom.xml index f6f7efde9..8ba60cb84 100644 --- a/flink-table-store-filesystems/flink-table-store-oss-impl/pom.xml +++ b/paimon-filesystems/paimon-oss-impl/pom.xml @@ -124,11 +124,11 @@ <!-- relocate the OSS dependencies --> <relocation> <pattern>com.aliyun</pattern> - <shadedPattern>org.apache.flink.table.store.oss.shaded.com.aliyun</shadedPattern> + <shadedPattern>org.apache.paimon.oss.shaded.com.aliyun</shadedPattern> </relocation> <relocation> <pattern>com.aliyuncs</pattern> - <shadedPattern>org.apache.flink.table.store.oss.shaded.com.aliyuncs</shadedPattern> + <shadedPattern>org.apache.paimon.oss.shaded.com.aliyuncs</shadedPattern> </relocation> </relocations> <filters> diff --git a/flink-table-store-filesystems/flink-table-store-s3-impl/src/main/java/org/apache/flink/table/store/s3/HadoopCompliantFileIO.java b/paimon-filesystems/paimon-oss-impl/src/main/java/org/apache/paimon/oss/HadoopCompliantFileIO.java similarity index 99% rename from flink-table-store-filesystems/flink-table-store-s3-impl/src/main/java/org/apache/flink/table/store/s3/HadoopCompliantFileIO.java rename to paimon-filesystems/paimon-oss-impl/src/main/java/org/apache/paimon/oss/HadoopCompliantFileIO.java index 7cb9b79f9..c978abc00 100644 --- a/flink-table-store-filesystems/flink-table-store-s3-impl/src/main/java/org/apache/flink/table/store/s3/HadoopCompliantFileIO.java +++ b/paimon-filesystems/paimon-oss-impl/src/main/java/org/apache/paimon/oss/HadoopCompliantFileIO.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.s3; +package org.apache.paimon.oss; import org.apache.flink.table.store.fs.FileIO; import org.apache.flink.table.store.fs.FileStatus; diff --git a/flink-table-store-filesystems/flink-table-store-oss-impl/src/main/java/org/apache/flink/table/store/oss/OSSFileIO.java b/paimon-filesystems/paimon-oss-impl/src/main/java/org/apache/paimon/oss/OSSFileIO.java similarity index 99% rename from flink-table-store-filesystems/flink-table-store-oss-impl/src/main/java/org/apache/flink/table/store/oss/OSSFileIO.java rename to paimon-filesystems/paimon-oss-impl/src/main/java/org/apache/paimon/oss/OSSFileIO.java index 0544f1821..cc456de1c 100644 --- a/flink-table-store-filesystems/flink-table-store-oss-impl/src/main/java/org/apache/flink/table/store/oss/OSSFileIO.java +++ b/paimon-filesystems/paimon-oss-impl/src/main/java/org/apache/paimon/oss/OSSFileIO.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.oss; +package org.apache.paimon.oss; import org.apache.flink.table.store.catalog.CatalogContext; import org.apache.flink.table.store.fs.FileIO; diff --git a/flink-table-store-filesystems/flink-table-store-oss-impl/src/main/resources/META-INF/NOTICE b/paimon-filesystems/paimon-oss-impl/src/main/resources/META-INF/NOTICE similarity index 100% rename from flink-table-store-filesystems/flink-table-store-oss-impl/src/main/resources/META-INF/NOTICE rename to paimon-filesystems/paimon-oss-impl/src/main/resources/META-INF/NOTICE diff --git a/flink-table-store-filesystems/flink-table-store-oss-impl/src/main/resources/META-INF/licenses/LICENSE.jdom b/paimon-filesystems/paimon-oss-impl/src/main/resources/META-INF/licenses/LICENSE.jdom similarity index 100% rename from flink-table-store-filesystems/flink-table-store-oss-impl/src/main/resources/META-INF/licenses/LICENSE.jdom rename to paimon-filesystems/paimon-oss-impl/src/main/resources/META-INF/licenses/LICENSE.jdom diff --git a/flink-table-store-filesystems/flink-table-store-oss/pom.xml b/paimon-filesystems/paimon-oss/pom.xml similarity index 100% rename from flink-table-store-filesystems/flink-table-store-oss/pom.xml rename to paimon-filesystems/paimon-oss/pom.xml diff --git a/flink-table-store-filesystems/flink-table-store-oss/src/main/java/org/apache/flink/table/store/oss/OSSLoader.java b/paimon-filesystems/paimon-oss/src/main/java/org/apache/paimon/oss/OSSLoader.java similarity index 94% rename from flink-table-store-filesystems/flink-table-store-oss/src/main/java/org/apache/flink/table/store/oss/OSSLoader.java rename to paimon-filesystems/paimon-oss/src/main/java/org/apache/paimon/oss/OSSLoader.java index 1c58788e8..ba4f96729 100644 --- a/flink-table-store-filesystems/flink-table-store-oss/src/main/java/org/apache/flink/table/store/oss/OSSLoader.java +++ b/paimon-filesystems/paimon-oss/src/main/java/org/apache/paimon/oss/OSSLoader.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.oss; +package org.apache.paimon.oss; import org.apache.flink.table.store.catalog.CatalogContext; import org.apache.flink.table.store.fs.FileIO; @@ -30,7 +30,7 @@ public class OSSLoader implements FileIOLoader { private static final String OSS_JAR = "flink-table-store-plugin-oss.jar"; - private static final String OSS_CLASS = "org.apache.flink.table.store.oss.OSSFileIO"; + private static final String OSS_CLASS = "org.apache.paimon.oss.OSSFileIO"; // Singleton lazy initialization diff --git a/flink-table-store-filesystems/flink-table-store-s3/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader b/paimon-filesystems/paimon-oss/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader similarity index 95% rename from flink-table-store-filesystems/flink-table-store-s3/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader rename to paimon-filesystems/paimon-oss/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader index d7aae95e6..b85da5a4e 100644 --- a/flink-table-store-filesystems/flink-table-store-s3/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader +++ b/paimon-filesystems/paimon-oss/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.flink.table.store.s3.S3Loader +org.apache.paimon.oss.OSSLoader diff --git a/flink-table-store-filesystems/flink-table-store-s3-impl/pom.xml b/paimon-filesystems/paimon-s3-impl/pom.xml similarity index 100% rename from flink-table-store-filesystems/flink-table-store-s3-impl/pom.xml rename to paimon-filesystems/paimon-s3-impl/pom.xml diff --git a/flink-table-store-filesystems/flink-table-store-s3-impl/src/main/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java b/paimon-filesystems/paimon-s3-impl/src/main/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java similarity index 100% rename from flink-table-store-filesystems/flink-table-store-s3-impl/src/main/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java rename to paimon-filesystems/paimon-s3-impl/src/main/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java diff --git a/flink-table-store-filesystems/flink-table-store-oss-impl/src/main/java/org/apache/flink/table/store/oss/HadoopCompliantFileIO.java b/paimon-filesystems/paimon-s3-impl/src/main/java/org/apache/paimon/s3/HadoopCompliantFileIO.java similarity index 99% rename from flink-table-store-filesystems/flink-table-store-oss-impl/src/main/java/org/apache/flink/table/store/oss/HadoopCompliantFileIO.java rename to paimon-filesystems/paimon-s3-impl/src/main/java/org/apache/paimon/s3/HadoopCompliantFileIO.java index 20d426660..9d44a22ce 100644 --- a/flink-table-store-filesystems/flink-table-store-oss-impl/src/main/java/org/apache/flink/table/store/oss/HadoopCompliantFileIO.java +++ b/paimon-filesystems/paimon-s3-impl/src/main/java/org/apache/paimon/s3/HadoopCompliantFileIO.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.oss; +package org.apache.paimon.s3; import org.apache.flink.table.store.fs.FileIO; import org.apache.flink.table.store.fs.FileStatus; diff --git a/flink-table-store-filesystems/flink-table-store-s3-impl/src/main/java/org/apache/flink/table/store/s3/S3FileIO.java b/paimon-filesystems/paimon-s3-impl/src/main/java/org/apache/paimon/s3/S3FileIO.java similarity index 99% rename from flink-table-store-filesystems/flink-table-store-s3-impl/src/main/java/org/apache/flink/table/store/s3/S3FileIO.java rename to paimon-filesystems/paimon-s3-impl/src/main/java/org/apache/paimon/s3/S3FileIO.java index 684300f76..807376b40 100644 --- a/flink-table-store-filesystems/flink-table-store-s3-impl/src/main/java/org/apache/flink/table/store/s3/S3FileIO.java +++ b/paimon-filesystems/paimon-s3-impl/src/main/java/org/apache/paimon/s3/S3FileIO.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.s3; +package org.apache.paimon.s3; import org.apache.flink.table.store.catalog.CatalogContext; import org.apache.flink.table.store.fs.FileIO; diff --git a/flink-table-store-filesystems/flink-table-store-s3-impl/src/main/resources/META-INF/NOTICE b/paimon-filesystems/paimon-s3-impl/src/main/resources/META-INF/NOTICE similarity index 100% rename from flink-table-store-filesystems/flink-table-store-s3-impl/src/main/resources/META-INF/NOTICE rename to paimon-filesystems/paimon-s3-impl/src/main/resources/META-INF/NOTICE diff --git a/flink-table-store-filesystems/flink-table-store-s3-impl/src/main/resources/META-INF/licenses/LICENSE-re2j b/paimon-filesystems/paimon-s3-impl/src/main/resources/META-INF/licenses/LICENSE-re2j similarity index 100% rename from flink-table-store-filesystems/flink-table-store-s3-impl/src/main/resources/META-INF/licenses/LICENSE-re2j rename to paimon-filesystems/paimon-s3-impl/src/main/resources/META-INF/licenses/LICENSE-re2j diff --git a/flink-table-store-filesystems/flink-table-store-s3-impl/src/main/resources/META-INF/licenses/LICENSE-stax2api b/paimon-filesystems/paimon-s3-impl/src/main/resources/META-INF/licenses/LICENSE-stax2api similarity index 100% rename from flink-table-store-filesystems/flink-table-store-s3-impl/src/main/resources/META-INF/licenses/LICENSE-stax2api rename to paimon-filesystems/paimon-s3-impl/src/main/resources/META-INF/licenses/LICENSE-stax2api diff --git a/flink-table-store-filesystems/flink-table-store-s3-impl/src/main/resources/META-INF/licenses/LICENSE.jaxb b/paimon-filesystems/paimon-s3-impl/src/main/resources/META-INF/licenses/LICENSE.jaxb similarity index 100% rename from flink-table-store-filesystems/flink-table-store-s3-impl/src/main/resources/META-INF/licenses/LICENSE.jaxb rename to paimon-filesystems/paimon-s3-impl/src/main/resources/META-INF/licenses/LICENSE.jaxb diff --git a/flink-table-store-filesystems/flink-table-store-s3/pom.xml b/paimon-filesystems/paimon-s3/pom.xml similarity index 100% rename from flink-table-store-filesystems/flink-table-store-s3/pom.xml rename to paimon-filesystems/paimon-s3/pom.xml diff --git a/flink-table-store-filesystems/flink-table-store-s3/src/main/java/org/apache/flink/table/store/s3/S3Loader.java b/paimon-filesystems/paimon-s3/src/main/java/org/apache/paimon/s3/S3Loader.java similarity index 94% rename from flink-table-store-filesystems/flink-table-store-s3/src/main/java/org/apache/flink/table/store/s3/S3Loader.java rename to paimon-filesystems/paimon-s3/src/main/java/org/apache/paimon/s3/S3Loader.java index 1683d915f..c7c86589b 100644 --- a/flink-table-store-filesystems/flink-table-store-s3/src/main/java/org/apache/flink/table/store/s3/S3Loader.java +++ b/paimon-filesystems/paimon-s3/src/main/java/org/apache/paimon/s3/S3Loader.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.s3; +package org.apache.paimon.s3; import org.apache.flink.table.store.catalog.CatalogContext; import org.apache.flink.table.store.fs.FileIO; @@ -30,7 +30,7 @@ public class S3Loader implements FileIOLoader { private static final String S3_JAR = "flink-table-store-plugin-s3.jar"; - private static final String S3_CLASS = "org.apache.flink.table.store.s3.S3FileIO"; + private static final String S3_CLASS = "org.apache.paimon.s3.S3FileIO"; // Singleton lazy initialization diff --git a/flink-table-store-filesystems/flink-table-store-oss/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader b/paimon-filesystems/paimon-s3/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader similarity index 94% rename from flink-table-store-filesystems/flink-table-store-oss/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader rename to paimon-filesystems/paimon-s3/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader index e73153603..bf91f2b83 100644 --- a/flink-table-store-filesystems/flink-table-store-oss/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader +++ b/paimon-filesystems/paimon-s3/src/main/resources/META-INF/services/org.apache.flink.table.store.fs.FileIOLoader @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.flink.table.store.oss.OSSLoader +org.apache.paimon.s3.S3Loader diff --git a/flink-table-store-filesystems/pom.xml b/paimon-filesystems/pom.xml similarity index 86% rename from flink-table-store-filesystems/pom.xml rename to paimon-filesystems/pom.xml index 6e996959c..08d3cbb4a 100644 --- a/flink-table-store-filesystems/pom.xml +++ b/paimon-filesystems/pom.xml @@ -32,11 +32,11 @@ <packaging>pom</packaging> <modules> - <module>flink-table-store-hadoop-shaded</module> - <module>flink-table-store-oss</module> - <module>flink-table-store-oss-impl</module> - <module>flink-table-store-s3</module> - <module>flink-table-store-s3-impl</module> + <module>paimon-hadoop-shaded</module> + <module>paimon-oss</module> + <module>paimon-oss-impl</module> + <module>paimon-s3</module> + <module>paimon-s3-impl</module> </modules> <properties> diff --git a/flink-table-store-shade/pom.xml b/paimon-shade/pom.xml similarity index 100% rename from flink-table-store-shade/pom.xml rename to paimon-shade/pom.xml diff --git a/pom.xml b/pom.xml index b069216f6..1137f3b22 100644 --- a/pom.xml +++ b/pom.xml @@ -60,9 +60,9 @@ under the License. <module>paimon-flink</module> <module>flink-table-store-docs</module> <module>flink-table-store-e2e-tests</module> - <module>flink-table-store-filesystems</module> + <module>paimon-filesystems</module> <module>flink-table-store-format</module> - <module>flink-table-store-shade</module> + <module>paimon-shade</module> <module>paimon-hive</module> <module>paimon-spark</module> <module>paimon-test-utils</module>
