This is an automated email from the ASF dual-hosted git repository. martijnvisser pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-connector-kudu.git
commit b9cd23e729e0d874b7fd53e86a7890f73b939567 Author: Roc Marshal <flin...@126.com> AuthorDate: Mon Dec 27 01:27:08 2021 +0800 [BAHIR-291] Bump flink to 1.14.0 (#136) --- flink-connector-kudu/pom.xml | 2 +- .../java/org/apache/flink/connectors/kudu/table/KuduCatalog.java | 4 ++-- .../org/apache/flink/connectors/kudu/table/KuduCatalogFactory.java | 7 ++----- .../org/apache/flink/connectors/kudu/table/KuduTableFactory.java | 2 +- .../org/apache/flink/connectors/kudu/table/KuduTableSource.java | 2 +- .../apache/flink/connectors/kudu/table/utils/KuduTableUtils.java | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/flink-connector-kudu/pom.xml b/flink-connector-kudu/pom.xml index a76102e..ac6cdc5 100644 --- a/flink-connector-kudu/pom.xml +++ b/flink-connector-kudu/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table-planner-blink_${scala.binary.version}</artifactId> + <artifactId>flink-table-planner_${scala.binary.version}</artifactId> <version>${flink.version}</version> <scope>provided</scope> </dependency> diff --git a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalog.java b/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalog.java index 2ca7c0e..d8343e8 100644 --- a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalog.java +++ b/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalog.java @@ -42,7 +42,7 @@ import org.apache.flink.table.expressions.Expression; import org.apache.flink.table.factories.TableFactory; import org.apache.flink.util.StringUtils; -import org.apache.flink.shaded.guava18.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava30.com.google.common.collect.Lists; import org.apache.kudu.ColumnSchema; import org.apache.kudu.client.AlterTableOptions; @@ -237,7 +237,7 @@ public class KuduCatalog extends AbstractReadOnlyCatalog { @Override public void createTable(ObjectPath tablePath, CatalogBaseTable table, boolean ignoreIfExists) throws TableAlreadyExistException { - Map<String, String> tableProperties = table.getProperties(); + Map<String, String> tableProperties = table.getOptions(); TableSchema tableSchema = table.getSchema(); Set<String> optionalProperties = new HashSet<>(Arrays.asList(KUDU_REPLICAS)); diff --git a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalogFactory.java b/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalogFactory.java index 30aaa40..2458a56 100644 --- a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalogFactory.java +++ b/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduCatalogFactory.java @@ -31,9 +31,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.apache.flink.table.descriptors.CatalogDescriptorValidator.CATALOG_PROPERTY_VERSION; -import static org.apache.flink.table.descriptors.CatalogDescriptorValidator.CATALOG_TYPE; - /** * Factory for {@link KuduCatalog}. */ @@ -45,8 +42,8 @@ public class KuduCatalogFactory implements CatalogFactory { @Override public Map<String, String> requiredContext() { Map<String, String> context = new HashMap<>(); - context.put(CATALOG_TYPE, KuduTableFactory.KUDU); - context.put(CATALOG_PROPERTY_VERSION, "1"); // backwards compatibility + context.put("type", KuduTableFactory.KUDU); + context.put("property-version", "1"); // backwards compatibility return context; } diff --git a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableFactory.java b/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableFactory.java index 524f521..a2883af 100644 --- a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableFactory.java +++ b/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableFactory.java @@ -132,7 +132,7 @@ public class KuduTableFactory implements TableSourceFactory<Row>, TableSinkFacto public KuduTableSource createTableSource(ObjectPath tablePath, CatalogTable table) { validateTable(table); String tableName = table.toProperties().getOrDefault(KUDU_TABLE, tablePath.getObjectName()); - return createTableSource(tableName, table.getSchema(), table.getProperties()); + return createTableSource(tableName, table.getSchema(), table.getOptions()); } private KuduTableSource createTableSource(String tableName, TableSchema schema, Map<String, String> props) { diff --git a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableSource.java b/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableSource.java index db73df3..fea7e73 100644 --- a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableSource.java +++ b/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/KuduTableSource.java @@ -37,7 +37,7 @@ import org.apache.flink.table.types.logical.RowType; import org.apache.flink.table.types.utils.TypeConversions; import org.apache.flink.types.Row; -import org.apache.flink.shaded.guava18.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava30.com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/utils/KuduTableUtils.java b/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/utils/KuduTableUtils.java index 53f205d..aa9b34e 100644 --- a/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/utils/KuduTableUtils.java +++ b/flink-connector-kudu/src/main/java/org/apache/flink/connectors/kudu/table/utils/KuduTableUtils.java @@ -35,7 +35,7 @@ import org.apache.flink.table.types.logical.DecimalType; import org.apache.flink.table.types.logical.TimestampType; import org.apache.flink.table.utils.TableSchemaUtils; -import org.apache.flink.shaded.guava18.com.google.common.collect.Lists; +import org.apache.flink.shaded.guava30.com.google.common.collect.Lists; import org.apache.kudu.ColumnSchema; import org.apache.kudu.ColumnTypeAttributes;