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.19] Unify precomputation of aggregations behind a common API #17212

Merged
merged 1 commit into from
Jan 31, 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 <froh@amazon.com>

* 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 <froh@amazon.com>

* Resolve conflicts with star-tree changes

Signed-off-by: Michael Froh <froh@amazon.com>

* Skip precomputation when valuesSource is null

Signed-off-by: Michael Froh <froh@amazon.com>

* Add comment as suggested by @bowenlan-amzn

Signed-off-by: Michael Froh <froh@amazon.com>

---------

Signed-off-by: Michael Froh <froh@amazon.com>
(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 b2c377d: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Copy link
Contributor

✅ Gradle check result for b2c377d: SUCCESS

Copy link

codecov bot commented Jan 31, 2025

Codecov Report

Attention: Patch coverage is 82.05128% with 14 lines in your changes missing coverage. Please review.

Please upload report for BASE (2.19@56b5726). Learn more about missing BASE report.

Files with missing lines Patch % Lines
...rch/search/aggregations/metrics/MinAggregator.java 60.00% 2 Missing and 2 partials ⚠️
...ket/terms/GlobalOrdinalsStringTermsAggregator.java 84.21% 2 Missing and 1 partial ⚠️
...rch/aggregations/metrics/ValueCountAggregator.java 66.66% 2 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.19   #17212   +/-   ##
=======================================
  Coverage        ?   71.95%           
  Complexity      ?    65954           
=======================================
  Files           ?     5341           
  Lines           ?   307152           
  Branches        ?    44822           
=======================================
  Hits            ?   221024           
  Misses          ?    67698           
  Partials        ?    18430           

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip-changelog v2.19.0 Issues and PRs related to version 2.19.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants