You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/09/18 16:24:38 UTC
[36/50] lucene-solr:feature/autoscaling: SOLR-11343: fix
TestSegmentSorting.testSegmentTerminateEarly test failure caused by
SOLR-10990
SOLR-11343: fix TestSegmentSorting.testSegmentTerminateEarly test failure caused by SOLR-10990
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/37b8ac6f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/37b8ac6f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/37b8ac6f
Branch: refs/heads/feature/autoscaling
Commit: 37b8ac6ff5efc68a4637ddb65c7c15faef21227a
Parents: 0359db9
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Sep 11 09:24:00 2017 -0700
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Sep 11 10:32:15 2017 -0700
----------------------------------------------------------------------
.../solr/handler/component/QueryComponent.java | 23 +++++++-------------
1 file changed, 8 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/37b8ac6f/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
index 417d583..3d2a4ed 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -357,14 +357,14 @@ public class QueryComponent extends SearchComponent
cmd.setSegmentTerminateEarly(false); // not supported, silently ignore any segmentTerminateEarly flag
try {
if (params.getBool(GroupParams.GROUP_DISTRIBUTED_FIRST, false)) {
- doProcessGroupedDistributedSearchFirstPhase(rb, result);
+ doProcessGroupedDistributedSearchFirstPhase(rb, cmd, result);
return;
} else if (params.getBool(GroupParams.GROUP_DISTRIBUTED_SECOND, false)) {
- doProcessGroupedDistributedSearchSecondPhase(rb, result);
+ doProcessGroupedDistributedSearchSecondPhase(rb, cmd, result);
return;
}
- doProcessGroupedSearch(rb, result);
+ doProcessGroupedSearch(rb, cmd, result);
return;
} catch (SyntaxError e) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, e);
@@ -372,7 +372,7 @@ public class QueryComponent extends SearchComponent
}
// normal search result
- doProcessUngroupedSearch(rb, result);
+ doProcessUngroupedSearch(rb, cmd, result);
}
protected void doFieldSortValues(ResponseBuilder rb, SolrIndexSearcher searcher) throws IOException
@@ -1248,7 +1248,7 @@ public class QueryComponent extends SearchComponent
return true;
}
- private void doProcessGroupedDistributedSearchFirstPhase(ResponseBuilder rb, QueryResult result) throws IOException {
+ private void doProcessGroupedDistributedSearchFirstPhase(ResponseBuilder rb, QueryCommand cmd, QueryResult result) throws IOException {
GroupingSpecification groupingSpec = rb.getGroupingSpec();
assert null != groupingSpec : "GroupingSpecification is null";
@@ -1259,8 +1259,6 @@ public class QueryComponent extends SearchComponent
SolrIndexSearcher searcher = req.getSearcher();
IndexSchema schema = searcher.getSchema();
- QueryCommand cmd = rb.getQueryCommand();
-
CommandHandler.Builder topsGroupsActionBuilder = new CommandHandler.Builder()
.setQueryCommand(cmd)
.setNeedDocSet(false) // Order matters here
@@ -1286,7 +1284,7 @@ public class QueryComponent extends SearchComponent
rb.setResult(result);
}
- private void doProcessGroupedDistributedSearchSecondPhase(ResponseBuilder rb, QueryResult result) throws IOException, SyntaxError {
+ private void doProcessGroupedDistributedSearchSecondPhase(ResponseBuilder rb, QueryCommand cmd, QueryResult result) throws IOException, SyntaxError {
GroupingSpecification groupingSpec = rb.getGroupingSpec();
assert null != groupingSpec : "GroupingSpecification is null";
@@ -1299,7 +1297,6 @@ public class QueryComponent extends SearchComponent
SolrIndexSearcher searcher = req.getSearcher();
IndexSchema schema = searcher.getSchema();
- QueryCommand cmd = rb.getQueryCommand();
boolean needScores = (cmd.getFlags() & SolrIndexSearcher.GET_SCORES) != 0;
CommandHandler.Builder secondPhaseBuilder = new CommandHandler.Builder()
@@ -1358,7 +1355,7 @@ public class QueryComponent extends SearchComponent
rb.setResult(result);
}
- private void doProcessGroupedSearch(ResponseBuilder rb, QueryResult result) throws IOException, SyntaxError {
+ private void doProcessGroupedSearch(ResponseBuilder rb, QueryCommand cmd, QueryResult result) throws IOException, SyntaxError {
GroupingSpecification groupingSpec = rb.getGroupingSpec();
assert null != groupingSpec : "GroupingSpecification is null";
@@ -1370,8 +1367,6 @@ public class QueryComponent extends SearchComponent
SolrIndexSearcher searcher = req.getSearcher();
- QueryCommand cmd = rb.getQueryCommand();
-
int maxDocsPercentageToCache = params.getInt(GroupParams.GROUP_CACHE_PERCENTAGE, 0);
boolean cacheSecondPassSearch = maxDocsPercentageToCache >= 1 && maxDocsPercentageToCache <= 100;
Grouping.TotalCount defaultTotalCount = groupingSpec.isIncludeGroupCount() ?
@@ -1430,15 +1425,13 @@ public class QueryComponent extends SearchComponent
}
}
- private void doProcessUngroupedSearch(ResponseBuilder rb, QueryResult result) throws IOException {
+ private void doProcessUngroupedSearch(ResponseBuilder rb, QueryCommand cmd, QueryResult result) throws IOException {
SolrQueryRequest req = rb.req;
SolrQueryResponse rsp = rb.rsp;
SolrIndexSearcher searcher = req.getSearcher();
- QueryCommand cmd = rb.getQueryCommand();
-
searcher.search(result, cmd);
rb.setResult(result);