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

Added scriptedUpsert and detectNoop options to UpdateOperation #856

Merged
merged 1 commit into from
Feb 20, 2024

Conversation

fs-chris
Copy link
Contributor

@fs-chris fs-chris commented Feb 20, 2024

Description

Adds missing properties scriptedUpsert and detectNoop to UpdateOperation

This is the same as #748 and #750
*** Please backport to 2.8 ***

Issues Resolved

Fixes #744

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: Christian Winkler <cwinkler@integrationmatters.com>
Copy link
Collaborator

@reta reta left a comment

Choose a reason for hiding this comment

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

Thanks a lot @fs-chris !

@VachaShah VachaShah merged commit 9aeff0c into opensearch-project:main Feb 20, 2024
58 checks passed
@VachaShah VachaShah added the backport 2.x Backport to 2.x branch label Feb 20, 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-856-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9aeff0c73f69c22d3c8c20d3b4b50b2877695b38
# Push it to GitHub
git push --set-upstream origin backport/backport-856-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-856-to-2.x.

@zjianyu21
Copy link

I tried to perform the same thing by cherry-picking fs-chris's changes onto mainline branch locally as in main...zjianyu21:opensearch-java:issue-750

But I'm not familiar with Github operations which took me a while to commit to the branch above. It seems that this change just got merged in this morning.

zjianyu21 pushed a commit to zjianyu21/opensearch-java that referenced this pull request Feb 20, 2024
…earch-project#856)

Signed-off-by: Christian Winkler <cwinkler@integrationmatters.com>
(cherry picked from commit 9aeff0c)
Signed-off-by: Jianyu Zuo <zjianyu@amazon.com>
VachaShah pushed a commit that referenced this pull request Feb 20, 2024
…#859)

(cherry picked from commit 9aeff0c)

Signed-off-by: Christian Winkler <cwinkler@integrationmatters.com>
Signed-off-by: Jianyu Zuo <zjianyu@amazon.com>
Co-authored-by: Christian Winkler <cwinkler@integrationmatters.com>
@BrendonFaleiro BrendonFaleiro mentioned this pull request Jun 21, 2024
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.

Bulk UpdateOperation misses upsert options
4 participants