Searcher => Backend

8 files changed, 61 insertions, 62 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java
index 2b00bac5316..d52fbe580a7 100644
--- a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java
@@ -9,7 +9,7 @@ import com.yahoo.container.handler.ClustersStatus;
 import com.yahoo.container.handler.VipStatus;
 import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
 import com.yahoo.prelude.fastsearch.FastHit;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.config.ClusterConfig;
@@ -74,7 +74,7 @@ public class ClusterSearcherTestCase {
 
     @Test
     void testThatDocumentTypesAreResolved() {
-        var backend = new MyMockSearcher(false);
+        var backend = new MyMockBackend(false);
         SchemaInfo schemaInfo = createSchemaInfo();
         ClusterSearcher cluster1 = new ClusterSearcher(schemaInfo, Map.of("type1", backend, "type2", backend, "type3", backend));
         try {
@@ -115,7 +115,7 @@ public class ClusterSearcherTestCase {
 
     @Test
     void testThatDocumentTypesAreResolvedTODO_REMOVE() {
-        var backend = new MyMockSearcher(false);
+        var backend = new MyMockBackend(false);
         SchemaInfo schemaInfo = createSchemaInfo();
         ClusterSearcher cluster1 = new ClusterSearcher(schemaInfo, Map.of("type1", backend, "type2", backend, "type3", backend));
         try {
@@ -130,7 +130,7 @@ public class ClusterSearcherTestCase {
         }
     }
 
-    private static class MyMockSearcher extends VespaBackEndSearcher {
+    private static class MyMockBackend extends VespaBackend {
 
         private final String type1 = "type1";
         private final String type2 = "type2";
@@ -187,7 +187,7 @@ public class ClusterSearcherTestCase {
                                              createHit(getId(type3, 2), 5)));
         }
 
-        MyMockSearcher(boolean expectAttributePrefetch) {
+        MyMockBackend(boolean expectAttributePrefetch) {
             this.expectAttributePrefetch = expectAttributePrefetch;
             init();
         }
@@ -254,8 +254,8 @@ public class ClusterSearcherTestCase {
     }
 
     private Execution createExecution(List<String> docTypesList, boolean expectAttributePrefetch) {
-        var backend = new MyMockSearcher(expectAttributePrefetch);
-        Map<String, VespaBackEndSearcher> searchers = new HashMap<>();
+        var backend = new MyMockBackend(expectAttributePrefetch);
+        Map<String, VespaBackend> searchers = new HashMap<>();
         for(String schema : docTypesList) {
             searchers.put(schema, backend);
         }
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
index 8270700a66b..3928743c954 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
@@ -6,9 +6,9 @@ import com.yahoo.container.handler.VipStatus;
 import com.yahoo.container.protect.Error;
 import com.yahoo.prelude.fastsearch.ClusterParams;
 import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
-import com.yahoo.prelude.fastsearch.FastSearcher;
+import com.yahoo.prelude.fastsearch.FastBackend;
 import com.yahoo.prelude.fastsearch.SummaryParameters;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.dispatch.MockDispatcher;
@@ -44,8 +44,8 @@ public class FastSearcherTestCase {
 
     @Test
     void testNullQuery() {
-        Logger.getLogger(FastSearcher.class.getName()).setLevel(Level.ALL);
-        FastSearcher fastSearcher = new FastSearcher("container.0",
+        Logger.getLogger(FastBackend.class.getName()).setLevel(Level.ALL);
+        FastBackend fastSearcher = new FastBackend("container.0",
                 MockDispatcher.create(List.of()),
                 new SummaryParameters(null),
                 new ClusterParams("testhittype"),
@@ -62,7 +62,7 @@ public class FastSearcherTestCase {
         assertEquals(Error.NULL_QUERY.code, message.getCode());
     }
 
-    private Result doSearch(VespaBackEndSearcher searcher, Query query, int offset, int hits) {
+    private Result doSearch(VespaBackend searcher, Query query, int offset, int hits) {
         query.setOffset(offset);
         query.setHits(hits);
         return searcher.search(SCHEMA, query);
@@ -70,7 +70,7 @@ public class FastSearcherTestCase {
 
     @Test
     void testSinglePassGroupingIsForcedWithSingleNodeGroups() {
-        FastSearcher fastSearcher = new FastSearcher("container.0",
+        FastBackend fastSearcher = new FastBackend("container.0",
                 MockDispatcher.create(List.of(new Node(CLUSTER, 0, "host0", 0))),
                 new SummaryParameters(null),
                 new ClusterParams("testhittype"),
@@ -93,7 +93,7 @@ public class FastSearcherTestCase {
 
     @Test
     void testRankProfileValidation() {
-        FastSearcher fastSearcher = new FastSearcher("container.0",
+        FastBackend fastSearcher = new FastBackend("container.0",
                 MockDispatcher.create(List.of(new Node(CLUSTER, 0, "host0", 0))),
                 new SummaryParameters(null),
                 new ClusterParams("testhittype"),
@@ -112,7 +112,7 @@ public class FastSearcherTestCase {
                 .add(new RankProfile.Builder("default").setHasRankFeatures(false)
                         .setHasSummaryFeatures(false)
                         .build());
-        FastSearcher backend = new FastSearcher("container.0",
+        FastBackend backend = new FastBackend("container.0",
                 MockDispatcher.create(Collections.singletonList(new Node(CLUSTER, 0, "host0", 0))),
                 new SummaryParameters(null),
                 new ClusterParams("testhittype"),
@@ -132,7 +132,7 @@ public class FastSearcherTestCase {
     void testSinglePassGroupingIsNotForcedWithSingleNodeGroups() {
         MockDispatcher dispatcher = MockDispatcher.create(List.of(new Node(CLUSTER, 0, "host0", 0), new Node(CLUSTER, 2, "host1", 0)));
 
-        FastSearcher fastSearcher = new FastSearcher("container.0",
+        FastBackend fastSearcher = new FastBackend("container.0",
                 dispatcher,
                 new SummaryParameters(null),
                 new ClusterParams("testhittype"),
@@ -182,11 +182,11 @@ public class FastSearcherTestCase {
         assertTrue(vipStatus.isInRotation()); //Verify that deconstruct does not touch vipstatus
     }
 
-    private String searchError(String query, VespaBackEndSearcher searcher) {
+    private String searchError(String query, VespaBackend searcher) {
         return search(query, searcher).hits().getError().getDetailedMessage();
     }
 
-    private Result search(String query, VespaBackEndSearcher searcher) {
+    private Result search(String query, VespaBackend searcher) {
         return searcher.search(SCHEMA, new Query(query));
     }
 
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java
index a033ccdace6..cf5a0ca7bd9 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PartialFillTestCase.java
@@ -3,7 +3,7 @@ package com.yahoo.prelude.fastsearch.test;
 
 import com.yahoo.component.chain.Chain;
 import com.yahoo.prelude.fastsearch.FastHit;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
@@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.*;
  */
 public class PartialFillTestCase {
 
-    public static class FS4 extends VespaBackEndSearcher {
+    public static class FS4 extends VespaBackend {
         public List<Result> history = new ArrayList<>();
         protected Result doSearch2(String schema, Query query) {
             return new Result(query);
@@ -32,7 +32,7 @@ public class PartialFillTestCase {
         }
     }
 
-    public static class BadFS4 extends VespaBackEndSearcher {
+    public static class BadFS4 extends VespaBackend {
         protected Result doSearch2(String schema, Query query) {
             return new Result(query);
         }
@@ -137,7 +137,7 @@ public class PartialFillTestCase {
         }
     }
 
-    private void doFill(VespaBackEndSearcher searcher, Result result, String summaryClass) {
+    private void doFill(VespaBackend searcher, Result result, String summaryClass) {
         searcher.fill(result, summaryClass);
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java
index 23846db3f0b..c966fbc200d 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/DispatcherTest.java
@@ -3,7 +3,7 @@ package com.yahoo.search.dispatch;
 
 import com.yahoo.compress.CompressionType;
 import com.yahoo.prelude.Pong;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.cluster.ClusterMonitor;
@@ -236,7 +236,7 @@ public class DispatcherTest {
 
         // This factory just forwards search to the dummy RPC layer above, nothing more.
         InvokerFactoryFactory invokerFactories = (rpcConnectionPool, searchGroups, dispatchConfig) -> new InvokerFactory(searchGroups, dispatchConfig) {
-            @Override protected Optional<SearchInvoker> createNodeSearchInvoker(VespaBackEndSearcher searcher, Query query, int maxHits, Node node) {
+            @Override protected Optional<SearchInvoker> createNodeSearchInvoker(VespaBackend searcher, Query query, int maxHits, Node node) {
                 return Optional.of(new SearchInvoker(Optional.of(node)) {
                     @Override protected Object sendSearchRequest(Query query, Object context) {
                         rpcPool.getConnection(node.key()).request(null, null, 0, null, null, 0);
@@ -248,7 +248,7 @@ public class DispatcherTest {
                     @Override protected void release() { }
                 });
             };
-            @Override public FillInvoker createFillInvoker(VespaBackEndSearcher searcher, Result result) {
+            @Override public FillInvoker createFillInvoker(VespaBackend searcher, Result result) {
                 return new FillInvoker() {
                     @Override protected void getFillResults(Result result, String summaryClass) { fail(); }
                     @Override protected void sendFillRequest(Result result, String summaryClass) { fail(); }
@@ -369,7 +369,7 @@ public class DispatcherTest {
         }
 
         @Override
-        public Optional<SearchInvoker> createSearchInvoker(VespaBackEndSearcher searcher,
+        public Optional<SearchInvoker> createSearchInvoker(VespaBackend searcher,
                                                            Query query,
                                                            List<Node> nodes,
                                                            boolean acceptIncompleteCoverage,
@@ -391,7 +391,7 @@ public class DispatcherTest {
         }
 
         @Override
-        protected Optional<SearchInvoker> createNodeSearchInvoker(VespaBackEndSearcher searcher,
+        protected Optional<SearchInvoker> createNodeSearchInvoker(VespaBackend searcher,
                                                                   Query query,
                                                                   int maxHitsPerNode,
                                                                   Node node) {
@@ -400,7 +400,7 @@ public class DispatcherTest {
         }
 
         @Override
-        public FillInvoker createFillInvoker(VespaBackEndSearcher searcher, Result result) {
+        public FillInvoker createFillInvoker(VespaBackend searcher, Result result) {
             fail("Unexpected call to createFillInvoker");
             return null;
         }
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/RpcSearchInvokerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/RpcSearchInvokerTest.java
index 2600d8612f8..ef8e0522337 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/RpcSearchInvokerTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/RpcSearchInvokerTest.java
@@ -5,7 +5,7 @@ package com.yahoo.search.dispatch.rpc;
 import ai.vespa.searchlib.searchprotocol.protobuf.SearchProtocol;
 import com.google.common.collect.ImmutableMap;
 import com.yahoo.compress.CompressionType;
-import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
+import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.dispatch.searchcluster.Node;
@@ -117,8 +117,8 @@ public class RpcSearchInvokerTest {
         };
     }
 
-    private VespaBackEndSearcher mockSearcher() {
-        return new VespaBackEndSearcher() {
+    private VespaBackend mockSearcher() {
+        return new VespaBackend() {
             @Override
             protected Result doSearch2(String schema, Query query) {
                 fail("Unexpected call");
diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java
index 4455c8a04a5..87d18c18db5 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/YqlFieldAndSourceTestCase.java
@@ -5,7 +5,6 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 import com.yahoo.search.schema.DocumentSummary;
 import com.yahoo.search.schema.Schema;
@@ -21,7 +20,7 @@ import com.yahoo.search.result.Hit;
 import com.yahoo.search.searchchain.Execution;
 import com.yahoo.search.searchchain.testutil.DocumentSourceSearcher;
 import static com.yahoo.search.searchchain.testutil.DocumentSourceSearcher.DEFAULT_SUMMARY_CLASS;
-import static com.yahoo.prelude.fastsearch.VespaBackEndSearcher.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
+import static com.yahoo.prelude.fastsearch.VespaBackend.SORTABLE_ATTRIBUTES_SUMMARY_CLASS;
 
 
 /**
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
index 831261bb91a..5cc0e6b060b 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
@@ -134,9 +134,9 @@ public class MetricsSearcherTestCase {
 
         private void assignContextProperties(Query query, String loadType) {
             if (loadType != null && loadType.equals(LOADTYPE1)) {
-                query.getContext(true).setProperty(StreamingSearcher.STREAMING_STATISTICS, visitorStats);
+                query.getContext(true).setProperty(StreamingBackend.STREAMING_STATISTICS, visitorStats);
             } else {
-                query.getContext(true).setProperty(StreamingSearcher.STREAMING_STATISTICS, null);
+                query.getContext(true).setProperty(StreamingBackend.STREAMING_STATISTICS, null);
             }
         }
     }
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java
index c7e95f802ab..b96dd97f76c 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java
@@ -159,7 +159,7 @@ public class StreamingSearcherTestCase {
         }
     }
 
-    private static Result executeQuery(StreamingSearcher searcher, Query query) {
+    private static Result executeQuery(StreamingBackend searcher, Query query) {
         return searcher.doSearch2("test", query);
     }
 
@@ -181,7 +181,7 @@ public class StreamingSearcherTestCase {
         return queries;
     }
 
-    private static void checkError(StreamingSearcher searcher, String queryString, String message, String detailedMessage) {
+    private static void checkError(StreamingBackend searcher, String queryString, String message, String detailedMessage) {
         for (Query query : generateTestQueries(queryString)) {
             Result result = executeQuery(searcher, query);
             assertNotNull(result.hits().getError());
@@ -194,7 +194,7 @@ public class StreamingSearcherTestCase {
         }
     }
 
-    private static void checkSearch(StreamingSearcher searcher, String queryString, int hitCount, String idPrefix) {
+    private static void checkSearch(StreamingBackend searcher, String queryString, int hitCount, String idPrefix) {
         for (Query query : generateTestQueries(queryString)) {
             Result result = executeQuery(searcher, query);
             assertNull(result.hits().getError());
@@ -212,11 +212,11 @@ public class StreamingSearcherTestCase {
         }
     }
 
-    private static void checkGrouping(StreamingSearcher searcher, String queryString, int hitCount) {
+    private static void checkGrouping(StreamingBackend searcher, String queryString, int hitCount) {
         checkSearch(searcher, queryString, hitCount, null);
     }
 
-    private static void checkMatchFeatures(StreamingSearcher searcher) {
+    private static void checkMatchFeatures(StreamingBackend searcher) {
         String queryString = "/?streaming.selection=true&query=match_features";
         Result result = executeQuery(searcher, new Query(queryString));
         assertNull(result.hits().getError());
@@ -229,7 +229,7 @@ public class StreamingSearcherTestCase {
     @Test
     void testBasics() {
         MockVisitorFactory factory = new MockVisitorFactory();
-        StreamingSearcher searcher = new StreamingSearcher(factory);
+        StreamingBackend searcher = new StreamingBackend(factory);
 
         var schema = new Schema.Builder("test");
         schema.add(new com.yahoo.search.schema.DocumentSummary.Builder("default").build());
@@ -276,25 +276,25 @@ public class StreamingSearcherTestCase {
         String groupId2 = "id:namespace:mytype:g=group2:userspecific";
         String badId = "unknowscheme:namespace:something";
 
-        assertTrue(StreamingSearcher.verifyDocId(userId1, generalQuery, true));
-
-        assertTrue(StreamingSearcher.verifyDocId(userId1, generalQuery, false));
-        assertTrue(StreamingSearcher.verifyDocId(userId2, generalQuery, false));
-        assertTrue(StreamingSearcher.verifyDocId(groupId1, generalQuery, false));
-        assertTrue(StreamingSearcher.verifyDocId(groupId2, generalQuery, false));
-        assertFalse(StreamingSearcher.verifyDocId(badId, generalQuery, false));
-
-        assertTrue(StreamingSearcher.verifyDocId(userId1, user1Query, false));
-        assertFalse(StreamingSearcher.verifyDocId(userId2, user1Query, false));
-        assertFalse(StreamingSearcher.verifyDocId(groupId1, user1Query, false));
-        assertFalse(StreamingSearcher.verifyDocId(groupId2, user1Query, false));
-        assertFalse(StreamingSearcher.verifyDocId(badId, user1Query, false));
-
-        assertFalse(StreamingSearcher.verifyDocId(userId1, group1Query, false));
-        assertFalse(StreamingSearcher.verifyDocId(userId2, group1Query, false));
-        assertTrue(StreamingSearcher.verifyDocId(groupId1, group1Query, false));
-        assertFalse(StreamingSearcher.verifyDocId(groupId2, group1Query, false));
-        assertFalse(StreamingSearcher.verifyDocId(badId, group1Query, false));
+        assertTrue(StreamingBackend.verifyDocId(userId1, generalQuery, true));
+
+        assertTrue(StreamingBackend.verifyDocId(userId1, generalQuery, false));
+        assertTrue(StreamingBackend.verifyDocId(userId2, generalQuery, false));
+        assertTrue(StreamingBackend.verifyDocId(groupId1, generalQuery, false));
+        assertTrue(StreamingBackend.verifyDocId(groupId2, generalQuery, false));
+        assertFalse(StreamingBackend.verifyDocId(badId, generalQuery, false));
+
+        assertTrue(StreamingBackend.verifyDocId(userId1, user1Query, false));
+        assertFalse(StreamingBackend.verifyDocId(userId2, user1Query, false));
+        assertFalse(StreamingBackend.verifyDocId(groupId1, user1Query, false));
+        assertFalse(StreamingBackend.verifyDocId(groupId2, user1Query, false));
+        assertFalse(StreamingBackend.verifyDocId(badId, user1Query, false));
+
+        assertFalse(StreamingBackend.verifyDocId(userId1, group1Query, false));
+        assertFalse(StreamingBackend.verifyDocId(userId2, group1Query, false));
+        assertTrue(StreamingBackend.verifyDocId(groupId1, group1Query, false));
+        assertFalse(StreamingBackend.verifyDocId(groupId2, group1Query, false));
+        assertFalse(StreamingBackend.verifyDocId(badId, group1Query, false));
     }
 
     private static class TraceFixture {
@@ -304,13 +304,13 @@ public class StreamingSearcherTestCase {
         TracingOptions options;
 
         MockVisitorFactory factory;
-        StreamingSearcher searcher;
+        StreamingBackend searcher;
 
         private TraceFixture(Long firstTimestamp, Long... additionalTimestamps) {
             clock = MockUtils.mockedClockReturning(firstTimestamp, additionalTimestamps);
             options = new TracingOptions(sampler, exporter, clock, 8, 2.0);
             factory = new MockVisitorFactory();
-            searcher = new StreamingSearcher(factory, options);
+            searcher = new StreamingBackend(factory, options);
         }
 
         private TraceFixture() {