(gravitino) branch branch-1.1 updated: [Cherry-pick to branch-1.1] [#9782] improvement(iceberg): Optimize the catalog wrapper and entity cache expiry strategy (#10180) (#10206)

[roryqi]

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

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


The following commit(s) were added to refs/heads/branch-1.1 by this push:
     new 28e78c8633 [Cherry-pick to branch-1.1] [#9782] improvement(iceberg): 
Optimize the catalog wrapper and entity cache expiry strategy (#10180) (#10206)
28e78c8633 is described below

commit 28e78c86332a9c4cd5f2c30ea55cad1e632c31c6
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Mar 5 17:14:23 2026 +0800

    [Cherry-pick to branch-1.1] [#9782] improvement(iceberg): Optimize the 
catalog wrapper and entity cache expiry strategy (#10180) (#10206)
    
    **Cherry-pick Information:**
    - Original commit: dfec1b64d4ce2c04589f5380ed6363625c60dcfc
    - Target branch: `branch-1.1`
    - Status: ✅ Clean cherry-pick (no conflicts)
    
    Co-authored-by: roryqi <h...@datastrato.com>
---
 core/src/main/java/org/apache/gravitino/cache/CaffeineEntityCache.java  | 2 +-
 .../apache/gravitino/iceberg/service/IcebergCatalogWrapperManager.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/core/src/main/java/org/apache/gravitino/cache/CaffeineEntityCache.java 
b/core/src/main/java/org/apache/gravitino/cache/CaffeineEntityCache.java
index 40036e1bc7..ede392c996 100644
--- a/core/src/main/java/org/apache/gravitino/cache/CaffeineEntityCache.java
+++ b/core/src/main/java/org/apache/gravitino/cache/CaffeineEntityCache.java
@@ -403,7 +403,7 @@ public class CaffeineEntityCache extends BaseEntityCache {
     }
 
     if (cacheConfig.get(Configs.CACHE_EXPIRATION_TIME) > 0) {
-      builder.expireAfterWrite(
+      builder.expireAfterAccess(
           cacheConfig.get(Configs.CACHE_EXPIRATION_TIME), 
TimeUnit.MILLISECONDS);
     }
 
diff --git 
a/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/IcebergCatalogWrapperManager.java
 
b/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/IcebergCatalogWrapperManager.java
index 40dbf543d2..887bc0c1dd 100644
--- 
a/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/IcebergCatalogWrapperManager.java
+++ 
b/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/IcebergCatalogWrapperManager.java
@@ -52,7 +52,7 @@ public class IcebergCatalogWrapperManager implements 
AutoCloseable {
     this.configProvider = configProvider;
     this.icebergCatalogWrapperCache =
         Caffeine.newBuilder()
-            .expireAfterWrite(
+            .expireAfterAccess(
                 (new IcebergConfig(properties))
                     
.get(IcebergConfig.ICEBERG_REST_CATALOG_CACHE_EVICTION_INTERVAL),
                 TimeUnit.MILLISECONDS)