summaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-10-07 12:53:49 +0200
committerGitHub <noreply@github.com>2018-10-07 12:53:49 +0200
commitdedf5f2f6cf5c4ee2b6b9e214bc445d4c4639869 (patch)
tree2407b63720681c045c084d9e5fa9636c5399734a /container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
parent36d28c100f03ab1f5a82d3cbe6f5f8cf40a0a519 (diff)
Revert "Limit document selection per cluster by the document type of the clus…"
Diffstat (limited to 'container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java7
1 files changed, 1 insertions, 6 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 aa04f6ca20b..116db906755 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
@@ -216,16 +216,11 @@ public class ClusterSearcher extends Searcher {
CacheParams cacheParams,
LegacyEmulationConfig emulConfig,
SummaryParameters docSumParams,
- DocumentdbInfoConfig documentdbInfoConfig)
- {
- if (searchClusterConfig.searchdef().size() != 1) {
- throw new IllegalArgumentException("Search clusters in streaming search shall only contain a single searchdefinition : " + searchClusterConfig.searchdef());
- }
+ DocumentdbInfoConfig documentdbInfoConfig) {
ClusterParams clusterParams = makeClusterParams(searchclusterIndex, emulConfig, 0);
VdsStreamingSearcher searcher = (VdsStreamingSearcher) VespaBackEndSearcher
.getSearcher("com.yahoo.vespa.streamingvisitors.VdsStreamingSearcher");
searcher.setSearchClusterConfigId(searchClusterConfig.rankprofiles().configid());
- searcher.setDocumentType(searchClusterConfig.searchdef(0));
searcher.setStorageClusterRouteSpec(searchClusterConfig.storagecluster().routespec());
searcher.init(docSumParams, clusterParams, cacheParams, documentdbInfoConfig);
return searcher;