This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit d958e47310ed425aa3be46b1ac341a431a001d9c Author: Christopher Tubbs <ctubb...@apache.org> AuthorDate: Tue May 27 17:29:54 2025 -0400 Trivial cleanup * Remove unused variables and warnings * Fix false-positive resource leak IDE warning by using ServerContext rather than casting AccumuloClient to ClientContext in LargeReadIT --- core/src/main/java/org/apache/accumulo/core/util/threads/Threads.java | 4 ---- .../src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java | 1 - test/src/main/java/org/apache/accumulo/test/LargeReadIT.java | 3 +-- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/util/threads/Threads.java b/core/src/main/java/org/apache/accumulo/core/util/threads/Threads.java index 3ff86913b0..fe962ee901 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/threads/Threads.java +++ b/core/src/main/java/org/apache/accumulo/core/util/threads/Threads.java @@ -22,13 +22,9 @@ import java.lang.Thread.UncaughtExceptionHandler; import java.util.OptionalInt; import org.apache.accumulo.core.trace.TraceUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class Threads { - private static final Logger log = LoggerFactory.getLogger(Threads.class); - public static final UncaughtExceptionHandler UEH = new AccumuloUncaughtExceptionHandler(); public static class AccumuloDaemonThread extends Thread { diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java index 029ad0bd80..aebe9bcd47 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java @@ -43,7 +43,6 @@ import org.apache.accumulo.core.clientImpl.ClientContext; import org.apache.accumulo.core.data.TableId; import org.apache.accumulo.core.metadata.StoredTabletFile; import org.apache.accumulo.core.metadata.schema.DataFileValue; -import org.apache.accumulo.core.metadata.schema.MetadataSchema; import org.apache.accumulo.core.trace.TraceUtil; import org.apache.accumulo.core.util.NumUtil; import org.apache.accumulo.server.cli.ServerUtilOpts; diff --git a/test/src/main/java/org/apache/accumulo/test/LargeReadIT.java b/test/src/main/java/org/apache/accumulo/test/LargeReadIT.java index bcb7ef0a9b..3e11a1fb75 100644 --- a/test/src/main/java/org/apache/accumulo/test/LargeReadIT.java +++ b/test/src/main/java/org/apache/accumulo/test/LargeReadIT.java @@ -33,7 +33,6 @@ import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.admin.NewTableConfiguration; -import org.apache.accumulo.core.clientImpl.ClientContext; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; @@ -144,7 +143,7 @@ public class LargeReadIT extends AccumuloClusterHarness { } // expected data to be in memory for this part of the test, so verify that - var ctx = ((ClientContext) client); + var ctx = getCluster().getServerContext(); try (var tablets = ctx.getAmple().readTablets().forTable(ctx.getTableId(tableName)) .fetch(TabletMetadata.ColumnType.FILES).build()) { assertEquals(0, tablets.stream().count());