Refactor getCachingKey in CachingHiveMetastore for simplicity

prestodb · Feb 12, 2024 · 64d2230 · 64d2230
1 parent e1b1ccf
commit 64d2230
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/...hive-metastore/src/main/java/com/facebook/presto/hive/metastore/CachingHiveMetastore.java b/...hive-metastore/src/main/java/com/facebook/presto/hive/metastore/CachingHiveMetastore.java
@@ -1096,8 +1096,19 @@ public String toString()
 
     private <T> KeyAndContext<T> getCachingKey(MetastoreContext context, T key)
     {
-        MetastoreContext metastoreContext = metastoreImpersonationEnabled ? new MetastoreContext(context.getUsername(), context.getQueryId(), context.getClientInfo(), context.getSource(), true, context.getMetastoreHeaders(), context.isUserDefinedTypeEncodingEnabled(), context.getColumnConverterProvider(), context.getWarningCollector()) : context;
-        return new KeyAndContext<>(metastoreContext, key);
+        if (metastoreImpersonationEnabled) {
+            context = new MetastoreContext(
+                    context.getUsername(),
+                    context.getQueryId(),
+                    context.getClientInfo(),
+                    context.getSource(),
+                    true,
+                    context.getMetastoreHeaders(),
+                    context.isUserDefinedTypeEncodingEnabled(),
+                    context.getColumnConverterProvider(),
+                    context.getWarningCollector());
+        }
+        return new KeyAndContext<>(context, key);
     }
 
     private static CacheBuilder<Object, Object> newCacheBuilder(OptionalLong expiresAfterWriteMillis, OptionalLong refreshMillis, long maximumSize)