Refactor: Aggs use NOOP leaf collector (backport of #70320) #70419
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
Before this commit, if an aggregator didn't have anything to do in `AggregatorBase#getLeafCollector` it was obligated to throw `CollectionTerminatedException` if there wasn't a parent aggregator, otherwise it was obligated to return `LeafBucketCollector.NOOP`. This seems like something aggregators shouldn't have to do. So this commit changes `getLeafCollector` so aggregators are obligated to return `LeafBucketCollector.NOOP` if they have no work to do. The aggregation framework will throw the exception if its appropriate. Otherwise it'll use the `NOOP` collector. If they have work to do the `LeafBucketCollector`s that they do return may still throw `CollectionTerminatedException` to signal that they are done with the leaf.
|
@elasticmachine, test this please |
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.
Before this commit, if an aggregator didn't have anything to do in
AggregatorBase#getLeafCollectorit was obligated to throwCollectionTerminatedExceptionif there wasn't a parent aggregator,otherwise it was obligated to return
LeafBucketCollector.NOOP. Thisseems like something aggregators shouldn't have to do. So this commit
changes
getLeafCollectorso aggregators are obligated to returnLeafBucketCollector.NOOPif they have no work to do. The aggregationframework will throw the exception if its appropriate. Otherwise it'll
use the
NOOPcollector. If they have work to do theLeafBucketCollectors that they do return may still throwCollectionTerminatedExceptionto signal that they are done with theleaf.