Handle IndexOrDocValuesQuery in composite aggregation #35392
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The `composite` aggregation can optimize its execution when the query is a `match_all` or a `range` over the field that is used in the first source of the aggregation. However we only check for instances of `PointRangeQuery` whereas the range query builder creates an `IndexOrDocValuesQuery`. This means that today the optimization does not apply to `range` query even if the code could handle it. This change fixes this issue by extracting the index query inside `IndexOrDocValuesQuery`.
jimczi
added
>enhancement
:Analytics/Aggregations
|
Pinging @elastic/es-search-aggs |
cbuescher
reviewed
Nov 12, 2018
| @@ -178,8 +180,19 @@ public void collect(int doc, long bucket) throws IOException { | |||
| }; | |||
| } | |||
|
|
|||
| static Query extractQuery(Query query) { | |||
| if (query instanceof BoostQuery) { | |||
| return extractQuery(((BoostQuery) query).getQuery()); | |||
There was a problem hiding this comment.
Maybe its possible to cover this execution branch in the tests as well.
jimczi
added a commit
that referenced
this pull request
Nov 15, 2018
The `composite` aggregation can optimize its execution when the query is a `match_all` or a `range` over the field that is used in the first source of the aggregation. However we only check for instances of `PointRangeQuery` whereas the range query builder creates an `IndexOrDocValuesQuery`. This means that today the optimization does not apply to `range` query even if the code could handle it. This change fixes this issue by extracting the index query inside `IndexOrDocValuesQuery`.
jimczi
added a commit
that referenced
this pull request
Nov 15, 2018
The `composite` aggregation can optimize its execution when the query is a `match_all` or a `range` over the field that is used in the first source of the aggregation. However we only check for instances of `PointRangeQuery` whereas the range query builder creates an `IndexOrDocValuesQuery`. This means that today the optimization does not apply to `range` query even if the code could handle it. This change fixes this issue by extracting the index query inside `IndexOrDocValuesQuery`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
compositeaggregation can optimize its execution when the queryis a
match_allor arangeover the field that is used in the first sourceof the aggregation. However we only check for instances of
PointRangeQuerywhereasthe range query builder creates an
IndexOrDocValuesQuery. This means thattoday the optimization does not apply to
rangequery even if the code could handle it.This change fixes this issue by extracting the index query inside
IndexOrDocValuesQuery.