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

Implement SortOptionsVariant in FieldSort #1323

Conversation

suzuki764
Copy link
Contributor

Description

Implemented SortOptionsVariant in FieldSort to make it usable with SortOptionsBuilders.

Issues Resolved

Closes #1089

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: Kosuke Suzuki <[email protected]>
@@ -49,7 +49,7 @@
// typedef: _types.FieldSort

@JsonpDeserializable
public class FieldSort implements PlainJsonSerializable {
public class FieldSort implements SortOptionsVariant, PlainJsonSerializable {
Copy link
Collaborator

Choose a reason for hiding this comment

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

👍 looks like a miss, thanks @suzuki764 !

@reta reta merged commit f9540f7 into opensearch-project:main Nov 24, 2024
65 checks passed
@reta reta added the backport 2.x Backport to 2.x branch label Nov 24, 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-1323-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f9540f7829af91b740f6e67dc807a1df5d3ff497
# Push it to GitHub
git push --set-upstream origin backport/backport-1323-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-1323-to-2.x.

@reta
Copy link
Collaborator

reta commented Nov 24, 2024

@suzuki764 could you please backport to 2.x branch manually? thank you

suzuki764 added a commit to suzuki764/opensearch-java that referenced this pull request Nov 25, 2024
* Implement SortOptionsVariant in FieldSort

Signed-off-by: Kosuke Suzuki <[email protected]>

* Add change log

Signed-off-by: Kosuke Suzuki <[email protected]>

---------

Signed-off-by: Kosuke Suzuki <[email protected]>
(cherry picked from commit f9540f7)
suzuki764 added a commit to suzuki764/opensearch-java that referenced this pull request Nov 25, 2024
* Implement SortOptionsVariant in FieldSort

Signed-off-by: Kosuke Suzuki <[email protected]>

* Add change log

Signed-off-by: Kosuke Suzuki <[email protected]>

---------

Signed-off-by: Kosuke Suzuki <[email protected]>
(cherry picked from commit f9540f7)
@suzuki764
Copy link
Contributor Author

@reta
I have created a backport PR #1329. Please review it, thank you!

reta pushed a commit that referenced this pull request Nov 25, 2024
* Implement SortOptionsVariant in FieldSort

Signed-off-by: Kosuke Suzuki <[email protected]>

* Add change log

Signed-off-by: Kosuke Suzuki <[email protected]>

---------

Signed-off-by: Kosuke Suzuki <[email protected]>
(cherry picked from commit f9540f7)
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] FieldSort not implement SortOptionsVariant
2 participants