Replace the SearchContext with QueryShardContext when building aggregator factories#46527
Merged
jimczi merged 4 commits intoelastic:masterfrom Sep 11, 2019
Merged
Conversation
…ator factories This commit replaces the `SearchContext` with the `QueryShardContext` when building aggregator factories. Aggregator factories are part of the `SearchContext` so they shouldn't require a `SearchContext` to create them. The main changes here are the signatures of `AggregationBuilder#build` that now takes a `QueryShardContext` and `AggregatorFactory#createInternal` that passes the `SearchContext` to build the `Aggregator`. Relates elastic#46523
Collaborator
|
Pinging @elastic/es-analytics-geo |
8 tasks
javanna
approved these changes
Sep 10, 2019
Contributor
javanna
left a comment
There was a problem hiding this comment.
the idea makes sense to me, it is not trivial to follow all that happens in this PR due to its size. I trust you though :)
| final long absoluteStartMillis = System.currentTimeMillis(); | ||
| QueryShardContext context = | ||
| indexService.newQueryShardContext(0, indexReader, () -> absoluteStartMillis, null); | ||
| indexService.newQueryShardContext(0, searcher, () -> absoluteStartMillis, null); |
Contributor
There was a problem hiding this comment.
out of curiosity: was this change necessary?
Contributor
Author
There was a problem hiding this comment.
For simplicity the QueryShardContext should expose an IndexSearcher that is configured with the correct similarity, cache, ... I can make this change in a different pr if you like ?
Contributor
There was a problem hiding this comment.
it would be nice, unless that cause too much extra work on your end.
Contributor
Author
There was a problem hiding this comment.
I merged #46584 and incorporated the changes in this pr, can you take another look ?
Contributor
Author
|
run elasticsearch-ci/1 |
jimczi
added a commit
to jimczi/elasticsearch
that referenced
this pull request
Sep 11, 2019
This change adds an IndexSearcher and the node's BigArrays in the QueryShardContext. It's a spin off of elastic#46527 as this change is required to allow aggregation builder to solely use the query shard context. Relates elastic#46523
jimczi
added a commit
that referenced
this pull request
Sep 11, 2019
jimczi
added a commit
that referenced
this pull request
Sep 11, 2019
jimczi
added a commit
that referenced
this pull request
Sep 11, 2019
…ator factories (#46527) This commit replaces the `SearchContext` with the `QueryShardContext` when building aggregator factories. Aggregator factories are part of the `SearchContext` so they shouldn't require a `SearchContext` to create them. The main changes here are the signatures of `AggregationBuilder#build` that now takes a `QueryShardContext` and `AggregatorFactory#createInternal` that passes the `SearchContext` to build the `Aggregator`. Relates #46523
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This commit replaces the
SearchContextwith theQueryShardContextwhen building aggregator factories.Aggregator factories are part of the
SearchContextso they shouldn't require aSearchContextto create them.The main changes here are the signatures ofAggregationBuilder#buildthat now takes aQueryShardContextandAggregatorFactory#createInternalthat passes theSearchContextto build theAggregator.Relates #46523