From dedf5f2f6cf5c4ee2b6b9e214bc445d4c4639869 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Sun, 7 Oct 2018 12:53:49 +0200
Subject: Revert "Limit document selection per cluster by the document type of
 the clus…"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java')

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;
-- 
cgit v1.2.3