(gravitino) branch branch-0.6 updated: [#4712] fix (trino-connector): Fix Iceberg JDBC backend tables can not found in Trino (#4727)

[jshao]

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

jshao pushed a commit to branch branch-0.6
in repository https://gitbox.apache.org/repos/asf/gravitino.git


The following commit(s) were added to refs/heads/branch-0.6 by this push:
     new cecc2e71d [#4712] fix (trino-connector): Fix  Iceberg JDBC backend 
tables can not found in Trino (#4727)
cecc2e71d is described below

commit cecc2e71d151575b73979da640f50c1b3e113d98
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Aug 27 23:13:21 2024 -0700

    [#4712] fix (trino-connector): Fix  Iceberg JDBC backend tables can not 
found in Trino (#4727)
    
    ### What changes were proposed in this pull request?
    
    Fix  Iceberg JDBC backend tables can not found in Trino
    
    ### Why are the changes needed?
    
    Fix: #4712
    
    ### Does this PR introduce _any_ user-facing change?
    
    No
    
    ### How was this patch tested?
    
    Manually test
    
    Co-authored-by: Yuhui <h...@datastrato.com>
---
 .../catalog/iceberg/IcebergCatalogPropertyConverter.java          | 8 ++++++--
 .../trino/connector/catalog/iceberg/IcebergConnectorAdapter.java  | 1 +
 .../gravitino/trino/connector/metadata/GravitinoCatalog.java      | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git 
a/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/iceberg/IcebergCatalogPropertyConverter.java
 
b/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/iceberg/IcebergCatalogPropertyConverter.java
index 367c03db3..692c3d5ce 100644
--- 
a/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/iceberg/IcebergCatalogPropertyConverter.java
+++ 
b/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/iceberg/IcebergCatalogPropertyConverter.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import org.apache.commons.collections4.bidimap.TreeBidiMap;
+import org.apache.gravitino.catalog.lakehouse.iceberg.IcebergConstants;
 import org.apache.gravitino.catalog.property.PropertyConverter;
 import org.apache.gravitino.trino.connector.GravitinoErrorCode;
 
@@ -350,8 +351,11 @@ public class IcebergCatalogPropertyConverter extends 
PropertyConverter {
     jdbcProperties.put("iceberg.jdbc-catalog.connection-password", 
properties.get("jdbc-password"));
     jdbcProperties.put("iceberg.jdbc-catalog.default-warehouse-dir", 
properties.get("warehouse"));
 
-    // TODO (FANG) make the catalog name equal to the catalog name in Gravitino
-    jdbcProperties.put("iceberg.jdbc-catalog.catalog-name", "jdbc");
+    // TODO (yuhui) Optimize the code for retrieve the catalogname
+    String catalogName = properties.get("catalog-name");
+    jdbcProperties.put(
+        "iceberg.jdbc-catalog.catalog-name",
+        properties.getOrDefault(IcebergConstants.CATALOG_BACKEND_NAME, 
catalogName));
 
     return jdbcProperties;
   }
diff --git 
a/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/iceberg/IcebergConnectorAdapter.java
 
b/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/iceberg/IcebergConnectorAdapter.java
index 89b8f0198..1841b4d04 100644
--- 
a/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/iceberg/IcebergConnectorAdapter.java
+++ 
b/trino-connector/src/main/java/org/apache/gravitino/trino/connector/catalog/iceberg/IcebergConnectorAdapter.java
@@ -46,6 +46,7 @@ public class IcebergConnectorAdapter implements 
CatalogConnectorAdapter {
   @Override
   public Map<String, String> buildInternalConnectorConfig(GravitinoCatalog 
catalog)
       throws Exception {
+    catalog.getProperties().put("catalog-name", catalog.getName());
     return 
catalogConverter.gravitinoToEngineProperties(catalog.getProperties());
   }
 
diff --git 
a/trino-connector/src/main/java/org/apache/gravitino/trino/connector/metadata/GravitinoCatalog.java
 
b/trino-connector/src/main/java/org/apache/gravitino/trino/connector/metadata/GravitinoCatalog.java
index d59e59e9f..124d9aa2d 100644
--- 
a/trino-connector/src/main/java/org/apache/gravitino/trino/connector/metadata/GravitinoCatalog.java
+++ 
b/trino-connector/src/main/java/org/apache/gravitino/trino/connector/metadata/GravitinoCatalog.java
@@ -28,6 +28,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import io.trino.spi.TrinoException;
 import java.time.Instant;
+import java.util.HashMap;
 import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.gravitino.Catalog;
@@ -59,7 +60,7 @@ public class GravitinoCatalog {
     this.metalake = metalake;
     this.provider = catalog.provider();
     this.name = catalog.name();
-    this.properties = catalog.properties();
+    this.properties = new HashMap<>(catalog.properties());
     Instant time =
         catalog.auditInfo().lastModifiedTime() == null
             ? catalog.auditInfo().createTime()