honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor Cleanups in QueryPhase (#39680) (#39694) 

* Soften redundant cast to allow use of `DeterministicTaskQueue` in this class for #39504
* Remove two redundant variables and lower visibility in two possible spots
* Make field `final`
This commit is contained in:
Armin Braun 2019-03-05 15:04:16 +01:00 committed by GitHub
parent 5cdea6ef17
commit 750ec8ba53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/main/java/org/elasticsearch/search/query/QueryPhase.java
View File

@ -40,7 +40,6 @@ import org.apache.lucene.search.TotalHits;
import org.elasticsearch.action.search.SearchTask; import org.elasticsearch.action.search.SearchTask;
import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.lucene.Lucene;
import org.elasticsearch.common.lucene.search.TopDocsAndMaxScore; import org.elasticsearch.common.lucene.search.TopDocsAndMaxScore;
import org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor;
import org.elasticsearch.common.util.concurrent.QueueResizingEsThreadPoolExecutor; import org.elasticsearch.common.util.concurrent.QueueResizingEsThreadPoolExecutor;
import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.DocValueFormat;
import org.elasticsearch.search.SearchPhase; import org.elasticsearch.search.SearchPhase;
@ -59,6 +58,7 @@ import org.elasticsearch.tasks.TaskCancelledException;
import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPool;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.concurrent.ExecutorService;
import java.util.function.Consumer; import java.util.function.Consumer;
import static org.elasticsearch.search.query.QueryCollectorContext.createCancellableCollectorContext; import static org.elasticsearch.search.query.QueryCollectorContext.createCancellableCollectorContext;
@ -78,7 +78,7 @@ public class QueryPhase implements SearchPhase {
private final AggregationPhase aggregationPhase; private final AggregationPhase aggregationPhase;
private final SuggestPhase suggestPhase; private final SuggestPhase suggestPhase;
private RescorePhase rescorePhase; private final RescorePhase rescorePhase;
public QueryPhase() { public QueryPhase() {
this.aggregationPhase = new AggregationPhase(); this.aggregationPhase = new AggregationPhase();
@ -157,11 +157,10 @@ public class QueryPhase implements SearchPhase {
// now this gets interesting: since we sort in index-order, we can directly // now this gets interesting: since we sort in index-order, we can directly
// skip to the desired doc // skip to the desired doc
if (after != null) { if (after != null) {
BooleanQuery bq = new BooleanQuery.Builder() query = new BooleanQuery.Builder()
.add(query, BooleanClause.Occur.MUST) .add(query, BooleanClause.Occur.MUST)
.add(new MinDocQuery(after.doc + 1), BooleanClause.Occur.FILTER) .add(new MinDocQuery(after.doc + 1), BooleanClause.Occur.FILTER)
.build(); .build();
query = bq;
} }
// ... and stop collecting after ${size} matches // ... and stop collecting after ${size} matches
searchContext.terminateAfter(searchContext.size()); searchContext.terminateAfter(searchContext.size());
@ -169,11 +168,10 @@ public class QueryPhase implements SearchPhase {
// now this gets interesting: since the search sort is a prefix of the index sort, we can directly // now this gets interesting: since the search sort is a prefix of the index sort, we can directly
// skip to the desired doc // skip to the desired doc
if (after != null) { if (after != null) {
BooleanQuery bq = new BooleanQuery.Builder() query = new BooleanQuery.Builder()
.add(query, BooleanClause.Occur.MUST) .add(query, BooleanClause.Occur.MUST)
.add(new SearchAfterSortedDocQuery(searchContext.sort().sort, (FieldDoc) after), BooleanClause.Occur.FILTER) .add(new SearchAfterSortedDocQuery(searchContext.sort().sort, (FieldDoc) after), BooleanClause.Occur.FILTER)
.build(); .build();
query = bq;
} }
} }
} }
@ -289,8 +287,7 @@ public class QueryPhase implements SearchPhase {
for (QueryCollectorContext ctx : collectors) { for (QueryCollectorContext ctx : collectors) {
ctx.postProcess(result); ctx.postProcess(result);
} }
EsThreadPoolExecutor executor = (EsThreadPoolExecutor) ExecutorService executor = searchContext.indexShard().getThreadPool().executor(ThreadPool.Names.SEARCH);
searchContext.indexShard().getThreadPool().executor(ThreadPool.Names.SEARCH);
if (executor instanceof QueueResizingEsThreadPoolExecutor) { if (executor instanceof QueueResizingEsThreadPoolExecutor) {
QueueResizingEsThreadPoolExecutor rExecutor = (QueueResizingEsThreadPoolExecutor) executor; QueueResizingEsThreadPoolExecutor rExecutor = (QueueResizingEsThreadPoolExecutor) executor;
queryResult.nodeQueueSize(rExecutor.getCurrentQueueSize()); queryResult.nodeQueueSize(rExecutor.getCurrentQueueSize());
@ -311,7 +308,7 @@ public class QueryPhase implements SearchPhase {
* @param query The query to execute * @param query The query to execute
* @param sf The query sort * @param sf The query sort
*/ */
static boolean returnsDocsInOrder(Query query, SortAndFormats sf) { private static boolean returnsDocsInOrder(Query query, SortAndFormats sf) {
if (sf == null || Sort.RELEVANCE.equals(sf.sort)) { if (sf == null || Sort.RELEVANCE.equals(sf.sort)) {
// sort by score // sort by score
// queries that return constant scores will return docs in index // queries that return constant scores will return docs in index
@ -327,7 +324,7 @@ public class QueryPhase implements SearchPhase {
* Returns whether collection within the provided <code>reader</code> can be early-terminated if it sorts * Returns whether collection within the provided <code>reader</code> can be early-terminated if it sorts
* with <code>sortAndFormats</code>. * with <code>sortAndFormats</code>.
**/ **/
static boolean canEarlyTerminate(IndexReader reader, SortAndFormats sortAndFormats) { private static boolean canEarlyTerminate(IndexReader reader, SortAndFormats sortAndFormats) {
if (sortAndFormats == null || sortAndFormats.sort == null) { if (sortAndFormats == null || sortAndFormats.sort == null) {
return false; return false;
} }