HIVE-23820: add tableId in getTable request

apache · Apr 9, 2021 · 086ab19 · 086ab19
1 parent af5f983
commit 086ab19
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
@@ -1538,7 +1538,6 @@ public Table getTable(final String dbName, final String tableName, boolean throw
           validWriteIdList = AcidUtils.getTableValidWriteIdListWithTxnList(conf, dbName, tableName);
         }
         request.setValidWriteIdList(validWriteIdList != null ? validWriteIdList.toString() : null);
-        request.setId(-1);
       }
       tTable = getMSC().getTable(request);
     } catch (NoSuchObjectException e) {

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/SessionHiveMetaStoreClient.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/SessionHiveMetaStoreClient.java
@@ -2079,10 +2079,16 @@ protected GetTableResult getTableInternal(GetTableRequest req) throws TException
     Map<Object, Object> queryCache = getQueryCache();
     if (queryCache != null) {
       // Retrieve or populate cache
+      CacheKey cacheKeyTableId = new CacheKey(KeyType.TABLE_ID,req.getCatName(),req.getDbName(),req.getTblName());
+      long tableId = (long) queryCache.getOrDefault(cacheKeyTableId, -1);
+      req.setId(tableId);
       CacheKey cacheKey = new CacheKey(KeyType.TABLE, req);
       GetTableResult v = (GetTableResult) queryCache.get(cacheKey);
       if (v == null) {
         v = super.getTableInternal(req);
+        if(tableId == -1) {
+          queryCache.put(cacheKeyTableId, v.getTable().getId());
+        }
         queryCache.put(cacheKey, v);
       } else {
         LOG.debug(

diff --git a/...mon/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientWithLocalCache.java b/...mon/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClientWithLocalCache.java
@@ -182,7 +182,9 @@ public enum KeyType {
     // GetValidWriteIdsResponse <-- getValidWriteIdsInternal(GetValidWriteIdsRequest rqst)
     // Stored individually as:
     // TableValidWriteIds <-- String fullTableName, String validTxnList, long writeId
-    VALID_WRITE_IDS(TableValidWriteIds.class, String.class, long.class);
+    VALID_WRITE_IDS(TableValidWriteIds.class, String.class, long.class),
+    // TableId <- String fullTableName
+    TABLE_ID(Long.class, String.class);
 
     private final List<Class<?>> keyClasses;
     private final Class<?> valueClass;