diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-17 13:08:01 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-17 13:08:01 +0100 |
commit | aa5863f784b4c31feff74099b55206d97ea6d142 (patch) | |
tree | 681e752a7f234c4feeb3d1410bf68652a8e4f845 /config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java | |
parent | 8e2d974cc20b9b5922f93fc06d93c930bcf485fb (diff) |
- Have a single content cluster per searchcluster.
- Unify handling of indexed and streaming search.
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java | 21 |
1 files changed, 1 insertions, 20 deletions
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 91622e9fe31..a029ee1cb61 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 @@ -5,7 +5,6 @@ import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.container.QrSearchersConfig; import com.yahoo.prelude.semantics.SemanticRulesConfig; -import com.yahoo.schema.derived.SchemaInfo; import com.yahoo.search.config.IndexInfoConfig; import com.yahoo.search.config.SchemaInfoConfig; import com.yahoo.search.dispatch.Dispatcher; @@ -169,25 +168,7 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> @Override public void getConfig(QrSearchersConfig.Builder builder) { - for (int i = 0; i < searchClusters.size(); i++) { - SearchCluster sys = findClusterWithId(searchClusters, i); - var scB = new QrSearchersConfig.Searchcluster.Builder().name(sys.getClusterName()); - for (SchemaInfo spec : sys.schemas().values()) { - scB.searchdef(spec.fullSchema().getName()); - } - scB.rankprofiles_configid(sys.getConfigId()); - scB.indexingmode(QrSearchersConfig.Searchcluster.Indexingmode.Enum.valueOf(sys.getIndexingModeName())); - scB.storagecluster(new QrSearchersConfig.Searchcluster.Storagecluster.Builder().routespec(sys.getStorageRouteSpec())); - builder.searchcluster(scB); - } - } - - private static SearchCluster findClusterWithId(List<SearchCluster> clusters, int index) { - for (SearchCluster sys : clusters) { - if (sys.getClusterIndex() == index) - return sys; - } - throw new IllegalArgumentException("No search cluster with index " + index + " exists"); + searchClusters.forEach(sc -> builder.searchcluster(sc.getQrSearcherConfig())); } } |