Fixup rare terms #64366
Merged
Fixup rare terms #64366
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
In elastic#64016 I caused a bug in rare_terms where we would rewrite the current leaf and remove all hits from it, causing us to trip an assertion. This didn't happen before because previously we never rewrote the current leaf. The fix involves cleaning up the state that the deferring collector uses if we end up removing all hits. This requires some super intimate knowledge of how `BestBucketsDeferringCollector` works so I decided to move the implementation of that mergin from `MergingBucketsDeferringCollector` into `BestBucketsDeferringCollector`. This means that `MergingBucketsDeferringCollector` is pretty much empty now. So I've deprecated it and will remove it entirely in an subsequent change. Closes elastic#64356
not-napoleon
approved these changes
Oct 29, 2020
|
|
||
| /** | ||
| * Build the {@link DeferringBucketCollector}. The default implementation | ||
| * selects the best buckets but some aggs want to do something else. |
There was a problem hiding this comment.
I know you just transcribed this from the old comment, but it might be nice to define "best" here. Like what criteria it uses.
|
I believe this PR needs to be backported. The same failure is still happening with branch 7.x: https://gradle-enterprise.elastic.co/s/ywuksrllpmfie |
|
Another one (7.x) and this time is for |
|
One more in 7.x: |
nik9000
added a commit
to nik9000/elasticsearch
that referenced
this pull request
Oct 30, 2020
In elastic#64016 I caused a bug in rare_terms where we would rewrite the current leaf and remove all hits from it, causing us to trip an assertion. This didn't happen before because previously we never rewrote the current leaf. The fix involves cleaning up the state that the deferring collector uses if we end up removing all hits. This requires some super intimate knowledge of how `BestBucketsDeferringCollector` works so I decided to move the implementation of that mergin from `MergingBucketsDeferringCollector` into `BestBucketsDeferringCollector`. This means that `MergingBucketsDeferringCollector` is pretty much empty now. So I've deprecated it and will remove it entirely in an subsequent change. Closes elastic#64356
|
Pinging @elastic/es-analytics-geo (:Analytics/Aggregations) |
elasticmachine
added
the
Team:Analytics
|
Sorry I hadn't opened the backport yesterday! I've just opened it and will merge when jenkins is happy. |
nik9000
added a commit
that referenced
this pull request
Oct 30, 2020
In #64016 I caused a bug in rare_terms where we would rewrite the current leaf and remove all hits from it, causing us to trip an assertion. This didn't happen before because previously we never rewrote the current leaf. The fix involves cleaning up the state that the deferring collector uses if we end up removing all hits. This requires some super intimate knowledge of how `BestBucketsDeferringCollector` works so I decided to move the implementation of that mergin from `MergingBucketsDeferringCollector` into `BestBucketsDeferringCollector`. This means that `MergingBucketsDeferringCollector` is pretty much empty now. So I've deprecated it and will remove it entirely in an subsequent change. Closes #64356
nik9000
added a commit
to nik9000/elasticsearch
that referenced
this pull request
Nov 9, 2020
Removes `MergingBucketsDeferringCollector` which I deprecated in elastic#64366.
nik9000
added a commit
that referenced
this pull request
Nov 11, 2020
Removes `MergingBucketsDeferringCollector` which I deprecated in #64366.
nik9000
added a commit
to nik9000/elasticsearch
that referenced
this pull request
Nov 11, 2020
Removes `MergingBucketsDeferringCollector` which I deprecated in elastic#64366.
nik9000
added a commit
that referenced
this pull request
Nov 11, 2020
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.
In #64016 I caused a bug in rare_terms where we would rewrite the
current leaf and remove all hits from it, causing us to trip an
assertion. This didn't happen before because previously we never rewrote
the current leaf. The fix involves cleaning up the state that the
deferring collector uses if we end up removing all hits.
This requires some super intimate knowledge of how
BestBucketsDeferringCollectorworks so I decided to move theimplementation of that mergin from
MergingBucketsDeferringCollectorinto
BestBucketsDeferringCollector. This means thatMergingBucketsDeferringCollectoris pretty much empty now. So I'vedeprecated it and will remove it entirely in an subsequent change.
Closes #64356