Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] Unify precomputation of aggregations behind a common API #17197

Merged
merged 1 commit into from
Jan 30, 2025

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 2847695 from #16733.

* Unify precomputation of aggregations behind a common API

We've had a series of aggregation speedups that use the same strategy:
instead of iterating through documents that match the query
one-by-one, we can look at a Lucene segment and compute the
aggregation directly (if some particular conditions are met).

In every case, we've hooked that into custom logic hijacks the
getLeafCollector method and throws CollectionTerminatedException. This
creates the illusion that we're implementing a custom LeafCollector,
when really we're not collecting at all (which is the whole point).

With this refactoring, the mechanism (hijacking getLeafCollector) is
moved into AggregatorBase. Aggregators that have a strategy to
precompute their answer can override tryPrecomputeAggregationForLeaf,
which is expected to return true if they managed to precompute.

This should also make it easier to keep track of which aggregations
have precomputation approaches (since they override this method).

Signed-off-by: Michael Froh <[email protected]>

* Remove subaggregator check from CompositeAggregator

Not sure why I added this, when the existing implementation didn't have it.

That said, we *should* call finishLeaf() before precomputing the current leaf.

Signed-off-by: Michael Froh <[email protected]>

* Resolve conflicts with star-tree changes

Signed-off-by: Michael Froh <[email protected]>

* Skip precomputation when valuesSource is null

Signed-off-by: Michael Froh <[email protected]>

* Add comment as suggested by @bowenlan-amzn

Signed-off-by: Michael Froh <[email protected]>

---------

Signed-off-by: Michael Froh <[email protected]>
(cherry picked from commit 2847695)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Copy link
Contributor

❕ Gradle check result for a751d6d: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link

codecov bot commented Jan 30, 2025

Codecov Report

Attention: Patch coverage is 83.33333% with 13 lines in your changes missing coverage. Please review.

Project coverage is 72.00%. Comparing base (2187369) to head (a751d6d).
Report is 6 commits behind head on 2.x.

Files with missing lines Patch % Lines
...rch/search/aggregations/metrics/MinAggregator.java 60.00% 2 Missing and 2 partials ⚠️
...rch/aggregations/metrics/ValueCountAggregator.java 66.66% 2 Missing and 1 partial ⚠️
...ket/terms/GlobalOrdinalsStringTermsAggregator.java 89.47% 1 Missing and 1 partial ⚠️
...rch/search/aggregations/metrics/MaxAggregator.java 80.00% 1 Missing and 1 partial ⚠️
...rch/search/aggregations/metrics/AvgAggregator.java 85.71% 1 Missing ⚠️
...rch/search/aggregations/metrics/SumAggregator.java 87.50% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #17197      +/-   ##
============================================
+ Coverage     71.98%   72.00%   +0.02%     
+ Complexity    65987    65982       -5     
============================================
  Files          5341     5341              
  Lines        307114   307152      +38     
  Branches      44824    44822       -2     
============================================
+ Hits         221068   221171     +103     
+ Misses        67608    67576      -32     
+ Partials      18438    18405      -33     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@msfroh msfroh merged commit a24646c into 2.x Jan 30, 2025
69 of 71 checks passed
@github-actions github-actions bot deleted the backport/backport-16733-to-2.x branch January 30, 2025 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants