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 642bc704b2d6ff1a2a28630dd2929c3d0d8371d0 Author: JingsongLi <[email protected]> AuthorDate: Fri Mar 17 12:18:32 2023 +0800 [core] Rename paimon hive --- docs/content/engines/hive.md | 2 +- docs/content/how-to/creating-tables.md | 2 +- .../org/apache/flink/table/store/tests/HiveE2eTest.java | 2 +- .../paimon-hive-catalog}/pom.xml | 0 .../main/java/org/apache/paimon}/hive/HiveCatalog.java | 15 +++++++-------- .../java/org/apache/paimon}/hive/HiveCatalogFactory.java | 2 +- .../java/org/apache/paimon}/hive/HiveCatalogLock.java | 2 +- .../org/apache/paimon}/hive/SerializableHiveConf.java | 2 +- .../src/main/resources-filtered/META-INF/NOTICE | 0 ....apache.flink.table.store.file.catalog.CatalogFactory | 2 +- .../paimon}/hive/AlterFailHiveMetaStoreClient.java | 2 +- .../paimon}/hive/CreateFailHiveMetaStoreClient.java | 2 +- .../paimon}/hive/CustomHiveMetastoreClientITCase.java | 2 +- .../java/org/apache/paimon}/hive/HiveCatalogITCase.java | 2 +- .../org/apache/paimon}/hive/TestHiveMetaStoreClient.java | 2 +- .../paimon-hive-common}/pom.xml | 0 .../main/java/org/apache/paimon}/hive/HiveTypeUtils.java | 2 +- .../paimon-hive-connector-2.1-cdh-6.3}/pom.xml | 0 .../paimon-hive-connector-2.1}/pom.xml | 0 .../paimon-hive-connector-2.2}/pom.xml | 0 .../paimon-hive-connector-2.3}/pom.xml | 0 .../paimon-hive-connector-3.1}/pom.xml | 0 .../objectinspector/TableStoreDateObjectInspector.java | 2 +- .../TableStoreTimestampObjectInspector.java | 2 +- .../paimon-hive-connector-common}/pom.xml | 0 .../main/java/org/apache/paimon}/hive/HiveSchema.java | 2 +- .../java/org/apache/paimon/hive}/RowDataContainer.java | 2 +- .../paimon/hive}/SearchArgumentToPredicateConverter.java | 2 +- .../org/apache/paimon}/hive/TableStoreHiveMetaHook.java | 6 +++--- .../paimon}/hive/TableStoreHiveStorageHandler.java | 8 +++----- .../java/org/apache/paimon/hive}/TableStoreJobConf.java | 2 +- .../java/org/apache/paimon}/hive/TableStoreSerDe.java | 6 ++---- .../paimon/hive}/mapred/TableStoreInputFormat.java | 8 ++++---- .../apache/paimon/hive}/mapred/TableStoreInputSplit.java | 2 +- .../paimon/hive}/mapred/TableStoreOutputFormat.java | 2 +- .../paimon/hive}/mapred/TableStoreRecordReader.java | 4 ++-- .../objectinspector/TableStoreCharObjectInspector.java | 2 +- .../objectinspector/TableStoreDateObjectInspector.java | 2 +- .../TableStoreDecimalObjectInspector.java | 2 +- .../objectinspector/TableStoreListObjectInspector.java | 2 +- .../objectinspector/TableStoreMapObjectInspector.java | 2 +- .../TableStoreObjectInspectorFactory.java | 4 ++-- .../TableStoreRowDataObjectInspector.java | 4 ++-- .../objectinspector/TableStoreStringObjectInspector.java | 2 +- .../TableStoreTimestampObjectInspector.java | 2 +- .../TableStoreVarcharObjectInspector.java | 2 +- .../java/org/apache/paimon/hive}/FileStoreTestUtils.java | 3 ++- .../org/apache/paimon}/hive/HiveTableSchemaTest.java | 2 +- .../paimon}/hive/RandomGenericRowDataGenerator.java | 2 +- .../hive}/SearchArgumentToPredicateConverterTest.java | 4 ++-- .../paimon}/hive/TableStoreHiveStorageHandlerITCase.java | 7 +++---- .../org/apache/paimon}/hive/TableStoreSerDeTest.java | 13 ++++++------- .../paimon/hive}/mapred/TableStoreInputSplitTest.java | 2 +- .../paimon/hive}/mapred/TableStoreRecordReaderTest.java | 6 +++--- .../TableStoreCharObjectInspectorTest.java | 2 +- .../TableStoreDateObjectInspectorTest.java | 2 +- .../TableStoreDecimalObjectInspectorTest.java | 2 +- .../TableStoreListObjectInspectorTest.java | 2 +- .../TableStoreMapObjectInspectorTest.java | 2 +- .../TableStoreRowDataObjectInspectorTest.java | 12 ++++++------ .../TableStoreStringObjectInspectorTest.java | 2 +- .../TableStoreTimestampObjectInspectorTest.java | 2 +- .../TableStoreVarcharObjectInspectorTest.java | 2 +- .../src/test/resources/log4j2-test.properties | 0 {flink-table-store-hive => paimon-hive}/pom.xml | 16 ++++++++-------- pom.xml | 2 +- 66 files changed, 96 insertions(+), 102 deletions(-) diff --git a/docs/content/engines/hive.md b/docs/content/engines/hive.md index 84ddfb3e7..a960c2b1c 100644 --- a/docs/content/engines/hive.md +++ b/docs/content/engines/hive.md @@ -164,7 +164,7 @@ To access existing table store table, you can also register them as external tab -- Pointing the location to the path of table is enough. CREATE EXTERNAL TABLE external_test_table -STORED BY 'org.apache.flink.table.store.hive.TableStoreHiveStorageHandler' +STORED BY 'org.apache.paimon.hive.TableStoreHiveStorageHandler' LOCATION '/path/to/table/store/warehouse/default.db/test_table'; -- Read records from external_test_table diff --git a/docs/content/how-to/creating-tables.md b/docs/content/how-to/creating-tables.md index a83ea6e46..4782252ac 100644 --- a/docs/content/how-to/creating-tables.md +++ b/docs/content/how-to/creating-tables.md @@ -363,7 +363,7 @@ Hive SQL only supports reading from an external table. The following SQL creates ```sql CREATE EXTERNAL TABLE my_table -STORED BY 'org.apache.flink.table.store.hive.TableStoreHiveStorageHandler' +STORED BY 'org.apache.paimon.hive.TableStoreHiveStorageHandler' LOCATION 'hdfs://path/to/table'; ``` diff --git a/flink-table-store-e2e-tests/src/test/java/org/apache/flink/table/store/tests/HiveE2eTest.java b/flink-table-store-e2e-tests/src/test/java/org/apache/flink/table/store/tests/HiveE2eTest.java index 7d0d38de6..5630d1698 100644 --- a/flink-table-store-e2e-tests/src/test/java/org/apache/flink/table/store/tests/HiveE2eTest.java +++ b/flink-table-store-e2e-tests/src/test/java/org/apache/flink/table/store/tests/HiveE2eTest.java @@ -78,7 +78,7 @@ public class HiveE2eTest extends E2eReaderTestBase { String externalTablePkDdl = String.format( "CREATE EXTERNAL TABLE IF NOT EXISTS %s\n" - + "STORED BY 'org.apache.flink.table.store.hive.TableStoreHiveStorageHandler'\n" + + "STORED BY 'org.apache.paimon.hive.TableStoreHiveStorageHandler'\n" + "LOCATION '%s/default.db/%s';\n", table, tableStorePkPath, table); diff --git a/flink-table-store-hive/flink-table-store-hive-catalog/pom.xml b/paimon-hive/paimon-hive-catalog/pom.xml similarity index 100% rename from flink-table-store-hive/flink-table-store-hive-catalog/pom.xml rename to paimon-hive/paimon-hive-catalog/pom.xml diff --git a/flink-table-store-hive/flink-table-store-hive-catalog/src/main/java/org/apache/flink/table/store/hive/HiveCatalog.java b/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalog.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-catalog/src/main/java/org/apache/flink/table/store/hive/HiveCatalog.java rename to paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalog.java index 842e84bdf..91bf9766e 100644 --- a/flink-table-store-hive/flink-table-store-hive-catalog/src/main/java/org/apache/flink/table/store/hive/HiveCatalog.java +++ b/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalog.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; import org.apache.flink.table.store.file.catalog.AbstractCatalog; import org.apache.flink.table.store.file.catalog.CatalogLock; @@ -60,11 +60,11 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import static org.apache.flink.table.store.hive.HiveCatalogLock.acquireTimeout; -import static org.apache.flink.table.store.hive.HiveCatalogLock.checkMaxSleep; import static org.apache.flink.table.store.options.CatalogOptions.LOCK_ENABLED; import static org.apache.flink.table.store.options.CatalogOptions.TABLE_TYPE; import static org.apache.flink.table.store.utils.Preconditions.checkState; +import static org.apache.paimon.hive.HiveCatalogLock.acquireTimeout; +import static org.apache.paimon.hive.HiveCatalogLock.checkMaxSleep; /** A catalog implementation for Hive. */ public class HiveCatalog extends AbstractCatalog { @@ -73,13 +73,12 @@ public class HiveCatalog extends AbstractCatalog { // we don't include flink-table-store-hive-connector as dependencies because it depends on // hive-exec private static final String INPUT_FORMAT_CLASS_NAME = - "org.apache.flink.table.store.mapred.TableStoreInputFormat"; + "org.apache.paimon.hive.mapred.TableStoreInputFormat"; private static final String OUTPUT_FORMAT_CLASS_NAME = - "org.apache.flink.table.store.mapred.TableStoreOutputFormat"; - private static final String SERDE_CLASS_NAME = - "org.apache.flink.table.store.hive.TableStoreSerDe"; + "org.apache.paimon.hive.mapred.TableStoreOutputFormat"; + private static final String SERDE_CLASS_NAME = "org.apache.paimon.hive.TableStoreSerDe"; private static final String STORAGE_HANDLER_CLASS_NAME = - "org.apache.flink.table.store.hive.TableStoreHiveStorageHandler"; + "org.apache.paimon.hive.TableStoreHiveStorageHandler"; private final HiveConf hiveConf; private final String clientClassName; diff --git a/flink-table-store-hive/flink-table-store-hive-catalog/src/main/java/org/apache/flink/table/store/hive/HiveCatalogFactory.java b/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalogFactory.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-catalog/src/main/java/org/apache/flink/table/store/hive/HiveCatalogFactory.java rename to paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalogFactory.java index 6e9492495..0db2c2bf6 100644 --- a/flink-table-store-hive/flink-table-store-hive-catalog/src/main/java/org/apache/flink/table/store/hive/HiveCatalogFactory.java +++ b/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalogFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; import org.apache.flink.table.store.catalog.CatalogContext; import org.apache.flink.table.store.file.catalog.Catalog; diff --git a/flink-table-store-hive/flink-table-store-hive-catalog/src/main/java/org/apache/flink/table/store/hive/HiveCatalogLock.java b/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalogLock.java similarity index 99% rename from flink-table-store-hive/flink-table-store-hive-catalog/src/main/java/org/apache/flink/table/store/hive/HiveCatalogLock.java rename to paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalogLock.java index c76d9b489..c8bc909af 100644 --- a/flink-table-store-hive/flink-table-store-hive-catalog/src/main/java/org/apache/flink/table/store/hive/HiveCatalogLock.java +++ b/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalogLock.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; import org.apache.flink.table.store.file.catalog.CatalogLock; import org.apache.flink.table.store.utils.TimeUtils; diff --git a/flink-table-store-hive/flink-table-store-hive-catalog/src/main/java/org/apache/flink/table/store/hive/SerializableHiveConf.java b/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/SerializableHiveConf.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-catalog/src/main/java/org/apache/flink/table/store/hive/SerializableHiveConf.java rename to paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/SerializableHiveConf.java index b07bef5b6..9ee9a4010 100644 --- a/flink-table-store-hive/flink-table-store-hive-catalog/src/main/java/org/apache/flink/table/store/hive/SerializableHiveConf.java +++ b/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/SerializableHiveConf.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; import org.apache.flink.table.store.io.DataInputDeserializer; import org.apache.flink.table.store.io.DataOutputSerializer; diff --git a/flink-table-store-hive/flink-table-store-hive-catalog/src/main/resources-filtered/META-INF/NOTICE b/paimon-hive/paimon-hive-catalog/src/main/resources-filtered/META-INF/NOTICE similarity index 100% rename from flink-table-store-hive/flink-table-store-hive-catalog/src/main/resources-filtered/META-INF/NOTICE rename to paimon-hive/paimon-hive-catalog/src/main/resources-filtered/META-INF/NOTICE diff --git a/flink-table-store-hive/flink-table-store-hive-catalog/src/main/resources/META-INF/services/org.apache.flink.table.store.file.catalog.CatalogFactory b/paimon-hive/paimon-hive-catalog/src/main/resources/META-INF/services/org.apache.flink.table.store.file.catalog.CatalogFactory similarity index 93% rename from flink-table-store-hive/flink-table-store-hive-catalog/src/main/resources/META-INF/services/org.apache.flink.table.store.file.catalog.CatalogFactory rename to paimon-hive/paimon-hive-catalog/src/main/resources/META-INF/services/org.apache.flink.table.store.file.catalog.CatalogFactory index e9404fcd6..dcc7e6554 100644 --- a/flink-table-store-hive/flink-table-store-hive-catalog/src/main/resources/META-INF/services/org.apache.flink.table.store.file.catalog.CatalogFactory +++ b/paimon-hive/paimon-hive-catalog/src/main/resources/META-INF/services/org.apache.flink.table.store.file.catalog.CatalogFactory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -org.apache.flink.table.store.hive.HiveCatalogFactory +org.apache.paimon.hive.HiveCatalogFactory diff --git a/flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/AlterFailHiveMetaStoreClient.java b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/AlterFailHiveMetaStoreClient.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/AlterFailHiveMetaStoreClient.java rename to paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/AlterFailHiveMetaStoreClient.java index aac3d4295..6f77c0cf8 100644 --- a/flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/AlterFailHiveMetaStoreClient.java +++ b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/AlterFailHiveMetaStoreClient.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.HiveMetaHookLoader; diff --git a/flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/CreateFailHiveMetaStoreClient.java b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/CreateFailHiveMetaStoreClient.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/CreateFailHiveMetaStoreClient.java rename to paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/CreateFailHiveMetaStoreClient.java index 3bae66a49..71afbdc0c 100644 --- a/flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/CreateFailHiveMetaStoreClient.java +++ b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/CreateFailHiveMetaStoreClient.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.HiveMetaHookLoader; diff --git a/flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/CustomHiveMetastoreClientITCase.java b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/CustomHiveMetastoreClientITCase.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/CustomHiveMetastoreClientITCase.java rename to paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/CustomHiveMetastoreClientITCase.java index d979bbdf0..2970f8343 100644 --- a/flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/CustomHiveMetastoreClientITCase.java +++ b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/CustomHiveMetastoreClientITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; import org.apache.flink.connectors.hive.FlinkEmbeddedHiveRunner; import org.apache.flink.table.api.EnvironmentSettings; diff --git a/flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/HiveCatalogITCase.java b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/HiveCatalogITCase.java similarity index 99% rename from flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/HiveCatalogITCase.java rename to paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/HiveCatalogITCase.java index fed4d3d31..ae72249b6 100644 --- a/flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/HiveCatalogITCase.java +++ b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/HiveCatalogITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; import org.apache.flink.connectors.hive.FlinkEmbeddedHiveRunner; import org.apache.flink.core.fs.Path; diff --git a/flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/TestHiveMetaStoreClient.java b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/TestHiveMetaStoreClient.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/TestHiveMetaStoreClient.java rename to paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/TestHiveMetaStoreClient.java index a8e5d316b..9312d6d59 100644 --- a/flink-table-store-hive/flink-table-store-hive-catalog/src/test/java/org/apache/flink/table/store/hive/TestHiveMetaStoreClient.java +++ b/paimon-hive/paimon-hive-catalog/src/test/java/org/apache/paimon/hive/TestHiveMetaStoreClient.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.HiveMetaHookLoader; diff --git a/flink-table-store-hive/flink-table-store-hive-common/pom.xml b/paimon-hive/paimon-hive-common/pom.xml similarity index 100% rename from flink-table-store-hive/flink-table-store-hive-common/pom.xml rename to paimon-hive/paimon-hive-common/pom.xml diff --git a/flink-table-store-hive/flink-table-store-hive-common/src/main/java/org/apache/flink/table/store/hive/HiveTypeUtils.java b/paimon-hive/paimon-hive-common/src/main/java/org/apache/paimon/hive/HiveTypeUtils.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-common/src/main/java/org/apache/flink/table/store/hive/HiveTypeUtils.java rename to paimon-hive/paimon-hive-common/src/main/java/org/apache/paimon/hive/HiveTypeUtils.java index ccde87d98..b781eef5e 100644 --- a/flink-table-store-hive/flink-table-store-hive-common/src/main/java/org/apache/flink/table/store/hive/HiveTypeUtils.java +++ b/paimon-hive/paimon-hive-common/src/main/java/org/apache/paimon/hive/HiveTypeUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; import org.apache.flink.table.store.types.ArrayType; import org.apache.flink.table.store.types.CharType; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-2.1-cdh-6.3/pom.xml b/paimon-hive/paimon-hive-connector-2.1-cdh-6.3/pom.xml similarity index 100% rename from flink-table-store-hive/flink-table-store-hive-connector-2.1-cdh-6.3/pom.xml rename to paimon-hive/paimon-hive-connector-2.1-cdh-6.3/pom.xml diff --git a/flink-table-store-hive/flink-table-store-hive-connector-2.1/pom.xml b/paimon-hive/paimon-hive-connector-2.1/pom.xml similarity index 100% rename from flink-table-store-hive/flink-table-store-hive-connector-2.1/pom.xml rename to paimon-hive/paimon-hive-connector-2.1/pom.xml diff --git a/flink-table-store-hive/flink-table-store-hive-connector-2.2/pom.xml b/paimon-hive/paimon-hive-connector-2.2/pom.xml similarity index 100% rename from flink-table-store-hive/flink-table-store-hive-connector-2.2/pom.xml rename to paimon-hive/paimon-hive-connector-2.2/pom.xml diff --git a/flink-table-store-hive/flink-table-store-hive-connector-2.3/pom.xml b/paimon-hive/paimon-hive-connector-2.3/pom.xml similarity index 100% rename from flink-table-store-hive/flink-table-store-hive-connector-2.3/pom.xml rename to paimon-hive/paimon-hive-connector-2.3/pom.xml diff --git a/flink-table-store-hive/flink-table-store-hive-connector-3.1/pom.xml b/paimon-hive/paimon-hive-connector-3.1/pom.xml similarity index 100% rename from flink-table-store-hive/flink-table-store-hive-connector-3.1/pom.xml rename to paimon-hive/paimon-hive-connector-3.1/pom.xml diff --git a/flink-table-store-hive/flink-table-store-hive-connector-3.1/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspector.java b/paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspector.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-connector-3.1/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspector.java rename to paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspector.java index b64fcba34..fe8cb82c7 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-3.1/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspector.java +++ b/paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspector.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.hadoop.hive.common.type.Date; import org.apache.hadoop.hive.serde2.io.DateWritableV2; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-3.1/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java b/paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspector.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-connector-3.1/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java rename to paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspector.java index 346497939..c2ed007d7 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-3.1/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java +++ b/paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspector.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.hadoop.hive.common.type.Timestamp; import org.apache.hadoop.hive.serde2.io.TimestampWritableV2; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/pom.xml b/paimon-hive/paimon-hive-connector-common/pom.xml similarity index 100% rename from flink-table-store-hive/flink-table-store-hive-connector-common/pom.xml rename to paimon-hive/paimon-hive-connector-common/pom.xml diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/HiveSchema.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/HiveSchema.java similarity index 99% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/HiveSchema.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/HiveSchema.java index 25fcbe61f..fa29d0f04 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/HiveSchema.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/HiveSchema.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; import org.apache.flink.table.store.CoreOptions; import org.apache.flink.table.store.catalog.CatalogContext; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/RowDataContainer.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/RowDataContainer.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/RowDataContainer.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/RowDataContainer.java index 260673b4f..1ff65a3ea 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/RowDataContainer.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/RowDataContainer.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store; +package org.apache.paimon.hive; import org.apache.flink.table.store.data.InternalRow; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/SearchArgumentToPredicateConverter.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/SearchArgumentToPredicateConverter.java similarity index 99% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/SearchArgumentToPredicateConverter.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/SearchArgumentToPredicateConverter.java index ce423d1bb..4449b299e 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/SearchArgumentToPredicateConverter.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/SearchArgumentToPredicateConverter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store; +package org.apache.paimon.hive; import org.apache.flink.table.store.file.predicate.Predicate; import org.apache.flink.table.store.file.predicate.PredicateBuilder; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreHiveMetaHook.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreHiveMetaHook.java similarity index 92% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreHiveMetaHook.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreHiveMetaHook.java index f637aba0c..531b81e9c 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreHiveMetaHook.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreHiveMetaHook.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; -import org.apache.flink.table.store.mapred.TableStoreInputFormat; -import org.apache.flink.table.store.mapred.TableStoreOutputFormat; import org.apache.flink.table.store.utils.Preconditions; import org.apache.hadoop.hive.metastore.HiveMetaHook; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.Table; +import org.apache.paimon.hive.mapred.TableStoreInputFormat; +import org.apache.paimon.hive.mapred.TableStoreOutputFormat; /** * {@link HiveMetaHook} for table store. Currently this class is only used to set input and output diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreHiveStorageHandler.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreHiveStorageHandler.java similarity index 94% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreHiveStorageHandler.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreHiveStorageHandler.java index fa725d806..2f95b90d6 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreHiveStorageHandler.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreHiveStorageHandler.java @@ -16,11 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; - -import org.apache.flink.table.store.TableStoreJobConf; -import org.apache.flink.table.store.mapred.TableStoreInputFormat; -import org.apache.flink.table.store.mapred.TableStoreOutputFormat; +package org.apache.paimon.hive; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.metastore.HiveMetaHook; @@ -36,6 +32,8 @@ import org.apache.hadoop.hive.serde2.Deserializer; import org.apache.hadoop.mapred.InputFormat; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.OutputFormat; +import org.apache.paimon.hive.mapred.TableStoreInputFormat; +import org.apache.paimon.hive.mapred.TableStoreOutputFormat; import java.util.Map; import java.util.Properties; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/TableStoreJobConf.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreJobConf.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/TableStoreJobConf.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreJobConf.java index a7bc52988..57e5c2bcc 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/TableStoreJobConf.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreJobConf.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store; +package org.apache.paimon.hive; import org.apache.flink.table.store.file.utils.JsonSerdeUtil; import org.apache.flink.table.store.options.Options; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreSerDe.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreSerDe.java similarity index 93% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreSerDe.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreSerDe.java index 0b79c5c31..eba57de5b 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreSerDe.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreSerDe.java @@ -16,10 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; - -import org.apache.flink.table.store.RowDataContainer; -import org.apache.flink.table.store.hive.objectinspector.TableStoreRowDataObjectInspector; +package org.apache.paimon.hive; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.serde2.AbstractSerDe; @@ -27,6 +24,7 @@ import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeStats; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.io.Writable; +import org.apache.paimon.hive.objectinspector.TableStoreRowDataObjectInspector; import javax.annotation.Nullable; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreInputFormat.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreInputFormat.java similarity index 95% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreInputFormat.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreInputFormat.java index 2cef226dd..e27679636 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreInputFormat.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreInputFormat.java @@ -16,12 +16,9 @@ * limitations under the License. */ -package org.apache.flink.table.store.mapred; +package org.apache.paimon.hive.mapred; import org.apache.flink.table.store.CoreOptions; -import org.apache.flink.table.store.RowDataContainer; -import org.apache.flink.table.store.SearchArgumentToPredicateConverter; -import org.apache.flink.table.store.TableStoreJobConf; import org.apache.flink.table.store.catalog.CatalogContext; import org.apache.flink.table.store.file.predicate.Predicate; import org.apache.flink.table.store.file.schema.TableSchema; @@ -39,6 +36,9 @@ import org.apache.hadoop.mapred.InputSplit; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.RecordReader; import org.apache.hadoop.mapred.Reporter; +import org.apache.paimon.hive.RowDataContainer; +import org.apache.paimon.hive.SearchArgumentToPredicateConverter; +import org.apache.paimon.hive.TableStoreJobConf; import java.io.IOException; import java.util.Arrays; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreInputSplit.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreInputSplit.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreInputSplit.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreInputSplit.java index 020215967..f0bc33eb0 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreInputSplit.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreInputSplit.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.mapred; +package org.apache.paimon.hive.mapred; import org.apache.flink.table.store.file.io.DataFileMeta; import org.apache.flink.table.store.io.DataInputDeserializer; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreOutputFormat.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreOutputFormat.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreOutputFormat.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreOutputFormat.java index 3ed88ed39..79530e48b 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreOutputFormat.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreOutputFormat.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.mapred; +package org.apache.paimon.hive.mapred; import org.apache.flink.table.store.data.InternalRow; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreRecordReader.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreRecordReader.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreRecordReader.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreRecordReader.java index 66c76118d..f1667ba3b 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreRecordReader.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreRecordReader.java @@ -16,9 +16,8 @@ * limitations under the License. */ -package org.apache.flink.table.store.mapred; +package org.apache.paimon.hive.mapred; -import org.apache.flink.table.store.RowDataContainer; import org.apache.flink.table.store.data.InternalRow; import org.apache.flink.table.store.file.KeyValue; import org.apache.flink.table.store.reader.RecordReaderIterator; @@ -26,6 +25,7 @@ import org.apache.flink.table.store.table.source.ReadBuilder; import org.apache.flink.table.store.utils.ProjectedRow; import org.apache.hadoop.mapred.RecordReader; +import org.apache.paimon.hive.RowDataContainer; import javax.annotation.Nullable; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreCharObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreCharObjectInspector.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreCharObjectInspector.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreCharObjectInspector.java index 25996831a..8575e915f 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreCharObjectInspector.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreCharObjectInspector.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.BinaryString; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspector.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspector.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspector.java index 2a5122fb6..5d1e7a45c 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspector.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspector.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.utils.DateTimeUtils; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDecimalObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDecimalObjectInspector.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDecimalObjectInspector.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDecimalObjectInspector.java index ef393c347..10983fd4f 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDecimalObjectInspector.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDecimalObjectInspector.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.Decimal; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreListObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreListObjectInspector.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreListObjectInspector.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreListObjectInspector.java index 7cf2f1e60..14829f101 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreListObjectInspector.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreListObjectInspector.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.InternalArray; import org.apache.flink.table.store.types.DataType; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreMapObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreMapObjectInspector.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreMapObjectInspector.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreMapObjectInspector.java index bfc3262e5..1572f74dc 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreMapObjectInspector.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreMapObjectInspector.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.InternalArray; import org.apache.flink.table.store.data.InternalMap; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreObjectInspectorFactory.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreObjectInspectorFactory.java similarity index 96% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreObjectInspectorFactory.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreObjectInspectorFactory.java index cc32abd3d..623cedb98 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreObjectInspectorFactory.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreObjectInspectorFactory.java @@ -16,9 +16,8 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; -import org.apache.flink.table.store.hive.HiveTypeUtils; import org.apache.flink.table.store.types.ArrayType; import org.apache.flink.table.store.types.CharType; import org.apache.flink.table.store.types.DataType; @@ -29,6 +28,7 @@ import org.apache.flink.table.store.types.VarCharType; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo; +import org.apache.paimon.hive.HiveTypeUtils; /** Factory to create {@link ObjectInspector}s according to the given {@link DataType}. */ public class TableStoreObjectInspectorFactory { diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreRowDataObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreRowDataObjectInspector.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreRowDataObjectInspector.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreRowDataObjectInspector.java index fa1708c59..c3e877a25 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreRowDataObjectInspector.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreRowDataObjectInspector.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.InternalRow; -import org.apache.flink.table.store.hive.HiveTypeUtils; import org.apache.flink.table.store.types.DataType; import org.apache.flink.table.store.utils.RowDataUtils; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.StructField; import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector; +import org.apache.paimon.hive.HiveTypeUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreStringObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreStringObjectInspector.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreStringObjectInspector.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreStringObjectInspector.java index c38522223..9c15153c1 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreStringObjectInspector.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreStringObjectInspector.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.BinaryString; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspector.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspector.java index 34c2745cb..42fd34dfd 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspector.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.Timestamp; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreVarcharObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreVarcharObjectInspector.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreVarcharObjectInspector.java rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreVarcharObjectInspector.java index f2524ceed..88127914f 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreVarcharObjectInspector.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreVarcharObjectInspector.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.BinaryString; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/FileStoreTestUtils.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/FileStoreTestUtils.java similarity index 96% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/FileStoreTestUtils.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/FileStoreTestUtils.java index f8ad7c6a5..a52b26d8a 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/FileStoreTestUtils.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/FileStoreTestUtils.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package org.apache.flink.table.store; +package org.apache.paimon.hive; +import org.apache.flink.table.store.CoreOptions; import org.apache.flink.table.store.file.schema.Schema; import org.apache.flink.table.store.file.schema.SchemaManager; import org.apache.flink.table.store.fs.Path; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/HiveTableSchemaTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/HiveTableSchemaTest.java similarity index 99% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/HiveTableSchemaTest.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/HiveTableSchemaTest.java index 373c4c0ab..6315e9cec 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/HiveTableSchemaTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/HiveTableSchemaTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; import org.apache.flink.table.store.file.schema.Schema; import org.apache.flink.table.store.file.schema.SchemaManager; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/RandomGenericRowDataGenerator.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/RandomGenericRowDataGenerator.java similarity index 99% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/RandomGenericRowDataGenerator.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/RandomGenericRowDataGenerator.java index 72c0d66f5..a7eab6590 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/RandomGenericRowDataGenerator.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/RandomGenericRowDataGenerator.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; import org.apache.flink.table.store.data.BinaryString; import org.apache.flink.table.store.data.Decimal; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/SearchArgumentToPredicateConverterTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/SearchArgumentToPredicateConverterTest.java similarity index 99% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/SearchArgumentToPredicateConverterTest.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/SearchArgumentToPredicateConverterTest.java index 3a6459348..aa289cf40 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/SearchArgumentToPredicateConverterTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/SearchArgumentToPredicateConverterTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store; +package org.apache.paimon.hive; import org.apache.flink.table.store.data.BinaryString; import org.apache.flink.table.store.data.Decimal; @@ -42,7 +42,7 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -/** Tests for {@link SearchArgumentToPredicateConverter}. */ +/** Tests for {@link org.apache.paimon.hive.SearchArgumentToPredicateConverter}. */ public class SearchArgumentToPredicateConverterTest { @Test diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/TableStoreHiveStorageHandlerITCase.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreHiveStorageHandlerITCase.java similarity index 99% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/TableStoreHiveStorageHandlerITCase.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreHiveStorageHandlerITCase.java index ac4835f60..556e722c4 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/TableStoreHiveStorageHandlerITCase.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreHiveStorageHandlerITCase.java @@ -16,17 +16,15 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; import org.apache.flink.connectors.hive.FlinkEmbeddedHiveRunner; import org.apache.flink.table.store.CoreOptions; -import org.apache.flink.table.store.FileStoreTestUtils; import org.apache.flink.table.store.data.BinaryString; import org.apache.flink.table.store.data.GenericRow; import org.apache.flink.table.store.data.InternalRow; import org.apache.flink.table.store.data.Timestamp; import org.apache.flink.table.store.file.WriteMode; -import org.apache.flink.table.store.hive.objectinspector.TableStoreObjectInspectorFactory; import org.apache.flink.table.store.options.Options; import org.apache.flink.table.store.table.FileStoreTable; import org.apache.flink.table.store.table.sink.StreamTableCommit; @@ -43,6 +41,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.AbstractPrimitiveJavaObjectInspector; +import org.apache.paimon.hive.objectinspector.TableStoreObjectInspectorFactory; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -64,7 +63,7 @@ import java.util.concurrent.ThreadLocalRandom; /** * IT cases for {@link TableStoreHiveStorageHandler} and {@link - * org.apache.flink.table.store.mapred.TableStoreInputFormat}. + * org.apache.paimon.hive.mapred.TableStoreInputFormat}. */ @RunWith(FlinkEmbeddedHiveRunner.class) public class TableStoreHiveStorageHandlerITCase { diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/TableStoreSerDeTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreSerDeTest.java similarity index 86% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/TableStoreSerDeTest.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreSerDeTest.java index be6a15ca3..cd194546d 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/TableStoreSerDeTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreSerDeTest.java @@ -16,18 +16,17 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive; +package org.apache.paimon.hive; -import org.apache.flink.table.store.RowDataContainer; import org.apache.flink.table.store.data.GenericRow; import org.apache.flink.table.store.file.schema.Schema; import org.apache.flink.table.store.file.schema.SchemaManager; import org.apache.flink.table.store.fs.Path; import org.apache.flink.table.store.fs.local.LocalFileIO; -import org.apache.flink.table.store.hive.objectinspector.TableStoreRowDataObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.StructField; +import org.apache.paimon.hive.objectinspector.TableStoreRowDataObjectInspector; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -36,10 +35,10 @@ import java.util.HashMap; import java.util.List; import java.util.Properties; -import static org.apache.flink.table.store.hive.RandomGenericRowDataGenerator.FIELD_COMMENTS; -import static org.apache.flink.table.store.hive.RandomGenericRowDataGenerator.FIELD_NAMES; -import static org.apache.flink.table.store.hive.RandomGenericRowDataGenerator.ROW_TYPE; -import static org.apache.flink.table.store.hive.RandomGenericRowDataGenerator.generate; +import static org.apache.paimon.hive.RandomGenericRowDataGenerator.FIELD_COMMENTS; +import static org.apache.paimon.hive.RandomGenericRowDataGenerator.FIELD_NAMES; +import static org.apache.paimon.hive.RandomGenericRowDataGenerator.ROW_TYPE; +import static org.apache.paimon.hive.RandomGenericRowDataGenerator.generate; import static org.assertj.core.api.Assertions.assertThat; /** Tests for {@link TableStoreSerDe}. */ diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/mapred/TableStoreInputSplitTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/mapred/TableStoreInputSplitTest.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/mapred/TableStoreInputSplitTest.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/mapred/TableStoreInputSplitTest.java index bb911f0f7..bb1f8f475 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/mapred/TableStoreInputSplitTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/mapred/TableStoreInputSplitTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.mapred; +package org.apache.paimon.hive.mapred; import org.apache.flink.table.store.data.BinaryRow; import org.apache.flink.table.store.file.io.DataFileTestDataGenerator; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/mapred/TableStoreRecordReaderTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/mapred/TableStoreRecordReaderTest.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/mapred/TableStoreRecordReaderTest.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/mapred/TableStoreRecordReaderTest.java index 36cbbb51f..5591f3a09 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/mapred/TableStoreRecordReaderTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/mapred/TableStoreRecordReaderTest.java @@ -16,11 +16,9 @@ * limitations under the License. */ -package org.apache.flink.table.store.mapred; +package org.apache.paimon.hive.mapred; import org.apache.flink.table.store.CoreOptions; -import org.apache.flink.table.store.FileStoreTestUtils; -import org.apache.flink.table.store.RowDataContainer; import org.apache.flink.table.store.data.BinaryRow; import org.apache.flink.table.store.data.BinaryString; import org.apache.flink.table.store.data.GenericRow; @@ -35,6 +33,8 @@ import org.apache.flink.table.store.types.DataTypes; import org.apache.flink.table.store.types.RowKind; import org.apache.flink.table.store.types.RowType; +import org.apache.paimon.hive.FileStoreTestUtils; +import org.apache.paimon.hive.RowDataContainer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreCharObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreCharObjectInspectorTest.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreCharObjectInspectorTest.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreCharObjectInspectorTest.java index 4d6e80406..3a6ac755b 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreCharObjectInspectorTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreCharObjectInspectorTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.BinaryString; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspectorTest.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspectorTest.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspectorTest.java index e83728ef5..1076a4410 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspectorTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspectorTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.hadoop.hive.serde2.io.DateWritable; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDecimalObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreDecimalObjectInspectorTest.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDecimalObjectInspectorTest.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreDecimalObjectInspectorTest.java index 07fc705a7..60a0b2e93 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDecimalObjectInspectorTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreDecimalObjectInspectorTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.Decimal; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreListObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreListObjectInspectorTest.java similarity index 97% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreListObjectInspectorTest.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreListObjectInspectorTest.java index 23eeb018a..7d0adf992 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreListObjectInspectorTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreListObjectInspectorTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.BinaryString; import org.apache.flink.table.store.data.GenericArray; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreMapObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreMapObjectInspectorTest.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreMapObjectInspectorTest.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreMapObjectInspectorTest.java index 88d2159e8..980aefee9 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreMapObjectInspectorTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreMapObjectInspectorTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.BinaryString; import org.apache.flink.table.store.data.GenericMap; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreRowDataObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreRowDataObjectInspectorTest.java similarity index 91% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreRowDataObjectInspectorTest.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreRowDataObjectInspectorTest.java index 79fb3eea9..9fdc4ebde 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreRowDataObjectInspectorTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreRowDataObjectInspectorTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.GenericRow; @@ -27,11 +27,11 @@ import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.apache.flink.table.store.hive.RandomGenericRowDataGenerator.FIELD_COMMENTS; -import static org.apache.flink.table.store.hive.RandomGenericRowDataGenerator.FIELD_NAMES; -import static org.apache.flink.table.store.hive.RandomGenericRowDataGenerator.LOGICAL_TYPES; -import static org.apache.flink.table.store.hive.RandomGenericRowDataGenerator.TYPE_NAMES; -import static org.apache.flink.table.store.hive.RandomGenericRowDataGenerator.generate; +import static org.apache.paimon.hive.RandomGenericRowDataGenerator.FIELD_COMMENTS; +import static org.apache.paimon.hive.RandomGenericRowDataGenerator.FIELD_NAMES; +import static org.apache.paimon.hive.RandomGenericRowDataGenerator.LOGICAL_TYPES; +import static org.apache.paimon.hive.RandomGenericRowDataGenerator.TYPE_NAMES; +import static org.apache.paimon.hive.RandomGenericRowDataGenerator.generate; import static org.assertj.core.api.Assertions.assertThat; /** Tests for {@link TableStoreRowDataObjectInspector}. */ diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreStringObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreStringObjectInspectorTest.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreStringObjectInspectorTest.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreStringObjectInspectorTest.java index 03d805e67..7ebbb34d6 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreStringObjectInspectorTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreStringObjectInspectorTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.BinaryString; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspectorTest.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspectorTest.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspectorTest.java index 5fe040135..13abc7d18 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspectorTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspectorTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.Timestamp; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreVarcharObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreVarcharObjectInspectorTest.java similarity index 98% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreVarcharObjectInspectorTest.java rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreVarcharObjectInspectorTest.java index 54fdd5d72..a2e11c9ac 100644 --- a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreVarcharObjectInspectorTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreVarcharObjectInspectorTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store.hive.objectinspector; +package org.apache.paimon.hive.objectinspector; import org.apache.flink.table.store.data.BinaryString; diff --git a/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/resources/log4j2-test.properties b/paimon-hive/paimon-hive-connector-common/src/test/resources/log4j2-test.properties similarity index 100% rename from flink-table-store-hive/flink-table-store-hive-connector-common/src/test/resources/log4j2-test.properties rename to paimon-hive/paimon-hive-connector-common/src/test/resources/log4j2-test.properties diff --git a/flink-table-store-hive/pom.xml b/paimon-hive/pom.xml similarity index 76% rename from flink-table-store-hive/pom.xml rename to paimon-hive/pom.xml index d886a50d6..c39f101d6 100644 --- a/flink-table-store-hive/pom.xml +++ b/paimon-hive/pom.xml @@ -34,14 +34,14 @@ under the License. <packaging>pom</packaging> <modules> - <module>flink-table-store-hive-catalog</module> - <module>flink-table-store-hive-common</module> - <module>flink-table-store-hive-connector-common</module> - <module>flink-table-store-hive-connector-2.1</module> - <module>flink-table-store-hive-connector-2.1-cdh-6.3</module> - <module>flink-table-store-hive-connector-2.2</module> - <module>flink-table-store-hive-connector-2.3</module> - <module>flink-table-store-hive-connector-3.1</module> + <module>paimon-hive-catalog</module> + <module>paimon-hive-common</module> + <module>paimon-hive-connector-common</module> + <module>paimon-hive-connector-2.1</module> + <module>paimon-hive-connector-2.1-cdh-6.3</module> + <module>paimon-hive-connector-2.2</module> + <module>paimon-hive-connector-2.3</module> + <module>paimon-hive-connector-3.1</module> </modules> <properties> diff --git a/pom.xml b/pom.xml index fc0915605..156f4798a 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ under the License. <module>flink-table-store-filesystems</module> <module>flink-table-store-format</module> <module>flink-table-store-shade</module> - <module>flink-table-store-hive</module> + <module>paimon-hive</module> <module>paimon-spark</module> <module>paimon-test-utils</module> </modules>
