Combining filter rewrite and skip list to optimize sub aggregation #19573
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
…ing sub aggregation Signed-off-by: Ankit Jain <[email protected]>
jainankitk
requested review from
a team,
Bukhtawar,
CEHENKLE,
Rishikesh1159,
anasalkouz,
andrross,
ashking94,
cwperks,
dbwiddis,
gbbafna,
jed326,
kotwanikunal,
mch2,
msfroh,
owaiskazi19,
reta,
sachinpkale,
saratvemulapalli,
shwetathareja and
sohami
as code owners
Signed-off-by: Ankit Jain <[email protected]>
jainankitk
changed the title
Signed-off-by: Ankit Jain <[email protected]>
Contributor
|
❌ Gradle check result for 82bc95d: 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? |
Signed-off-by: Ankit Jain <[email protected]>
Contributor
|
❌ Gradle check result for aff3dc6: 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? |
Signed-off-by: Ankit Jain <[email protected]>
Signed-off-by: Ankit Jain <[email protected]>
Contributor
|
❌ Gradle check result for eaf7e52: 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? |
Signed-off-by: Ankit Jain <[email protected]>
Contributor
Author
|
{"run-benchmark-test": "id_3"} |
Contributor
Author
|
{"run-benchmark-test": "id_12"} |
jainankitk
commented
Nov 14, 2025
Comment on lines
+109
to
+114
| LeafBucketCollector sub = null; | ||
| if (collectableSubAggregators instanceof BFSCollector bfsCollector) { | ||
| sub = bfsCollector.getBFSLeafCollector(leafCtx); | ||
| } else { | ||
| sub = collectableSubAggregators.getLeafCollector(leafCtx); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
imo, this should be the other way around. The sub collector should be able to check if the parent is implementation of BFSCollector. Maybe somehow know that the invocation is from SubAggRangeCollector ?
Contributor
There was a problem hiding this comment.
As per current API there's the called collector doesn't know who is calling, i.e. there is a parent but that will be RangeCollector and not SubAggRangeCollector. I could add some logic on RangeCollector to ask if its precompute path.
Another option is inspecting the stack trace, but feel even more hacky, especially since its all OS code.
Contributor
|
❌ Gradle check result for 7c05efe: 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? |
jainankitk
commented
Nov 14, 2025
...c/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java
Show resolved
Hide resolved
...c/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java
Show resolved
Hide resolved
Contributor
Author
|
{"run-benchmark-test": "id_12"} |
Contributor
|
The Jenkins job url is https://build.ci.opensearch.org/job/benchmark-pull-request/5064/ . Final results will be published once the job is completed. |
Collaborator
Benchmark ResultsBenchmark Results for Job: https://build.ci.opensearch.org/job/benchmark-pull-request/5064/
|
Collaborator
Benchmark Baseline Comparison ResultsBenchmark Results for Job: https://build.ci.opensearch.org/job/benchmark-compare/196/
|
Contributor
|
❌ Gradle check result for 1d97bee: 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? |
Contributor
|
❌ Gradle check result for d8448f5: 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? |
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.
Description
This change aims at optimizing the sub aggregation by leveraging multi range traversal for top level aggregation, and skip list for the sub aggregation.
I have copied over the
BitSetDocIdStreamclass in OpenSearch from Lucene for now as it is not public, but should look at eventually getting rid of it.Related Issues
Related to #17447, #19384
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.