This is an automated email from the ASF dual-hosted git repository.
okumin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 8718054111d HIVE-30167: Upgrade caffeine version to 3.2.4 in
standalone metastore to sync with iceberg pom (#6873)
8718054111d is described below
commit 8718054111d2cf575edf26df1366294acd1d30c8
Author: Raghav Aggarwal <[email protected]>
AuthorDate: Tue Oct 20 19:15:15 2026 +0530
HIVE-30167: Upgrade caffeine version to 3.2.4 in standalone metastore to
sync with iceberg pom (#6873)
---
.../hadoop/hive/ql/metadata/client/MetaStoreClientCacheUtils.java | 2 +-
.../metastore/auth/oauth2/TokenIntrospectionAuthenticator.java | 7 +++----
.../hive/metastore/dataconnector/DataConnectorProviderFactory.java | 4 ++--
standalone-metastore/pom.xml | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/metadata/client/MetaStoreClientCacheUtils.java
b/ql/src/java/org/apache/hadoop/hive/ql/metadata/client/MetaStoreClientCacheUtils.java
index e109a23c222..68f08cd6e93 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/metadata/client/MetaStoreClientCacheUtils.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/metadata/client/MetaStoreClientCacheUtils.java
@@ -241,7 +241,7 @@ public void put(Object k, Object v) {
@Override
public Object get(Object k) {
- return c.getIfPresent(k);
+ return c.getIfPresent((CacheKey) k);
}
}
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/auth/oauth2/TokenIntrospectionAuthenticator.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/auth/oauth2/TokenIntrospectionAuthenticator.java
index 95b1563bc6d..f3ad398647f 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/auth/oauth2/TokenIntrospectionAuthenticator.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/auth/oauth2/TokenIntrospectionAuthenticator.java
@@ -40,8 +40,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.apache.hadoop.hive.metastore.auth.HttpAuthenticationException;
-import org.checkerframework.checker.index.qual.NonNegative;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
/**
* RFC 7662 compliant OAuth2 token introspection based authenticator. This is
must when access tokens are opaque, or
@@ -68,14 +67,14 @@ public long expireAfterCreate(@NonNull String key, @NonNull
TokenIntrospectionSu
@Override
public long expireAfterUpdate(@NonNull String key, @NonNull
TokenIntrospectionSuccessResponse value,
- long currentTime, @NonNegative long currentDuration) {
+ long currentTime, long currentDuration) {
final var expiresIn = Duration.between(clock.instant(),
value.getExpirationTime().toInstant());
return Math.clamp(expiresIn.toNanos(), 0L, maxExpiration.toNanos());
}
@Override
public long expireAfterRead(@NonNull String key, @NonNull
TokenIntrospectionSuccessResponse value, long currentTime,
- @NonNegative long currentDuration) {
+ long currentDuration) {
return currentDuration;
}
}
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/DataConnectorProviderFactory.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/DataConnectorProviderFactory.java
index 5580b6b9979..cc236bafc46 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/DataConnectorProviderFactory.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/DataConnectorProviderFactory.java
@@ -30,8 +30,8 @@
import org.apache.hadoop.hive.metastore.api.DatabaseType;
import org.apache.hadoop.hive.metastore.api.MetaException;
import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index bc0e48099ed..2cd75a0f8d2 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -123,7 +123,7 @@
<zookeeper.version>3.8.4</zookeeper.version>
<cron-utils.version>9.2.1</cron-utils.version>
<spotbugs.version>4.8.6</spotbugs.version>
- <caffeine.version>2.8.4</caffeine.version>
+ <caffeine.version>3.2.4</caffeine.version>
<slf4j.version>1.7.30</slf4j.version>
<httpcomponents.core.version>4.4.13</httpcomponents.core.version>
<httpcomponents.client.version>4.5.13</httpcomponents.client.version>
