move paimon schema cache to ExternalSchemaCache

apache · Dec 10, 2024 · b1da138 · b1da138
1 parent 1de646f
commit b1da138
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalTable.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalTable.java
@@ -503,6 +503,10 @@ public Set<String> getPartitionNames() {
 
     @Override
     public Optional<SchemaCacheValue> initSchemaAndUpdateTime(SchemaCacheKey key) {
+        return initSchemaAndUpdateTime();
+    }
+
+    public Optional<SchemaCacheValue> initSchemaAndUpdateTime() {
         org.apache.hadoop.hive.metastore.api.Table table = ((HMSExternalCatalog) catalog).getClient()
                 .getTable(dbName, name);
         // try to use transient_lastDdlTime from hms client

diff --git a/fe/fe-core/src/test/java/org/apache/doris/external/hms/HmsCatalogTest.java b/fe/fe-core/src/test/java/org/apache/doris/external/hms/HmsCatalogTest.java
@@ -138,7 +138,7 @@ private void createDbAndTableForHmsCatalog(HMSExternalCatalog hmsCatalog) {
                 result = TableIf.TableType.HMS_EXTERNAL_TABLE;
 
                 // mock initSchemaAndUpdateTime and do nothing
-                tbl.initSchemaAndUpdateTime(null);
+                tbl.initSchemaAndUpdateTime();
                 minTimes = 0;
 
                 tbl.getDatabase();

diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/HmsQueryCacheTest.java b/fe/fe-core/src/test/java/org/apache/doris/qe/HmsQueryCacheTest.java
@@ -158,7 +158,7 @@ private void init(HMSExternalCatalog hmsCatalog) {
                 result = DLAType.HIVE;
 
                 // mock initSchemaAndUpdateTime and do nothing
-                tbl.initSchemaAndUpdateTime(null);
+                tbl.initSchemaAndUpdateTime();
                 minTimes = 0;
 
                 tbl.getDatabase();
@@ -208,7 +208,7 @@ private void init(HMSExternalCatalog hmsCatalog) {
                 result = DLAType.HIVE;
 
                 // mock initSchemaAndUpdateTime and do nothing
-                tbl2.initSchemaAndUpdateTime(null);
+                tbl2.initSchemaAndUpdateTime();
                 minTimes = 0;
 
                 tbl2.getDatabase();
@@ -386,7 +386,7 @@ public void testHitSqlCacheAfterPartitionUpdateTimeChanged() throws Exception {
         List<ScanNode> scanNodes = Arrays.asList(hiveScanNode4);
 
         // invoke initSchemaAndUpdateTime first and init schemaUpdateTime
-        tbl2.initSchemaAndUpdateTime(null);
+        tbl2.initSchemaAndUpdateTime();
 
         CacheAnalyzer ca = new CacheAnalyzer(connectContext, parseStmt, scanNodes);
         ca.checkCacheMode(System.currentTimeMillis() + Config.cache_last_version_interval_second * 1000L * 2);
@@ -434,7 +434,7 @@ public void testHitSqlCacheByNereidsAfterPartitionUpdateTimeChanged() {
         List<ScanNode> scanNodes = Arrays.asList(hiveScanNode4);
 
         // invoke initSchemaAndUpdateTime first and init schemaUpdateTime
-        tbl2.initSchemaAndUpdateTime(null);
+        tbl2.initSchemaAndUpdateTime();
 
         CacheAnalyzer ca = new CacheAnalyzer(connectContext, parseStmt, scanNodes);
         ca.checkCacheModeForNereids(System.currentTimeMillis() + Config.cache_last_version_interval_second * 1000L * 2);