Support rank profile input WIP

5 files changed, 29 insertions, 29 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index b6ce1a7f457..6295418ca38 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -57,7 +57,7 @@ import com.yahoo.vespa.model.container.processing.ProcessingChains;
 import com.yahoo.vespa.model.container.search.ContainerSearch;
 import com.yahoo.vespa.model.container.search.searchchain.SearchChains;
 import com.yahoo.vespa.model.content.Content;
-import com.yahoo.vespa.model.search.AbstractSearchCluster;
+import com.yahoo.vespa.model.search.SearchCluster;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -537,7 +537,7 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         if (containerSearch != null) containerSearch.getConfig(builder);
     }
 
-    public void initialize(Map<String, AbstractSearchCluster> clusterMap) {
+    public void initialize(Map<String, SearchCluster> clusterMap) {
         if (containerSearch != null) containerSearch.connectSearchClusters(clusterMap);
     }
 
@@ -548,9 +548,9 @@ public abstract class ContainerCluster<CONTAINER extends Container>
 
     @Override
     public void getConfig(IlscriptsConfig.Builder builder) {
-        List<AbstractSearchCluster> searchClusters = new ArrayList<>();
+        List<SearchCluster> searchClusters = new ArrayList<>();
         searchClusters.addAll(Content.getSearchClusters(getRoot().configModelRepo()));
-        for (AbstractSearchCluster searchCluster : searchClusters) {
+        for (SearchCluster searchCluster : searchClusters) {
             searchCluster.getConfig(builder);
         }
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java
index 0a073a65ac6..62b326de2df 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java
@@ -6,7 +6,7 @@ import com.yahoo.config.model.ConfigModelContext;
 import com.yahoo.config.model.ConfigModelRepo;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.vespa.model.content.Content;
-import com.yahoo.vespa.model.search.AbstractSearchCluster;
+import com.yahoo.vespa.model.search.SearchCluster;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -45,10 +45,10 @@ public class ContainerModel extends ConfigModel {
 
     @Override
     public void initialize(ConfigModelRepo configModelRepo) {
-        List<AbstractSearchCluster> searchClusters = Content.getSearchClusters(configModelRepo);
+        List<SearchCluster> searchClusters = Content.getSearchClusters(configModelRepo);
 
-        Map<String, AbstractSearchCluster> searchClustersByName = new TreeMap<>();
-        for (AbstractSearchCluster c : searchClusters)
+        Map<String, SearchCluster> searchClustersByName = new TreeMap<>();
+        for (SearchCluster c : searchClusters)
             searchClustersByName.put(c.getClusterName(), c);
 
         getCluster().initialize(searchClustersByName);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
index e0b7c3b288a..e7308c6f6ca 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
@@ -12,7 +12,7 @@ import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.ContainerSubsystem;
 import com.yahoo.vespa.model.container.search.searchchain.SearchChains;
-import com.yahoo.vespa.model.search.AbstractSearchCluster;
+import com.yahoo.vespa.model.search.SearchCluster;
 import com.yahoo.vespa.model.search.IndexedSearchCluster;
 import com.yahoo.vespa.model.search.StreamingSearchCluster;
 
@@ -40,7 +40,7 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
     public static final String QUERY_PROFILE_REGISTRY_CLASS = CompiledQueryProfileRegistry.class.getName();
 
     private ApplicationContainerCluster owningCluster;
-    private final List<AbstractSearchCluster> searchClusters = new LinkedList<>();
+    private final List<SearchCluster> searchClusters = new LinkedList<>();
     private final Options options;
 
     private QueryProfiles queryProfiles;
@@ -55,15 +55,15 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
         owningCluster.addComponent(Component.fromClassAndBundle(QUERY_PROFILE_REGISTRY_CLASS, searchAndDocprocBundle));
     }
 
-    public void connectSearchClusters(Map<String, AbstractSearchCluster> searchClusters) {
+    public void connectSearchClusters(Map<String, SearchCluster> searchClusters) {
         this.searchClusters.addAll(searchClusters.values());
         initializeDispatchers(searchClusters.values());
         initializeSearchChains(searchClusters);
     }
 
     /** Adds a Dispatcher component to the owning container cluster for each search cluster */
-    private void initializeDispatchers(Collection<AbstractSearchCluster> searchClusters) {
-        for (AbstractSearchCluster searchCluster : searchClusters) {
+    private void initializeDispatchers(Collection<SearchCluster> searchClusters) {
+        for (SearchCluster searchCluster : searchClusters) {
             if ( ! ( searchCluster instanceof IndexedSearchCluster)) continue;
             var dispatcher = new DispatcherComponent((IndexedSearchCluster)searchCluster);
             owningCluster.addComponent(dispatcher);
@@ -71,7 +71,7 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
     }
 
     // public for testing
-    public void initializeSearchChains(Map<String, ? extends AbstractSearchCluster> searchClusters) {
+    public void initializeSearchChains(Map<String, ? extends SearchCluster> searchClusters) {
         getChains().initialize(searchClusters);
     }
 
@@ -106,14 +106,14 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
 
     @Override
     public void getConfig(IndexInfoConfig.Builder builder) {
-        for (AbstractSearchCluster sc : searchClusters) {
+        for (SearchCluster sc : searchClusters) {
             sc.getConfig(builder);
         }
     }
 
     @Override
     public void getConfig(IlscriptsConfig.Builder builder) {
-        for (AbstractSearchCluster sc : searchClusters) {
+        for (SearchCluster sc : searchClusters) {
             sc.getConfig(builder);
         }
     }
@@ -121,10 +121,10 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
     @Override
     public void getConfig(QrSearchersConfig.Builder builder) {
         for (int i = 0; i < searchClusters.size(); i++) {
-    	    AbstractSearchCluster sys = findClusterWithId(searchClusters, i);
+    	    SearchCluster sys = findClusterWithId(searchClusters, i);
     		QrSearchersConfig.Searchcluster.Builder scB = new QrSearchersConfig.Searchcluster.Builder().
     				name(sys.getClusterName());
-    		for (AbstractSearchCluster.SchemaSpec spec : sys.getLocalSDS()) {
+    		for (SearchCluster.SchemaSpec spec : sys.schemas()) {
     			scB.searchdef(spec.getSchema().getName());
     		}
     		scB.rankprofiles(new QrSearchersConfig.Searchcluster.Rankprofiles.Builder().configid(sys.getConfigId()));
@@ -137,8 +137,8 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
     	}
     }
 
-    private static AbstractSearchCluster findClusterWithId(List<AbstractSearchCluster> clusters, int index) {
-        for (AbstractSearchCluster sys : clusters) {
+    private static SearchCluster findClusterWithId(List<SearchCluster> clusters, int index) {
+        for (SearchCluster sys : clusters) {
             if (sys.getClusterIndex() == index)
                 return sys;
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
index 7eefa2e5e74..a2ec1013b65 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
@@ -12,7 +12,7 @@ import com.yahoo.vespa.config.search.AttributesConfig;
 import com.yahoo.search.config.ClusterConfig;
 import com.yahoo.search.searchchain.model.federation.FederationOptions;
 import com.yahoo.search.searchchain.model.federation.LocalProviderSpec;
-import com.yahoo.vespa.model.search.AbstractSearchCluster;
+import com.yahoo.vespa.model.search.SearchCluster;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -32,7 +32,7 @@ public class LocalProvider extends Provider implements
         RankProfilesConfig.Producer {
 
     private final LocalProviderSpec providerSpec;
-    private volatile AbstractSearchCluster searchCluster;
+    private volatile SearchCluster searchCluster;
 
 
     @Override
@@ -99,7 +99,7 @@ public class LocalProvider extends Provider implements
         return providerSpec.clusterName;
     }
 
-    void setSearchCluster(AbstractSearchCluster searchCluster) {
+    void setSearchCluster(SearchCluster searchCluster) {
         this.searchCluster = searchCluster;
     }
 
@@ -115,7 +115,7 @@ public class LocalProvider extends Provider implements
     public List<String> getDocumentTypes() {
         List<String> documentTypes = new ArrayList<>();
 
-        for (AbstractSearchCluster.SchemaSpec spec : searchCluster.getLocalSDS()) {
+        for (SearchCluster.SchemaSpec spec : searchCluster.schemas()) {
             documentTypes.add(spec.getSchema().getDocument().getName());
         }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/SearchChains.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/SearchChains.java
index a71e1936425..739ff0e5e69 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/SearchChains.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/SearchChains.java
@@ -5,7 +5,7 @@ import com.yahoo.collections.CollectionUtil;
 import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.container.component.chain.Chains;
-import com.yahoo.vespa.model.search.AbstractSearchCluster;
+import com.yahoo.vespa.model.search.SearchCluster;
 import com.yahoo.vespa.model.container.search.searchchain.defaultsearchchains.LocalClustersCreator;
 import com.yahoo.vespa.model.container.search.searchchain.defaultsearchchains.VespaSearchChainsCreator;
 
@@ -25,7 +25,7 @@ public class SearchChains extends Chains<SearchChain> {
         super(parent, subId);
     }
 
-    public void initialize(Map<String, ? extends AbstractSearchCluster> searchClustersByName) {
+    public void initialize(Map<String, ? extends SearchCluster> searchClustersByName) {
         LocalClustersCreator.addDefaultLocalProviders(this, searchClustersByName.keySet());
         VespaSearchChainsCreator.addVespaSearchChains(this);
 
@@ -33,14 +33,14 @@ public class SearchChains extends Chains<SearchChain> {
         initializeComponents(searchClustersByName);
     }
 
-    private void initializeComponents(Map<String, ? extends AbstractSearchCluster> searchClustersByName) {
+    private void initializeComponents(Map<String, ? extends SearchCluster> searchClustersByName) {
         setSearchClusterForLocalProvider(searchClustersByName);
         initializeComponents();
     }
 
-    private void setSearchClusterForLocalProvider(Map<String, ? extends AbstractSearchCluster> clusterIndexByName) {
+    private void setSearchClusterForLocalProvider(Map<String, ? extends SearchCluster> clusterIndexByName) {
         for (LocalProvider provider : localProviders()) {
-            AbstractSearchCluster cluster = clusterIndexByName.get(provider.getClusterName());
+            SearchCluster cluster = clusterIndexByName.get(provider.getClusterName());
             if (cluster == null)
                 throw new IllegalArgumentException("No searchable content cluster with id '" + provider.getClusterName() + "'");
             provider.setSearchCluster(cluster);