(incubator-paimon) branch master updated: [spark] Fix autoFillConfigurations in SparkGenericCatalog (#2520)

[lzljs3620320]

This is an automated email from the ASF dual-hosted git repository.

lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git


The following commit(s) were added to refs/heads/master by this push:
     new f64313e24 [spark] Fix autoFillConfigurations in SparkGenericCatalog 
(#2520)
f64313e24 is described below

commit f64313e2439e05eb01c0f3ec02117cec64d72b68
Author: Zouxxyy <zouxinyu....@alibaba-inc.com>
AuthorDate: Mon Dec 18 14:20:48 2023 +0800

    [spark] Fix autoFillConfigurations in SparkGenericCatalog (#2520)
---
 .../java/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 a94d82765..dbbf03b36 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.Map;
 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 @@ public class SparkGenericCatalog<T extends TableCatalog & 
SupportsNamespaces>
             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);
             }
         }