From 2c8d9dfbd31b922f98433d7cc373529ec379b5a4 Mon Sep 17 00:00:00 2001
From: stephen <91597003+stephen-shelby@users.noreply.github.com>
Date: Thu, 29 Feb 2024 15:55:27 +0800
Subject: [PATCH] [Enhancement] update iceberg cache default value (#41826)

Signed-off-by: stephen <stephen5217@163.com>
(cherry picked from commit eba99a57e76eee1c7de6ba42d1f32722d75479e7)
---
 .../starrocks/connector/iceberg/IcebergConnector.java    | 9 +++++++--
 test/sql/test_iceberg/R/test_iceberg_catalog             | 4 ++--
 test/sql/test_iceberg/T/test_iceberg_catalog             | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/fe/fe-core/src/main/java/com/starrocks/connector/iceberg/IcebergConnector.java b/fe/fe-core/src/main/java/com/starrocks/connector/iceberg/IcebergConnector.java
index a86763c0e2d15..496357fce6ef5 100644
--- a/fe/fe-core/src/main/java/com/starrocks/connector/iceberg/IcebergConnector.java
+++ b/fe/fe-core/src/main/java/com/starrocks/connector/iceberg/IcebergConnector.java
@@ -111,8 +111,13 @@ public ConnectorMetadata getMetadata() {
     public IcebergCatalog getNativeCatalog() {
         if (icebergNativeCatalog == null) {
             IcebergCatalog nativeCatalog = buildIcebergNativeCatalog();
-            boolean enableMetadataCache = Boolean.parseBoolean(
-                    properties.getOrDefault("enable_iceberg_metadata_cache", "true"));
+            boolean enableMetadataCache;
+            if (properties.containsKey("enable_iceberg_metadata_cache")) {
+                enableMetadataCache = Boolean.parseBoolean(properties.get("enable_iceberg_metadata_cache"));
+            } else {
+                enableMetadataCache = getNativeCatalogType() == IcebergCatalogType.GLUE_CATALOG;
+            }
+
             if (enableMetadataCache && !isResourceMappingCatalog(catalogName)) {
                 long ttl = Long.parseLong(properties.getOrDefault("iceberg_meta_cache_ttl_sec", "1800"));
                 nativeCatalog = new CachingIcebergCatalog(nativeCatalog, ttl, buildBackgroundJobPlanningExecutor());
diff --git a/test/sql/test_iceberg/R/test_iceberg_catalog b/test/sql/test_iceberg/R/test_iceberg_catalog
index c2985fa0ec9e5..0e5902253c39e 100644
--- a/test/sql/test_iceberg/R/test_iceberg_catalog
+++ b/test/sql/test_iceberg/R/test_iceberg_catalog
@@ -1,5 +1,5 @@
 -- name: testIcebergCatalog
-create external catalog iceberg_sql_test_${uuid0} PROPERTIES ("type"="iceberg", "iceberg.catalog.type"="hive", "iceberg.catalog.hive.metastore.uris"="${iceberg_catalog_hive_metastore_uris}");
+create external catalog iceberg_sql_test_${uuid0} PROPERTIES ("type"="iceberg", "iceberg.catalog.type"="hive", "iceberg.catalog.hive.metastore.uris"="${iceberg_catalog_hive_metastore_uris}", "enable_iceberg_metadata_cache"="true");
 -- result:
 -- !result
 select * from iceberg_sql_test_${uuid0}.iceberg_oss_db.test_trans_part;
@@ -13,4 +13,4 @@ select * from iceberg_sql_test_${uuid0}.iceberg_oss_db.test_trans_part;
 -- !result
 drop catalog iceberg_sql_test_${uuid0}
 -- result:
--- !result
\ No newline at end of file
+-- !result
diff --git a/test/sql/test_iceberg/T/test_iceberg_catalog b/test/sql/test_iceberg/T/test_iceberg_catalog
index 2473814beb51c..37e1905ff7e93 100644
--- a/test/sql/test_iceberg/T/test_iceberg_catalog
+++ b/test/sql/test_iceberg/T/test_iceberg_catalog
@@ -1,8 +1,8 @@
 -- name: testIcebergCatalog
 
-create external catalog iceberg_sql_test_${uuid0} PROPERTIES ("type"="iceberg", "iceberg.catalog.type"="hive", "iceberg.catalog.hive.metastore.uris"="${iceberg_catalog_hive_metastore_uris}");
+create external catalog iceberg_sql_test_${uuid0} PROPERTIES ("type"="iceberg", "iceberg.catalog.type"="hive", "iceberg.catalog.hive.metastore.uris"="${iceberg_catalog_hive_metastore_uris}","enable_iceberg_metadata_cache"="true");
 
 -- only partition column Predicate with runtime filter
 select * from iceberg_sql_test_${uuid0}.iceberg_oss_db.test_trans_part;
 
-drop catalog iceberg_sql_test_${uuid0}
\ No newline at end of file
+drop catalog iceberg_sql_test_${uuid0}