Merge pull request #22650 from vespa-engine/bratseth/cleanup-764

No functional changes

3 files changed, 4 insertions, 10 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
index ab29f98898a..70f95998dcb 100644
--- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
@@ -18,7 +18,6 @@ import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
 import com.yahoo.search.config.ClusterConfig;
-import com.yahoo.search.config.SchemaInfoConfig;
 import com.yahoo.search.dispatch.Dispatcher;
 import com.yahoo.search.query.ParameterParser;
 import com.yahoo.search.result.ErrorMessage;
@@ -30,11 +29,9 @@ import com.yahoo.yolean.Exceptions;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -63,9 +60,6 @@ public class ClusterSearcher extends Searcher {
     // The set of document types contained in this search cluster
     private final Set<String> schemas;
 
-    // Mapping from rank profile names to schemas containing them
-    private final Map<String, Set<String>> rankProfilesz = new HashMap<>();
-
     private final long maxQueryTimeout; // in milliseconds
     private final long maxQueryCacheTimeout; // in milliseconds
 
diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java
index 097d714b47b..71758666b99 100644
--- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java
@@ -90,8 +90,8 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
         } catch (ExecutionException e) {
             pong = new Pong(ErrorMessage.createUnspecifiedError("Execution was interrupted: " + p));
             logThrowable = e;
-        } catch (LinkageError e) { // Typically Osgi woes
-            pong = new Pong(ErrorMessage.createErrorInPluginSearcher("Class loading problem",e));
+        } catch (LinkageError e) { // Typically, Osgi woes
+            pong = new Pong(ErrorMessage.createErrorInPluginSearcher("Class loading problem", e));
             logThrowable = e;
         } catch (TimeoutException e) {
             pong = new Pong(ErrorMessage.createNoAnswerWhenPingingNode("Ping thread timed out."));
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcPing.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcPing.java
index 32706d2f2c1..8e99f4948ce 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcPing.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcPing.java
@@ -67,7 +67,7 @@ public class RpcPing implements Pinger, Client.ResponseReceiver {
         var ping = SearchProtocol.MonitorRequest.newBuilder().build().toByteArray();
         double timeoutSeconds = ((double) clusterMonitor.getConfiguration().getRequestTimeout()) / 1000.0;
         Compressor.Compression compressionResult = resourcePool.compressor().compress(PING_COMPRESSION, ping);
-        connection.request(RPC_METHOD, compressionResult.type(), ping.length, compressionResult.data(),this, timeoutSeconds);
+        connection.request(RPC_METHOD, compressionResult.type(), ping.length, compressionResult.data(), this, timeoutSeconds);
     }
 
     private Pong decodeReply(ProtobufResponse response) throws InvalidProtocolBufferException {
@@ -91,7 +91,7 @@ public class RpcPing implements Pinger, Client.ResponseReceiver {
         if (node.isLastReceivedPong(pingSequenceId)) {
             pongHandler.handle(toPong(response));
         } else {
-            //TODO Reduce to debug or remove once we have enumerated what happens here.
+            // TODO: Reduce to debug or remove once we have enumerated what happens here.
             log.info("Pong " + pingSequenceId + " from node " + node.key() + " in group " + node.group() +
                      " with hostname " + node.hostname() + " received too late, latest is " + node.getLastReceivedPongId());
         }