diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-10-07 12:53:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-07 12:53:49 +0200 |
commit | dedf5f2f6cf5c4ee2b6b9e214bc445d4c4639869 (patch) | |
tree | 2407b63720681c045c084d9e5fa9636c5399734a /container-search/src/main | |
parent | 36d28c100f03ab1f5a82d3cbe6f5f8cf40a0a519 (diff) |
Revert "Limit document selection per cluster by the document type of the clus…"
Diffstat (limited to 'container-search/src/main')
4 files changed, 18 insertions, 28 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; diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java index a6e4ddaafbc..53c170301fc 100644 --- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java +++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java @@ -56,18 +56,14 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher { private Route route; /** The configId used to access the searchcluster. */ private String searchClusterConfigId = null; - private String documentType; /** The route to the storage cluster. */ private String storageClusterRouteSpec = null; - private String getSearchClusterConfigId() { return searchClusterConfigId; } - private String getStorageClusterRouteSpec() { return storageClusterRouteSpec; } + String getSearchClusterConfigId() { return searchClusterConfigId; } + String getStorageClusterRouteSpec() { return storageClusterRouteSpec; } public final void setSearchClusterConfigId(String clusterName) { this.searchClusterConfigId = clusterName; } - public final void setDocumentType(String documentType) { - this.documentType = documentType; - } public final void setStorageClusterRouteSpec(String storageClusterRouteSpec) { this.storageClusterRouteSpec = storageClusterRouteSpec; @@ -75,8 +71,8 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher { private static class VdsVisitorFactory implements VisitorFactory { @Override - public Visitor createVisitor(Query query, String searchCluster, Route route, String documentType) { - return new VdsVisitor(query, searchCluster, route, documentType); + public Visitor createVisitor(Query query, String searchCluster, Route route) { + return new VdsVisitor(query, searchCluster, route); } } @@ -131,8 +127,8 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher { "only one of these query parameters to be set: streaming.userid, streaming.groupname, " + "streaming.selection")); } - query.trace("Routing to search cluster " + getSearchClusterConfigId() + " and document type " + documentType, 4); - Visitor visitor = visitorFactory.createVisitor(query, getSearchClusterConfigId(), route, documentType); + query.trace("Routing to search cluster " + getSearchClusterConfigId(), 4); + Visitor visitor = visitorFactory.createVisitor(query, getSearchClusterConfigId(), route); try { visitor.doSearch(); } catch (ParseException e) { diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java index ded59413411..27da8c0cf9b 100644 --- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java +++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java @@ -105,16 +105,16 @@ class VdsVisitor extends VisitorDataHandler implements Visitor { } } - public VdsVisitor(Query query, String searchCluster, Route route, String documentType) { - this(query, searchCluster, route, documentType, new MessageBusVisitorSessionFactory()); + public VdsVisitor(Query query, String searchCluster, Route route) { + this.query = query; + visitorSessionFactory = new MessageBusVisitorSessionFactory(); + setVisitorParameters(searchCluster, route); } - public VdsVisitor(Query query, String searchCluster, Route route, - String documentType, VisitorSessionFactory visitorSessionFactory) - { + public VdsVisitor(Query query, String searchCluster, Route route, VisitorSessionFactory visitorSessionFactory) { this.query = query; this.visitorSessionFactory = visitorSessionFactory; - setVisitorParameters(searchCluster, route, documentType); + setVisitorParameters(searchCluster, route); } private static int inferSessionTraceLevel(Query query) { @@ -127,14 +127,13 @@ class VdsVisitor extends VisitorDataHandler implements Visitor { return Math.max(query.getTraceLevel(), implicitLevel); } - private void setVisitorParameters(String searchCluster, Route route, String documentType) { - String limitDocumentType = documentType + " and "; + private void setVisitorParameters(String searchCluster, Route route) { if (query.properties().getString(streamingUserid) != null) { - params.setDocumentSelection(limitDocumentType + "id.user==" + query.properties().getString(streamingUserid)); + params.setDocumentSelection("id.user==" + query.properties().getString(streamingUserid)); } else if (query.properties().getString(streamingGroupname) != null) { - params.setDocumentSelection(limitDocumentType + "id.group==\"" + query.properties().getString(streamingGroupname) + "\""); + params.setDocumentSelection("id.group==\"" + query.properties().getString(streamingGroupname) + "\""); } else if (query.properties().getString(streamingSelection) != null) { - params.setDocumentSelection(limitDocumentType + query.properties().getString(streamingSelection)); + params.setDocumentSelection(query.properties().getString(streamingSelection)); } params.setTimeoutMs(query.getTimeout()); // Per bucket visitor timeout params.setSessionTimeoutMs(query.getTimeout()); diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VisitorFactory.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VisitorFactory.java index 9762d05bf45..25d4bbc689d 100644 --- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VisitorFactory.java +++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VisitorFactory.java @@ -10,5 +10,5 @@ import com.yahoo.search.Query; * @author <a href="mailto:ulf@yahoo-inc.com">Ulf Carlin</a> */ interface VisitorFactory { - public Visitor createVisitor(Query query, String searchCluster, Route route, String documentType); + public Visitor createVisitor(Query query, String searchCluster, Route route); } |