Rename FastBackend => Indexedbackend, and move some tests into the package they test.

2 files changed, 17 insertions, 17 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 28ba4fb09b2..a8605ab1597 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
@@ -11,7 +11,7 @@ import com.yahoo.container.core.documentapi.VespaDocumentAccess;
 import com.yahoo.container.handler.VipStatus;
 import com.yahoo.prelude.fastsearch.ClusterParams;
 import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
-import com.yahoo.prelude.fastsearch.FastBackend;
+import com.yahoo.prelude.fastsearch.IndexedBackend;
 import com.yahoo.prelude.fastsearch.SummaryParameters;
 import com.yahoo.prelude.fastsearch.VespaBackend;
 import com.yahoo.search.Query;
@@ -93,7 +93,7 @@ public class ClusterSearcher extends Searcher {
         maxQueryCacheTimeout = ParameterParser.asMilliSeconds(clusterConfig.maxQueryCacheTimeout(), DEFAULT_MAX_QUERY_CACHE_TIMEOUT);
 
         SummaryParameters docSumParams = new SummaryParameters(qrsConfig
-                .com().yahoo().prelude().fastsearch().FastBackend().docsum()
+                .com().yahoo().prelude().fastsearch().IndexedBackend().docsum()
                 .defaultclass());
 
         String uniqueServerId = UUID.randomUUID().toString();
@@ -130,20 +130,20 @@ public class ClusterSearcher extends Searcher {
         return new ClusterParams("sc" + searchclusterIndex + ".num" + 0);
     }
 
-    private static FastBackend searchDispatch(int searchclusterIndex,
-                                              String searchClusterName,
-                                              String serverId,
-                                              SummaryParameters docSumParams,
-                                              DocumentdbInfoConfig documentdbInfoConfig,
-                                              SchemaInfo schemaInfo,
-                                              ComponentRegistry<Dispatcher> dispatchers) {
+    private static IndexedBackend searchDispatch(int searchclusterIndex,
+                                                 String searchClusterName,
+                                                 String serverId,
+                                                 SummaryParameters docSumParams,
+                                                 DocumentdbInfoConfig documentdbInfoConfig,
+                                                 SchemaInfo schemaInfo,
+                                                 ComponentRegistry<Dispatcher> dispatchers) {
         ClusterParams clusterParams = makeClusterParams(searchclusterIndex);
         ComponentId dispatcherComponentId = new ComponentId("dispatcher." + searchClusterName);
         Dispatcher dispatcher = dispatchers.getComponent(dispatcherComponentId);
         if (dispatcher == null)
             throw new IllegalArgumentException("Configuration error: No dispatcher " + dispatcherComponentId +
                                                " is configured");
-        return new FastBackend(serverId, dispatcher, docSumParams, clusterParams, documentdbInfoConfig, schemaInfo);
+        return new IndexedBackend(serverId, dispatcher, docSumParams, clusterParams, documentdbInfoConfig, schemaInfo);
     }
 
     private static StreamingBackend streamingCluster(String serverId,
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastBackend.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/IndexedBackend.java
index b1b3483af8c..294aff8d78b 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastBackend.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/IndexedBackend.java
@@ -30,7 +30,7 @@ import java.util.Optional;
 // errors on results and returning them. It could be handy to create a QueryHandlingErrorException
 // or similar which could wrap an error message, and then just always throw that and
 // catch and unwrap into a results with an error in high level methods.  -Jon
-public class FastBackend extends VespaBackend {
+public class IndexedBackend extends VespaBackend {
 
     /** Used to dispatch directly to search nodes over RPC, replacing the old fnet communication path */
     private final Dispatcher dispatcher;
@@ -48,12 +48,12 @@ public class FastBackend extends VespaBackend {
      * @param clusterParams the cluster number, and other cluster backend parameters
      * @param documentdbInfoConfig document database parameters
      */
-    public FastBackend(String serverId,
-                       Dispatcher dispatcher,
-                       SummaryParameters docSumParams,
-                       ClusterParams clusterParams,
-                       DocumentdbInfoConfig documentdbInfoConfig,
-                       SchemaInfo schemaInfo) {
+    public IndexedBackend(String serverId,
+                          Dispatcher dispatcher,
+                          SummaryParameters docSumParams,
+                          ClusterParams clusterParams,
+                          DocumentdbInfoConfig documentdbInfoConfig,
+                          SchemaInfo schemaInfo) {
         init(serverId, docSumParams, clusterParams, documentdbInfoConfig, schemaInfo);
         this.dispatcher = dispatcher;
     }