(gravitino) branch branch-1.3 updated: [Cherry-pick to branch-1.3] [#11469] fix(catalog-glue): Treat empty catalog ID as unset (#11473) (#11503)

[jshao]

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

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


The following commit(s) were added to refs/heads/branch-1.3 by this push:
     new b309c3ee7a [Cherry-pick to branch-1.3] [#11469] fix(catalog-glue): 
Treat empty catalog ID as unset (#11473) (#11503)
b309c3ee7a is described below

commit b309c3ee7ae04ecedbcc21705e23c3f0c5424170
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Jun 9 09:20:33 2026 +0800

    [Cherry-pick to branch-1.3] [#11469] fix(catalog-glue): Treat empty catalog 
ID as unset (#11473) (#11503)
    
    **Cherry-pick Information:**
    - Original commit: f1cbd7479d7931bd1a51da37a1b4f1d01691d24e
    - Target branch: `branch-1.3`
    - Status: ✅ Clean cherry-pick (no conflicts)
    
    Co-authored-by: Yuhui <h...@datastrato.com>
---
 build.gradle.kts                                                       | 1 +
 .../java/org/apache/gravitino/catalog/glue/GlueCatalogOperations.java  | 3 ++-
 .../java/org/apache/gravitino/catalog/glue/GlueIcebergTableHelper.java | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index a80e5b54f2..91cc57796d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -738,6 +738,7 @@ tasks.rat {
     "dev/docker/**/*.conf",
     "dev/docker/kerberos-hive/kadm5.acl",
     "docs/**/*.md",
+    ".claude/**",
     "gradle/wrapper/gradle-wrapper.properties",
     
"lineage/src/test/java/org/apache/gravitino/lineage/source/TestLineageOperations.java",
     "spark-connector/spark-common/src/test/resources/**",
diff --git 
a/catalogs/catalog-glue/src/main/java/org/apache/gravitino/catalog/glue/GlueCatalogOperations.java
 
b/catalogs/catalog-glue/src/main/java/org/apache/gravitino/catalog/glue/GlueCatalogOperations.java
index 72f995ef9e..66534c172e 100644
--- 
a/catalogs/catalog-glue/src/main/java/org/apache/gravitino/catalog/glue/GlueCatalogOperations.java
+++ 
b/catalogs/catalog-glue/src/main/java/org/apache/gravitino/catalog/glue/GlueCatalogOperations.java
@@ -134,7 +134,8 @@ public class GlueCatalogOperations implements 
CatalogOperations, SupportsSchemas
       Map<String, String> config, CatalogInfo info, HasPropertyMetadata 
propertiesMetadata)
       throws RuntimeException {
     this.glueClient = GlueClientProvider.buildClient(config);
-    this.catalogId = config.get(GlueConstants.AWS_GLUE_CATALOG_ID);
+    String rawCatalogId = config.get(GlueConstants.AWS_GLUE_CATALOG_ID);
+    this.catalogId = StringUtils.isNotBlank(rawCatalogId) ? rawCatalogId : 
null;
     this.defaultTableFormat =
         config.getOrDefault(
             GlueConstants.DEFAULT_TABLE_FORMAT, 
GlueConstants.DEFAULT_TABLE_FORMAT_VALUE);
diff --git 
a/catalogs/catalog-glue/src/main/java/org/apache/gravitino/catalog/glue/GlueIcebergTableHelper.java
 
b/catalogs/catalog-glue/src/main/java/org/apache/gravitino/catalog/glue/GlueIcebergTableHelper.java
index 8438e6754a..c69d23c992 100644
--- 
a/catalogs/catalog-glue/src/main/java/org/apache/gravitino/catalog/glue/GlueIcebergTableHelper.java
+++ 
b/catalogs/catalog-glue/src/main/java/org/apache/gravitino/catalog/glue/GlueIcebergTableHelper.java
@@ -158,7 +158,7 @@ final class GlueIcebergTableHelper {
     icebergProps.put(IcebergConstants.AWS_S3_REGION, region);
 
     String catalogId = config.get(GlueConstants.AWS_GLUE_CATALOG_ID);
-    if (catalogId != null) {
+    if (StringUtils.isNotBlank(catalogId)) {
       icebergProps.put(GLUE_ID, catalogId);
     }