You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2021/03/10 10:03:16 UTC
[lucene] 05/10: SOLR-13350: GraphQuery shouldn't use multi-threaded
search
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch jira/solr-13350-new
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit bde29b5858158887240f428e4a036d3aca6bf5a9
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Wed Mar 4 02:07:11 2020 +0530
SOLR-13350: GraphQuery shouldn't use multi-threaded search
---
solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index 2f7ad6c..034a488 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -76,6 +76,7 @@ import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.facet.UnInvertedField;
+import org.apache.solr.search.join.GraphQuery;
import org.apache.solr.search.stats.StatsCache;
import org.apache.solr.search.stats.StatsSource;
import org.apache.solr.uninverting.UninvertingReader;
@@ -1615,7 +1616,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
TopDocs topDocs;
log.info("calling from 2, query: "+query.getClass()); // nocommit
if (pf.postFilter != null || cmd.getSegmentTerminateEarly() || cmd.getTimeAllowed() > 0
- || query instanceof RankQuery) {
+ || query instanceof RankQuery || query instanceof GraphQuery) {
log.debug("skipping collector manager");
final TopDocsCollector topCollector = buildTopDocsCollector(len, cmd);
MaxScoreCollector maxScoreCollector = null;
@@ -1806,7 +1807,8 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
qr.setNextCursorMark(cmd.getCursorMark());
} else {
TopDocs topDocs;
- if (pf.postFilter != null || cmd.getSegmentTerminateEarly() || cmd.getTimeAllowed() > 0 || query instanceof RankQuery) {
+ if (pf.postFilter != null || cmd.getSegmentTerminateEarly() || cmd.getTimeAllowed() > 0
+ || query instanceof RankQuery || query instanceof GraphQuery) {
final TopDocsCollector topCollector = buildTopDocsCollector(len, cmd);
DocSetCollector setCollector = new DocSetCollector(maxDoc);