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
The following commit(s) were added to refs/heads/2.1 by this push: new 3ec800b9b9 Fix trivial warnings 3ec800b9b9 is described below commit 3ec800b9b9225e1b2d31efb9cd269c6c72666ef1 Author: Christopher Tubbs <ctubb...@apache.org> AuthorDate: Thu Sep 19 15:19:45 2024 -0400 Fix trivial warnings * Avoid raw generic on ScanSession * Remove unused Logger --- .../tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java | 2 +- .../main/java/org/apache/accumulo/tserver/session/SessionManager.java | 2 +- .../main/java/org/apache/accumulo/tserver/tablet/SnapshotTablet.java | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java index 0e74b8c732..688a08b171 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java @@ -757,7 +757,7 @@ public class ScanServer extends AbstractServer } protected ScanReservation reserveFiles(long scanId) throws NoSuchScanIDException { - var session = (ScanSession) sessionManager.getSession(scanId); + var session = (ScanSession<?>) sessionManager.getSession(scanId); if (session == null) { throw new NoSuchScanIDException(); } diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java index 497287cda6..d1bf4d6f8c 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java @@ -350,7 +350,7 @@ public class SessionManager { return Stream.concat(deferredCleanupQueue.stream(), sessions.values().stream()) .filter(session -> { if (session instanceof ScanSession) { - var scanSession = (ScanSession) session; + var scanSession = (ScanSession<?>) session; synchronized (scanSession) { var scanTask = scanSession.getScanTask(); if (scanTask != null && scanSession.getState() == State.REMOVED diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/SnapshotTablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/SnapshotTablet.java index 985f7339dd..c2de47120b 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/SnapshotTablet.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/SnapshotTablet.java @@ -36,8 +36,6 @@ import org.apache.accumulo.tserver.InMemoryMap; import org.apache.accumulo.tserver.TabletHostingServer; import org.apache.accumulo.tserver.TabletServerResourceManager; import org.apache.accumulo.tserver.metrics.TabletServerScanMetrics; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A tablet that can not be written to and operates off of a snapshot of tablet metadata for its @@ -46,8 +44,6 @@ import org.slf4j.LoggerFactory; */ public class SnapshotTablet extends TabletBase { - private static final Logger log = LoggerFactory.getLogger(SnapshotTablet.class); - private final TabletHostingServer server; private final SortedMap<StoredTabletFile,DataFileValue> files; private final TabletServerResourceManager.TabletResourceManager tabletResources;