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

Fix serialization of nested aggregates under SingleBucketAggregateBase #1350

Merged

Conversation

Xtansia
Copy link
Collaborator

@Xtansia Xtansia commented Dec 11, 2024

Description

Fixes serialization of nested aggregates which are under aggregates which extend from SingleBucketAggregateBase.

Issues Resolved

Fixes #1349

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.

Signed-off-by: Thomas Farr <[email protected]>
@Xtansia Xtansia force-pushed the fix/filter-aggregate-nested-aggregates branch from 132c6a2 to d347bdd Compare December 11, 2024 01:15
Signed-off-by: Thomas Farr <[email protected]>
@dblock dblock merged commit 29381c0 into opensearch-project:main Dec 11, 2024
64 checks passed
@Xtansia Xtansia deleted the fix/filter-aggregate-nested-aggregates branch December 11, 2024 19:40
@Xtansia Xtansia added the backport 2.x Backport to 2.x branch label Dec 11, 2024
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/opensearch-java/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/opensearch-java/backport-2.x
# Create a new branch
git switch --create backport/backport-1350-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 29381c0f77f1a7d2dbd48b82d37d6e1cae5bf9d2
# Push it to GitHub
git push --set-upstream origin backport/backport-1350-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/opensearch-java/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1350-to-2.x.

Xtansia added a commit to Xtansia/opensearch-java that referenced this pull request Dec 11, 2024
…se` (opensearch-project#1350)

* Add failing test

Signed-off-by: Thomas Farr <[email protected]>

* Fix

Signed-off-by: Thomas Farr <[email protected]>

---------

Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit 29381c0)
Xtansia added a commit that referenced this pull request Dec 11, 2024
…se` (#1350) (#1352)

* Add failing test

Signed-off-by: Thomas Farr <[email protected]>

* Fix

Signed-off-by: Thomas Farr <[email protected]>

---------

Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit 29381c0)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Nested aggregation result is discarded from serialized SearchResponse
2 participants