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.

Sign up for GitHub

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

Jump to bottom

Introduce execution hint for Cardinality aggregation #17301

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Introduce execution hint for Cardinality aggregation #17301

wants to merge 12 commits into from
+222 −8

Conversation

asimmahmood1
Copy link

Description

Introduce execution hint for Cardinality aggregation - Revive PR #15764

Related Issues

Resolves #15269

Check List

  • [x ] Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created,

Testing

Tested using big5 dataset, see #16837 (comment)

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.

@maitreya2954
Introduce execution hint for Cardinality aggregation
cabf900 
Signed-off-by: Siddharth Rayabharam <[email protected]>
@maitreya2954
Cleanup ExecutionMode enum declarations
0101e9f 
Signed-off-by: Siddharth Rayabharam <[email protected]>
@maitreya2954
Remove unwanted lines
6f7ba1d 
Signed-off-by: Siddharth Rayabharam <[email protected]>
@maitreya2954
toString overrided for ExecutionHint
fc14339 
Signed-off-by: Siddharth Rayabharam <[email protected]>
@maitreya2954
Testcases added for CardinalityAggregator execution hint
7bca633 
Signed-off-by: Siddharth Rayabharam <[email protected]>
@maitreya2954
Test case for invalid execution hint added
7e62f5d 
Signed-off-by: Siddharth Rayabharam <[email protected]>
@maitreya2954
Java tags added for ExecutionMode
521939a 
Signed-off-by: Siddharth Rayabharam <[email protected]>
@maitreya2954
Test method names corrected
0bd75bf 
Signed-off-by: Siddharth Rayabharam <[email protected]>
@maitreya2954
gradle format checks
fd02f7d 
Signed-off-by: Siddharth Rayabharam <[email protected]>
@maitreya2954
Forbidden Apis fixed
a6f3c65 
Signed-off-by: Siddharth Rayabharam <[email protected]>
@maitreya2954
Merge branch 'main' into cardinality_agg_collectors_hint
e205165
@github-actions github-actions bot added enhancement Enhancement or improvement to existing feature or request good first issue Good for newcomers Search:Aggregations labels Feb 7, 2025
cwperks
cwperks reviewed Feb 7, 2025
View reviewed changes
.../src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregationBuilder.java
@@ -125,6 +131,7 @@ protected void innerWriteTo(StreamOutput out) throws IOException {
if (hasPrecisionThreshold) {
out.writeLong(precisionThreshold);
}
out.writeOptionalString(executionHint);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When making ser/de changes there can be issues in mixed clusters (fe during B/G) if this object is serialized to an older node that doesn't understand the value. In such cases, the serialization logic can check the target version (example) to see if the target node is of an older version and exclude it from serialization.

Similarly when deserializing if the request is coming from an older node then if you try to read the value from the StreamInput it will fail.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good point, will update.

@asimmahmood1
Update Changelog
c582cdc 
* This PR is reviving opensearch-project#15764

Signed-off-by: Asim Mahmood <[email protected]>
cwperks
cwperks reviewed Feb 7, 2025
View reviewed changes
server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java
@@ -480,7 +486,7 @@ public void close() {
*
* @opensearch.internal
*/
private static class DirectCollector extends Collector {
public static class DirectCollector extends Collector {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can these be package-protected?

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 7, 2025

❌ Gradle check result for c582cdc: 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
Reviewers

@cwperks cwperks cwperks left review comments

@anasalkouz anasalkouz Awaiting requested review from anasalkouz anasalkouz is a code owner

@andrross andrross Awaiting requested review from andrross andrross is a code owner

@ashking94 ashking94 Awaiting requested review from ashking94 ashking94 is a code owner

@Bukhtawar Bukhtawar Awaiting requested review from Bukhtawar Bukhtawar is a code owner

@CEHENKLE CEHENKLE Awaiting requested review from CEHENKLE CEHENKLE is a code owner

@dblock dblock Awaiting requested review from dblock dblock is a code owner

@dbwiddis dbwiddis Awaiting requested review from dbwiddis dbwiddis is a code owner

@gbbafna gbbafna Awaiting requested review from gbbafna gbbafna is a code owner

@jed326 jed326 Awaiting requested review from jed326 jed326 is a code owner

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal kotwanikunal is a code owner

@mch2 mch2 Awaiting requested review from mch2 mch2 is a code owner

@msfroh msfroh Awaiting requested review from msfroh msfroh is a code owner

@nknize nknize Awaiting requested review from nknize nknize is a code owner

@owaiskazi19 owaiskazi19 Awaiting requested review from owaiskazi19 owaiskazi19 is a code owner

@reta reta Awaiting requested review from reta reta is a code owner

@Rishikesh1159 Rishikesh1159 Awaiting requested review from Rishikesh1159 Rishikesh1159 is a code owner

@sachinpkale sachinpkale Awaiting requested review from sachinpkale sachinpkale is a code owner

@saratvemulapalli saratvemulapalli Awaiting requested review from saratvemulapalli saratvemulapalli is a code owner

@shwetathareja shwetathareja Awaiting requested review from shwetathareja shwetathareja is a code owner

@sohami sohami Awaiting requested review from sohami sohami is a code owner

@VachaShah VachaShah Awaiting requested review from VachaShah VachaShah is a code owner

@jainankitk jainankitk Awaiting requested review from jainankitk jainankitk is a code owner

@linuxpi linuxpi Awaiting requested review from linuxpi linuxpi is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
enhancement Enhancement or improvement to existing feature or request good first issue Good for newcomers Search:Aggregations
Projects
None yet
Milestone
No milestone
3 participants
@asimmahmood1 @cwperks @maitreya2954