Refactoring of Aggregations #14136
Merged
Refactoring of Aggregations #14136
Conversation
This file contains 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
colings86
added
>enhancement
review
WIP
:Analytics/Aggregations
| @@ -150,15 +144,29 @@ public Builder addPipelineAggregator(PipelineAggregatorFactory pipelineAggregato | |||
| return this; | |||
| } | |||
|
|
|||
| /** | |||
| * FOR TESTING ONLY | |||
There was a problem hiding this comment.
can it be pkg-private then?
|
Things look good. Can you just explain why we need this new "init" phase? |
colings86
force-pushed
the
feature/aggs-refactoring
branch
9 times, most recently
from
fe4875b
to
62c387f
Compare
|
@jpountz I pushed a some updates. could you re-review? As to the "init" phase, this is needed to be able to run things that used to be done in the constructor but now can't be because:
I thought it was neater to have an "init" phase than to duplicate calls to initialise in the different create() methods |
colings86
force-pushed
the
feature/aggs-refactoring
branch
3 times, most recently
from
4a4be91
to
4ffd006
Compare
# Conflicts: # core/src/main/java/org/elasticsearch/percolator/PercolateContext.java # core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterParser.java # core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersParser.java # core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsParametersParser.java # core/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java # core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java # test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java
…om createInternal() parameters
Also renames all the implementations appropriately
# Conflicts: # core/src/main/java/org/elasticsearch/search/SearchService.java # test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java
| @@ -51,7 +52,8 @@ | |||
| private List<SortBuilder> sorts; | |||
| private Boolean trackScores; | |||
| private HighlightBuilder highlightBuilder; | |||
| private List<AbstractAggregationBuilder> aggregations; | |||
| private List<AggregatorBuilder<?>> aggregationFactorys; | |||
|
I gave a quick look and could spot a few indentation and naming inconsistencies. Otherwise it looks good! |
# Conflicts: # core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java
clintongormley
added
:Search/Search
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.
This PR refactors all aggregations to be able to be parsed on the coordinating node and serialised as Objects to the shards.