From f64313e2439e05eb01c0f3ec02117cec64d72b68 Mon Sep 17 00:00:00 2001 From: Zouxxyy Date: Mon, 18 Dec 2023 14:20:48 +0800 Subject: [PATCH] [spark] Fix autoFillConfigurations in SparkGenericCatalog (#2520) --- .../org/apache/paimon/spark/SparkGenericCatalog.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkGenericCatalog.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkGenericCatalog.java index a94d82765313..dbbf03b3613b 100644 --- a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkGenericCatalog.java +++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkGenericCatalog.java @@ -59,7 +59,6 @@ import java.util.concurrent.Callable; import static org.apache.paimon.options.CatalogOptions.METASTORE; -import static org.apache.paimon.options.CatalogOptions.URI; import static org.apache.paimon.options.CatalogOptions.WAREHOUSE; import static org.apache.paimon.utils.Preconditions.checkNotNull; @@ -254,13 +253,10 @@ private CaseInsensitiveStringMap autoFillConfigurations( String warehouse = conf.warehousePath(); newOptions.put(WAREHOUSE.key(), warehouse); } - String metastore = conf.getConf(StaticSQLConf.CATALOG_IMPLEMENTATION()); - if (HiveCatalogOptions.IDENTIFIER.equals(metastore)) { - newOptions.put(METASTORE.key(), metastore); - String uri; - if ((uri = conf.getConfString("spark.sql.catalog.spark_catalog.uri", null)) != null - && !options.containsKey(URI.key())) { - newOptions.put(URI.key(), uri); + if (!options.containsKey(METASTORE.key())) { + String metastore = conf.getConf(StaticSQLConf.CATALOG_IMPLEMENTATION()); + if (HiveCatalogOptions.IDENTIFIER.equals(metastore)) { + newOptions.put(METASTORE.key(), metastore); } }