This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push:
new 4adaa72e2f Upgrade Guava and Snappy-Java dependencies (#6640)
4adaa72e2f is described below
commit 4adaa72e2f63b7162ef598e53c342a7c75986ed6
Author: Dave Marion <[email protected]>
AuthorDate: Mon Nov 9 14:02:07 2026 -0500
Upgrade Guava and Snappy-Java dependencies (#6640)
Code changes are due to deprecations in Guava.
---
.../java/org/apache/accumulo/core/iterators/Combiner.java | 5 ++---
.../core/spi/balancer/HostRegexTableLoadBalancer.java | 2 +-
.../apache/accumulo/core/spi/fs/SpaceAwareVolumeChooser.java | 5 ++---
.../org/apache/accumulo/core/util/tables/TableZooHelper.java | 4 ++--
pom.xml | 12 +++++++++---
.../apache/accumulo/manager/recovery/RecoveryManager.java | 3 ++-
.../accumulo/tserver/compactions/CompactionManager.java | 3 ++-
.../accumulo/tserver/compactions/CompactionService.java | 5 +++--
8 files changed, 23 insertions(+), 16 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
index a67bcf0c27..db4ad89fde 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
@@ -18,10 +18,9 @@
*/
package org.apache.accumulo.core.iterators;
-import static java.util.concurrent.TimeUnit.HOURS;
-
import java.io.IOException;
import java.io.UncheckedIOException;
+import java.time.Duration;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -187,7 +186,7 @@ public abstract class Combiner extends WrappingIterator
implements OptionDescrib
@VisibleForTesting
static final Cache<String,Boolean> loggedMsgCache =
- CacheBuilder.newBuilder().expireAfterWrite(1,
HOURS).maximumSize(10000).build();
+
CacheBuilder.newBuilder().expireAfterWrite(Duration.ofHours(1)).maximumSize(10000).build();
private void sawDelete() {
if (isMajorCompaction && !reduceOnFullCompactionOnly) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java
index 5a0c021d1a..f7940745f0 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java
@@ -328,7 +328,7 @@ public class HostRegexTableLoadBalancer extends
TableLoadBalancer {
this.hrtlbConf =
balancerEnvironment.getConfiguration().getDerived(HrtlbConf::new);
tablesRegExCache =
- CacheBuilder.newBuilder().expireAfterAccess(1, HOURS).build(new
CacheLoader<>() {
+
CacheBuilder.newBuilder().expireAfterAccess(Duration.ofHours(1)).build(new
CacheLoader<>() {
@Override
public Supplier<Map<String,String>> load(TableId key) {
return balancerEnvironment.getConfiguration(key)
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/fs/SpaceAwareVolumeChooser.java
b/core/src/main/java/org/apache/accumulo/core/spi/fs/SpaceAwareVolumeChooser.java
index f3f5343088..65126b0516 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/fs/SpaceAwareVolumeChooser.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/fs/SpaceAwareVolumeChooser.java
@@ -18,10 +18,9 @@
*/
package org.apache.accumulo.core.spi.fs;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
import java.io.IOException;
import java.security.SecureRandom;
+import java.time.Duration;
import java.util.NavigableMap;
import java.util.Set;
import java.util.TreeMap;
@@ -85,7 +84,7 @@ public class SpaceAwareVolumeChooser extends
PreferredVolumeChooser {
? Long.parseLong(propertyValue) : defaultComputationCacheDuration;
choiceCache = CacheBuilder.newBuilder()
- .expireAfterWrite(computationCacheDuration, MILLISECONDS).build(new
CacheLoader<>() {
+
.expireAfterWrite(Duration.ofMillis(computationCacheDuration)).build(new
CacheLoader<>() {
@Override
public WeightedRandomCollection load(Set<String> key) {
return new WeightedRandomCollection(key, env);
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/tables/TableZooHelper.java
b/core/src/main/java/org/apache/accumulo/core/util/tables/TableZooHelper.java
index 7487ed5763..8e71cb4a01 100644
---
a/core/src/main/java/org/apache/accumulo/core/util/tables/TableZooHelper.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/tables/TableZooHelper.java
@@ -20,9 +20,9 @@ package org.apache.accumulo.core.util.tables;
import static com.google.common.base.Preconditions.checkArgument;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.concurrent.TimeUnit.MINUTES;
import static org.apache.accumulo.core.util.Validators.EXISTING_TABLE_NAME;
+import java.time.Duration;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.ExecutionException;
@@ -49,7 +49,7 @@ public class TableZooHelper implements AutoCloseable {
// Per instance cache will expire after 10 minutes in case we
// encounter an instance not used frequently
private final Cache<TableZooHelper,TableMap> instanceToMapCache =
- CacheBuilder.newBuilder().expireAfterAccess(10, MINUTES).build();
+
CacheBuilder.newBuilder().expireAfterAccess(Duration.ofMinutes(10)).build();
public TableZooHelper(ClientContext context) {
this.context = Objects.requireNonNull(context);
diff --git a/pom.xml b/pom.xml
index a3538cdd5e..7bb975f64f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,12 +304,12 @@ under the License.
<!-- this is a runtime dependency of guava, no longer included with
guava as of 27.1 -->
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>33.4.6-jre</version>
+ <version>33.8.0-jre</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
@@ -679,6 +679,12 @@ under the License.
<artifactId>jline</artifactId>
<version>3.25.1</version>
</dependency>
+ <dependency>
+ <!-- converge transitive dependency version between guava and caffeine
-->
+ <groupId>org.jspecify</groupId>
+ <artifactId>jspecify</artifactId>
+ <version>1.0.1</version>
+ </dependency>
<dependency>
<groupId>org.latencyutils</groupId>
<artifactId>LatencyUtils</artifactId>
@@ -725,7 +731,7 @@ under the License.
<!-- version specified to converge transitive dependency of hadoop and
curator -->
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
- <version>1.1.10.5</version>
+ <version>1.1.10.9</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
b/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
index 666970cc09..536f1c4877 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
@@ -22,6 +22,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.time.Duration;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -69,7 +70,7 @@ public class RecoveryManager {
public RecoveryManager(Manager manager, long timeToCacheExistsInMillis) {
this.manager = manager;
existenceCache =
- CacheBuilder.newBuilder().expireAfterWrite(timeToCacheExistsInMillis,
TimeUnit.MILLISECONDS)
+
CacheBuilder.newBuilder().expireAfterWrite(Duration.ofMillis(timeToCacheExistsInMillis))
.maximumWeight(10_000_000).weigher((path, exist) ->
path.toString().length()).build();
executor =
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/CompactionManager.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/CompactionManager.java
index 6e14324e47..6b49afbd1c 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/CompactionManager.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/CompactionManager.java
@@ -22,6 +22,7 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import java.time.Duration;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -228,7 +229,7 @@ public class CompactionManager {
Map<CompactionServiceId,CompactionService> tmpServices = new HashMap<>();
unknownCompactionServiceErrorCache =
- CacheBuilder.newBuilder().expireAfterWrite(5, MINUTES).build();
+
CacheBuilder.newBuilder().expireAfterWrite(Duration.ofMinutes(5)).build();
currentCfg.getPlanners().forEach((serviceName, plannerClassName) -> {
try {
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/CompactionService.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/CompactionService.java
index 2d60918253..3dcb900f55 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/CompactionService.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/compactions/CompactionService.java
@@ -19,9 +19,9 @@
package org.apache.accumulo.tserver.compactions;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.MINUTES;
import static
org.apache.accumulo.core.util.threads.ThreadPoolNames.COMPACTION_SERVICE_COMPACTION_PLANNER_POOL;
+import java.time.Duration;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumMap;
@@ -146,7 +146,8 @@ public class CompactionService {
queuedForPlanning.put(kind, new
ConcurrentHashMap<KeyExtent,Compactable>());
}
- maxScanFilesExceededErrorCache =
CacheBuilder.newBuilder().expireAfterWrite(5, MINUTES).build();
+ maxScanFilesExceededErrorCache =
+
CacheBuilder.newBuilder().expireAfterWrite(Duration.ofMinutes(5)).build();
log.debug("Created new compaction service id:{} rate limit:{} planner:{}
planner options:{}",
myId, maxRate, plannerClass, plannerOptions);
