From 50841a9a501152a7072ba96ef7d35c58255eac8e Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Mon, 31 Jan 2022 17:40:01 +0100 Subject: [PATCH 1/2] Fix NPE when hiding Delta tables and Glue table lacks parameters Fix query failure with `NullPointerException` when `hive.hide-delta-lake-tables` is enabled, and Hive Glue metastore table has no parameters. --- .../glue/DefaultGlueMetastoreTableFilterProvider.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/DefaultGlueMetastoreTableFilterProvider.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/DefaultGlueMetastoreTableFilterProvider.java index a8af639a2fff..950b5a4558c3 100644 --- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/DefaultGlueMetastoreTableFilterProvider.java +++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/DefaultGlueMetastoreTableFilterProvider.java @@ -19,8 +19,10 @@ import javax.inject.Inject; import javax.inject.Provider; +import java.util.Map; import java.util.function.Predicate; +import static com.google.common.base.MoreObjects.firstNonNull; import static io.trino.plugin.hive.util.HiveUtil.DELTA_LAKE_PROVIDER; import static io.trino.plugin.hive.util.HiveUtil.SPARK_TABLE_PROVIDER_KEY; import static java.util.Objects.requireNonNull; @@ -49,6 +51,7 @@ public Predicate get() public static boolean isDeltaLakeTable(Table table) { - return table.getParameters().getOrDefault(SPARK_TABLE_PROVIDER_KEY, "").equalsIgnoreCase(DELTA_LAKE_PROVIDER); + Map parameters = firstNonNull(table.getParameters(), Map.of()); + return parameters.getOrDefault(SPARK_TABLE_PROVIDER_KEY, "").equalsIgnoreCase(DELTA_LAKE_PROVIDER); } } From 893a9ab5cf9e9fa750a16382d7db6376b551b575 Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Tue, 1 Feb 2022 09:21:55 +0100 Subject: [PATCH 2/2] empty