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 queries losing inherited data when toBuilder is called. #1181

Merged
merged 3 commits into from
Sep 4, 2024

Conversation

PiSoup
Copy link
Contributor

@PiSoup PiSoup commented Sep 3, 2024

Description

Calling toBuilder on classes which implement QueryBase will now preserve boost and queryName.

Issues Resolved

Fixes #1172

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.

CHANGELOG.md Show resolved Hide resolved
Copy link
Collaborator

@Xtansia Xtansia left a comment

Choose a reason for hiding this comment

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

@PiSoup Changes look great thanks! Could you please just fix your DCO signoff on your two most recent commits? Should be able to do it via git rebase --signoff HEAD~3

@Xtansia
Copy link
Collaborator

Xtansia commented Sep 3, 2024

@PiSoup Unfortunately DCO is still unhappy as your commit author email is different to the email that signs off the commits:
Screenshot 2024-09-04 at 11 09 43 AM

Calling `toBuilder` on classes which implement `QueryBase` will now preserve `boost` and `queryName`.

Signed-off-by: Chris Danisch <lily.danisch@gmail.com>
Signed-off-by: Chris Danisch <lily.danisch@gmail.com>
Signed-off-by: Chris Danisch <lily.danisch@gmail.com>
@PiSoup
Copy link
Contributor Author

PiSoup commented Sep 4, 2024

@PiSoup Unfortunately DCO is still unhappy as your commit author email is different to the email that signs off the commits: Screenshot 2024-09-04 at 11 09 43 AM

Oh for Pete's sake. Third time's the charm hopefully.

@Xtansia Xtansia merged commit 020e0b0 into opensearch-project:main Sep 4, 2024
56 checks passed
@Xtansia
Copy link
Collaborator

Xtansia commented Sep 4, 2024

@PiSoup Thanks for sticking with it despite the pain 😅

@Xtansia Xtansia added the backport 2.x Backport to 2.x branch label Sep 4, 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:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1181-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 020e0b053cb0d33ec44a8692a3ae558178ecc160
# Push it to GitHub
git push --set-upstream origin backport/backport-1181-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

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

Xtansia pushed a commit to Xtansia/opensearch-java that referenced this pull request Sep 4, 2024
…ch-project#1181)

* Fixes opensearch-project#1172

Calling `toBuilder` on classes which implement `QueryBase` will now preserve `boost` and `queryName`.

Signed-off-by: Chris Danisch <lily.danisch@gmail.com>

* Updated changelog

Signed-off-by: Chris Danisch <lily.danisch@gmail.com>

* Added toBuilder to QueryBase instead.

Signed-off-by: Chris Danisch <lily.danisch@gmail.com>

---------

Signed-off-by: Chris Danisch <lily.danisch@gmail.com>
(cherry picked from commit 020e0b0)
Xtansia pushed a commit to Xtansia/opensearch-java that referenced this pull request Sep 4, 2024
…ch-project#1181)

* Fixes opensearch-project#1172

Calling `toBuilder` on classes which implement `QueryBase` will now preserve `boost` and `queryName`.

Signed-off-by: Chris Danisch <lily.danisch@gmail.com>

* Updated changelog

Signed-off-by: Chris Danisch <lily.danisch@gmail.com>

* Added toBuilder to QueryBase instead.

Signed-off-by: Chris Danisch <lily.danisch@gmail.com>

---------

Signed-off-by: Chris Danisch <lily.danisch@gmail.com>
(cherry picked from commit 020e0b0)
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
dblock pushed a commit that referenced this pull request Sep 5, 2024
…1184)

* Fixes #1172

Calling `toBuilder` on classes which implement `QueryBase` will now preserve `boost` and `queryName`.



* Updated changelog



* Added toBuilder to QueryBase instead.



---------


(cherry picked from commit 020e0b0)

Signed-off-by: Chris Danisch <lily.danisch@gmail.com>
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
Co-authored-by: Chris Danisch <PiSoup@users.noreply.github.com>
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] When Query Types That Extend QueryBase Are Converted To Builders Inherited Data Is Lost
4 participants