This is an automated email from the ASF dual-hosted git repository. snuyanzin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-connector-hive.git
commit 463292a0893f9589f299246fd5b3c6c2ebf6256d Author: xuyang <[email protected]> AuthorDate: Wed Sep 25 20:09:56 2024 +0800 [FLINK-36369][table] Move deprecated user-visible classes in table-common to the legacy package --- flink-connector-hive/pom.xml | 4 ++-- .../org/apache/flink/connectors/hive/HiveLookupTableSource.java | 2 +- .../java/org/apache/flink/connectors/hive/HiveTableFactory.java | 8 ++++---- .../java/org/apache/flink/table/catalog/hive/HiveCatalog.java | 4 ++-- .../table/catalog/hive/client/HiveMetastoreClientWrapper.java | 2 +- .../java/org/apache/flink/table/catalog/hive/client/HiveShim.java | 2 +- .../org/apache/flink/table/catalog/hive/client/HiveShimV100.java | 2 +- .../org/apache/flink/table/catalog/hive/client/HiveShimV210.java | 2 +- .../org/apache/flink/table/catalog/hive/client/HiveShimV310.java | 2 +- .../org/apache/flink/table/catalog/hive/util/HiveTableUtil.java | 2 +- .../delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java | 2 +- .../org/apache/flink/connectors/hive/HiveTableFactoryTest.java | 6 +++--- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/flink-connector-hive/pom.xml b/flink-connector-hive/pom.xml index 073262a4..36ba7cda 100644 --- a/flink-connector-hive/pom.xml +++ b/flink-connector-hive/pom.xml @@ -1383,14 +1383,14 @@ under the License. <artifact>org.apache.flink:flink-orc</artifact> <excludes> <exclude>META-INF/services/org.apache.flink.table.factories.Factory</exclude> - <exclude>META-INF/services/org.apache.flink.table.factories.TableFactory</exclude> + <exclude>META-INF/services/org.apache.flink.table.legacy.factories.TableFactory</exclude> </excludes> </filter> <filter> <artifact>org.apache.flink:flink-parquet</artifact> <excludes> <exclude>META-INF/services/org.apache.flink.table.factories.Factory</exclude> - <exclude>META-INF/services/org.apache.flink.table.factories.TableFactory</exclude> + <exclude>META-INF/services/org.apache.flink.table.legacy.factories.TableFactory</exclude> </excludes> </filter> </filters> diff --git a/flink-connector-hive/src/main/java/org/apache/flink/connectors/hive/HiveLookupTableSource.java b/flink-connector-hive/src/main/java/org/apache/flink/connectors/hive/HiveLookupTableSource.java index d2841016..cedc8b7e 100644 --- a/flink-connector-hive/src/main/java/org/apache/flink/connectors/hive/HiveLookupTableSource.java +++ b/flink-connector-hive/src/main/java/org/apache/flink/connectors/hive/HiveLookupTableSource.java @@ -32,9 +32,9 @@ import org.apache.flink.table.catalog.ResolvedCatalogTable; import org.apache.flink.table.catalog.hive.client.HiveShim; import org.apache.flink.table.connector.source.DynamicTableSource; import org.apache.flink.table.connector.source.LookupTableSource; -import org.apache.flink.table.connector.source.TableFunctionProvider; import org.apache.flink.table.data.RowData; import org.apache.flink.table.functions.TableFunction; +import org.apache.flink.table.legacy.connector.source.TableFunctionProvider; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.util.Preconditions; diff --git a/flink-connector-hive/src/main/java/org/apache/flink/connectors/hive/HiveTableFactory.java b/flink-connector-hive/src/main/java/org/apache/flink/connectors/hive/HiveTableFactory.java index c6224ce5..89a27a2a 100644 --- a/flink-connector-hive/src/main/java/org/apache/flink/connectors/hive/HiveTableFactory.java +++ b/flink-connector-hive/src/main/java/org/apache/flink/connectors/hive/HiveTableFactory.java @@ -21,10 +21,10 @@ package org.apache.flink.connectors.hive; import org.apache.flink.table.catalog.CatalogTable; import org.apache.flink.table.catalog.hive.HiveCatalog; import org.apache.flink.table.factories.TableFactoryUtil; -import org.apache.flink.table.factories.TableSinkFactory; -import org.apache.flink.table.factories.TableSourceFactory; -import org.apache.flink.table.sinks.TableSink; -import org.apache.flink.table.sources.TableSource; +import org.apache.flink.table.legacy.factories.TableSinkFactory; +import org.apache.flink.table.legacy.factories.TableSourceFactory; +import org.apache.flink.table.legacy.sinks.TableSink; +import org.apache.flink.table.legacy.sources.TableSource; import java.util.List; import java.util.Map; diff --git a/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalog.java b/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalog.java index b3c156fa..f9f654f6 100644 --- a/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalog.java +++ b/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalog.java @@ -25,7 +25,6 @@ import org.apache.flink.connectors.hive.FlinkHiveException; import org.apache.flink.connectors.hive.HiveDynamicTableFactory; import org.apache.flink.connectors.hive.HiveTableFactory; import org.apache.flink.connectors.hive.util.HivePartitionUtils; -import org.apache.flink.table.api.constraints.UniqueConstraint; import org.apache.flink.table.catalog.AbstractCatalog; import org.apache.flink.table.catalog.CatalogBaseTable; import org.apache.flink.table.catalog.CatalogDatabase; @@ -76,7 +75,8 @@ import org.apache.flink.table.expressions.Expression; import org.apache.flink.table.factories.Factory; import org.apache.flink.table.factories.FunctionDefinitionFactory; import org.apache.flink.table.factories.ManagedTableFactory; -import org.apache.flink.table.factories.TableFactory; +import org.apache.flink.table.legacy.api.constraints.UniqueConstraint; +import org.apache.flink.table.legacy.factories.TableFactory; import org.apache.flink.table.resource.ResourceUri; import org.apache.flink.util.Preconditions; diff --git a/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveMetastoreClientWrapper.java b/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveMetastoreClientWrapper.java index b7ca1e15..3335c676 100644 --- a/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveMetastoreClientWrapper.java +++ b/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveMetastoreClientWrapper.java @@ -20,8 +20,8 @@ package org.apache.flink.table.catalog.hive.client; import org.apache.flink.annotation.Internal; import org.apache.flink.connectors.hive.FlinkHiveException; -import org.apache.flink.table.api.constraints.UniqueConstraint; import org.apache.flink.table.catalog.hive.HiveCatalog; +import org.apache.flink.table.legacy.api.constraints.UniqueConstraint; import org.apache.flink.util.Preconditions; import org.apache.hadoop.conf.Configuration; diff --git a/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShim.java b/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShim.java index 58a0e98b..07b145c1 100644 --- a/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShim.java +++ b/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShim.java @@ -19,9 +19,9 @@ package org.apache.flink.table.catalog.hive.client; import org.apache.flink.api.common.serialization.BulkWriter; -import org.apache.flink.table.api.constraints.UniqueConstraint; import org.apache.flink.table.catalog.stats.CatalogColumnStatisticsDataDate; import org.apache.flink.table.data.RowData; +import org.apache.flink.table.legacy.api.constraints.UniqueConstraint; import org.apache.flink.table.types.logical.LogicalType; import org.apache.hadoop.conf.Configuration; diff --git a/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV100.java b/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV100.java index 976e0e00..faec53a8 100644 --- a/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV100.java +++ b/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV100.java @@ -21,11 +21,11 @@ package org.apache.flink.table.catalog.hive.client; import org.apache.flink.api.common.serialization.BulkWriter; import org.apache.flink.connectors.hive.FlinkHiveException; import org.apache.flink.orc.nohive.OrcNoHiveBulkWriterFactory; -import org.apache.flink.table.api.constraints.UniqueConstraint; import org.apache.flink.table.catalog.exceptions.CatalogException; import org.apache.flink.table.catalog.hive.util.HiveReflectionUtils; import org.apache.flink.table.catalog.stats.CatalogColumnStatisticsDataDate; import org.apache.flink.table.data.RowData; +import org.apache.flink.table.legacy.api.constraints.UniqueConstraint; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.util.Preconditions; diff --git a/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV210.java b/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV210.java index 1daa75fa..9d2a19f6 100644 --- a/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV210.java +++ b/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV210.java @@ -19,10 +19,10 @@ package org.apache.flink.table.catalog.hive.client; import org.apache.flink.connectors.hive.FlinkHiveException; -import org.apache.flink.table.api.constraints.UniqueConstraint; import org.apache.flink.table.catalog.exceptions.CatalogException; import org.apache.flink.table.catalog.hive.util.HiveReflectionUtils; import org.apache.flink.table.catalog.hive.util.HiveTableUtil; +import org.apache.flink.table.legacy.api.constraints.UniqueConstraint; import org.apache.flink.util.Preconditions; import org.apache.hadoop.conf.Configuration; diff --git a/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV310.java b/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV310.java index 35b02cf1..03607237 100644 --- a/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV310.java +++ b/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/client/HiveShimV310.java @@ -19,10 +19,10 @@ package org.apache.flink.table.catalog.hive.client; import org.apache.flink.connectors.hive.FlinkHiveException; -import org.apache.flink.table.api.constraints.UniqueConstraint; import org.apache.flink.table.catalog.exceptions.CatalogException; import org.apache.flink.table.catalog.hive.util.HiveReflectionUtils; import org.apache.flink.table.catalog.hive.util.HiveTableUtil; +import org.apache.flink.table.legacy.api.constraints.UniqueConstraint; import org.apache.flink.util.Preconditions; import org.apache.hadoop.conf.Configuration; diff --git a/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/util/HiveTableUtil.java b/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/util/HiveTableUtil.java index d8482669..75b2d07b 100644 --- a/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/util/HiveTableUtil.java +++ b/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/util/HiveTableUtil.java @@ -22,7 +22,6 @@ import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.tuple.Tuple4; import org.apache.flink.connectors.hive.FlinkHiveException; import org.apache.flink.table.api.DataTypes; -import org.apache.flink.table.api.constraints.UniqueConstraint; import org.apache.flink.table.catalog.CatalogPropertiesUtil; import org.apache.flink.table.catalog.CatalogTable; import org.apache.flink.table.catalog.CatalogView; @@ -46,6 +45,7 @@ import org.apache.flink.table.factories.ManagedTableFactory; import org.apache.flink.table.functions.BuiltInFunctionDefinitions; import org.apache.flink.table.functions.FunctionDefinition; import org.apache.flink.table.functions.hive.conversion.HiveInspectors; +import org.apache.flink.table.legacy.api.constraints.UniqueConstraint; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.LogicalTypeFamily; import org.apache.flink.table.types.logical.LogicalTypeRoot; diff --git a/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java b/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java index bd8ef491..30d9f7a9 100644 --- a/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java +++ b/flink-connector-hive/src/main/java/org/apache/flink/table/planner/delegation/hive/parse/HiveParserDDLSemanticAnalyzer.java @@ -22,7 +22,6 @@ import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.tuple.Tuple4; import org.apache.flink.table.api.Schema; import org.apache.flink.table.api.ValidationException; -import org.apache.flink.table.api.constraints.UniqueConstraint; import org.apache.flink.table.calcite.bridge.CalciteContext; import org.apache.flink.table.catalog.Catalog; import org.apache.flink.table.catalog.CatalogBaseTable; @@ -61,6 +60,7 @@ import org.apache.flink.table.factories.FactoryUtil; import org.apache.flink.table.functions.FunctionDefinition; import org.apache.flink.table.functions.hive.HiveFunctionWrapper; import org.apache.flink.table.functions.hive.HiveGenericUDF; +import org.apache.flink.table.legacy.api.constraints.UniqueConstraint; import org.apache.flink.table.operations.CreateTableASOperation; import org.apache.flink.table.operations.DescribeTableOperation; import org.apache.flink.table.operations.Operation; diff --git a/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveTableFactoryTest.java b/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveTableFactoryTest.java index d14bc726..fab4af0e 100644 --- a/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveTableFactoryTest.java +++ b/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveTableFactoryTest.java @@ -35,13 +35,13 @@ import org.apache.flink.table.connector.source.DynamicTableSource; import org.apache.flink.table.factories.DynamicTableSinkFactory; import org.apache.flink.table.factories.DynamicTableSourceFactory; import org.apache.flink.table.factories.FactoryUtil; -import org.apache.flink.table.factories.TableFactory; import org.apache.flink.table.factories.TableSinkFactoryContextImpl; import org.apache.flink.table.factories.TableSourceFactoryContextImpl; +import org.apache.flink.table.legacy.factories.TableFactory; +import org.apache.flink.table.legacy.sinks.TableSink; +import org.apache.flink.table.legacy.sources.TableSource; import org.apache.flink.table.sinks.StreamTableSink; -import org.apache.flink.table.sinks.TableSink; import org.apache.flink.table.sources.StreamTableSource; -import org.apache.flink.table.sources.TableSource; import org.apache.flink.util.TestLoggerExtension; import org.junit.jupiter.api.AfterAll;
