Move top-level pipeline aggs out of QuerySearchResult#40319
Merged
javanna merged 9 commits intoelastic:masterfrom Mar 28, 2019
Merged
Conversation
As part of elastic#40177 we have added top-level pipeline aggs to `InternalAggregations`. Given that `QuerySearchResult` holds an `InternalAggregations` instance, there is no need to keep on setting top-level pipeline aggs separately. Top-level pipeline aggs can then always be transported through `InternalAggregations`. Such change is made in a backwards compatible manner.
Collaborator
|
Pinging @elastic/es-analytics-geo |
Contributor
Author
|
run elasticsearch-ci/bwc |
Contributor
Author
|
run elasticsearch-ci/default-distro |
jimczi
requested changes
Mar 22, 2019
| pipelineAggregators = in.readNamedWriteableList(PipelineAggregator.class).stream().map(a -> (SiblingPipelineAggregator) a) | ||
| .collect(Collectors.toList()); | ||
| //TODO update version after backport | ||
| if (in.getVersion().before(Version.V_8_0_0)) { |
Contributor
There was a problem hiding this comment.
I think you need to check if hasAggs is true here because aggregations can be null.
| //TODO update version after backport | ||
| if (in.getVersion().before(Version.V_8_0_0)) { | ||
| List<SiblingPipelineAggregator> pipelineAggregators = in.readNamedWriteableList(PipelineAggregator.class).stream() | ||
| .map(a -> (SiblingPipelineAggregator) a).collect(Collectors.toList()); |
Contributor
There was a problem hiding this comment.
Can we skip the rewriting if siblings are empty ?
Contributor
Author
|
run elasticsearch-ci/2 |
Contributor
Author
|
@jimczi thanks for your comments, I addressed them, this should be good to go. |
jimczi
approved these changes
Mar 27, 2019
Contributor
Author
|
run elasticsearch-ci/2 |
Contributor
Author
|
run elasticsearch-ci/packaging-sample |
Contributor
Author
|
run elasticsearch-ci/2 |
jasontedor
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Mar 28, 2019
* master: (25 commits) [DOCS] Correct keystore commands for Email and Jira actions in Watcher (elastic#40417) [DOCS] Document common settings for snapshot repository plugins (elastic#40475) Remove with(out)-system-key tests (elastic#40547) Geo Point parse error fix (elastic#40447) Handle null retention leases in WaitForNoFollowersStep (elastic#40477) [DOCS] Adds anchors for ruby client (elastic#39867) Mute DataFrameAuditorIT#testAuditorWritesAudits Disable integTest when Docker is not available (elastic#40585) Add randomScore function in script_score query (elastic#40186) Test fixtures krb5 (elastic#40297) Correct ILM metadata minimum compatibility version (elastic#40569) SQL: Centralize SQL test dependencies version handling (elastic#40551) Mute testTracerLog Mute testHttpInput Include functions' aliases in the list of functions (elastic#40584) Optimise rejection of out-of-range `long` values (elastic#40325) Add docs for cluster.remote.*.proxy setting (elastic#40281) Migrate systemd packaging tests from bats to java (elastic#39954) Move top-level pipeline aggs out of QuerySearchResult (elastic#40319) Use openjdk 12 in packer cache script (elastic#40498) ...
javanna
added a commit
to javanna/elasticsearch
that referenced
this pull request
Mar 29, 2019
As part of elastic#40177 we have added top-level pipeline aggs to `InternalAggregations`. Given that `QuerySearchResult` holds an `InternalAggregations` instance, there is no need to keep on setting top-level pipeline aggs separately. Top-level pipeline aggs can then always be transported through `InternalAggregations`. Such change is made in a backwards compatible manner.
javanna
added a commit
that referenced
this pull request
Mar 29, 2019
As part of #40177 we have added top-level pipeline aggs to `InternalAggregations`. Given that `QuerySearchResult` holds an `InternalAggregations` instance, there is no need to keep on setting top-level pipeline aggs separately. Top-level pipeline aggs can then always be transported through `InternalAggregations`. Such change is made in a backwards compatible manner.
javanna
added a commit
to javanna/elasticsearch
that referenced
this pull request
Mar 29, 2019
javanna
added a commit
that referenced
this pull request
Apr 1, 2019
gurkankaymak
pushed a commit
to gurkankaymak/elasticsearch
that referenced
this pull request
May 27, 2019
37 tasks
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.
As part of #40177 we have added top-level pipeline aggs to
InternalAggregations. Given thatQuerySearchResultholds anInternalAggregationsinstance, there is no need to keep on settingtop-level pipeline aggs separately. Top-level pipeline aggs can then
always be transported through
InternalAggregations. Such change ismade in a backwards compatible manner.