You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by lz...@apache.org on 2020/08/28 04:00:05 UTC
[flink] branch release-1.11 updated: [FLINK-18900][table] Revert
the modification of Catalog.listPartitions
This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.11 by this push:
new a576790 [FLINK-18900][table] Revert the modification of Catalog.listPartitions
a576790 is described below
commit a5767906916548ca51bf2d4b9e75c833ea6522a6
Author: Jingsong Lee <ji...@gmail.com>
AuthorDate: Fri Aug 28 11:58:34 2020 +0800
[FLINK-18900][table] Revert the modification of Catalog.listPartitions
This closes #13269
---
.../java/org/apache/flink/table/catalog/hive/HiveCatalog.java | 11 ++++++-----
.../flink/connector/jdbc/catalog/AbstractJdbcCatalog.java | 2 +-
.../apache/flink/table/catalog/GenericInMemoryCatalog.java | 2 +-
.../src/main/java/org/apache/flink/table/catalog/Catalog.java | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalog.java b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalog.java
index 9a4eb3d..6dac487 100644
--- a/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalog.java
+++ b/flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/table/catalog/hive/HiveCatalog.java
@@ -765,7 +765,7 @@ public class HiveCatalog extends AbstractCatalog {
@Override
public List<CatalogPartitionSpec> listPartitions(ObjectPath tablePath, CatalogPartitionSpec partitionSpec)
- throws TableNotExistException, TableNotPartitionedException, PartitionSpecInvalidException, CatalogException {
+ throws TableNotExistException, TableNotPartitionedException, CatalogException {
checkNotNull(tablePath, "Table path cannot be null");
checkNotNull(partitionSpec, "CatalogPartitionSpec cannot be null");
@@ -1003,13 +1003,14 @@ public class HiveCatalog extends AbstractCatalog {
* @param partitionSpec a partition spec.
* @param partitionKeys a list of partition keys.
* @param tablePath path of the table to which the partition belongs.
- * @throws PartitionSpecInvalidException thrown if any key in partitionSpec doesn't exist in partitionKeys.
*/
- private void checkValidPartitionSpec(CatalogPartitionSpec partitionSpec, List<String> partitionKeys, ObjectPath tablePath)
- throws PartitionSpecInvalidException {
+ private void checkValidPartitionSpec(
+ CatalogPartitionSpec partitionSpec, List<String> partitionKeys, ObjectPath tablePath) {
for (String key : partitionSpec.getPartitionSpec().keySet()) {
if (!partitionKeys.contains(key)) {
- throw new PartitionSpecInvalidException(getName(), partitionKeys, tablePath, partitionSpec);
+ // Wrap CatalogException for version Compatibility.
+ throw new CatalogException(
+ new PartitionSpecInvalidException(getName(), partitionKeys, tablePath, partitionSpec));
}
}
}
diff --git a/flink-connectors/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java b/flink-connectors/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
index 8230454..4b1ebfb 100644
--- a/flink-connectors/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
+++ b/flink-connectors/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/AbstractJdbcCatalog.java
@@ -215,7 +215,7 @@ public abstract class AbstractJdbcCatalog extends AbstractCatalog {
}
@Override
- public List<CatalogPartitionSpec> listPartitions(ObjectPath tablePath, CatalogPartitionSpec partitionSpec) throws TableNotExistException, TableNotPartitionedException, PartitionSpecInvalidException, CatalogException {
+ public List<CatalogPartitionSpec> listPartitions(ObjectPath tablePath, CatalogPartitionSpec partitionSpec) throws TableNotExistException, TableNotPartitionedException, CatalogException {
return Collections.emptyList();
}
diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/GenericInMemoryCatalog.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/GenericInMemoryCatalog.java
index f515d62..a4893b5 100644
--- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/GenericInMemoryCatalog.java
+++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/GenericInMemoryCatalog.java
@@ -533,7 +533,7 @@ public class GenericInMemoryCatalog extends AbstractCatalog {
@Override
public List<CatalogPartitionSpec> listPartitions(ObjectPath tablePath, CatalogPartitionSpec partitionSpec)
- throws TableNotExistException, TableNotPartitionedException, PartitionSpecInvalidException, CatalogException {
+ throws TableNotExistException, TableNotPartitionedException, CatalogException {
checkNotNull(tablePath);
checkNotNull(partitionSpec);
diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/catalog/Catalog.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/catalog/Catalog.java
index 8bda1ff..1e4c482 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/catalog/Catalog.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/catalog/Catalog.java
@@ -327,7 +327,7 @@ public interface Catalog {
* @throws CatalogException in case of any runtime exception
*/
List<CatalogPartitionSpec> listPartitions(ObjectPath tablePath, CatalogPartitionSpec partitionSpec)
- throws TableNotExistException, TableNotPartitionedException, PartitionSpecInvalidException, CatalogException;
+ throws TableNotExistException, TableNotPartitionedException, CatalogException;
/**
* Get CatalogPartitionSpec of partitions by expression filters in the table.