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 missing properties on UpdateOperation #748

Merged
merged 5 commits into from
Nov 29, 2023

Conversation

fs-chris
Copy link
Contributor

@fs-chris fs-chris commented Nov 28, 2023

Description

Adds missing properties scriptedUpsert and detectNoop to UpdateOperation

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.

Copy link
Member

@dblock dblock left a comment

Choose a reason for hiding this comment

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

Thanks! This will need tests to get merged, please? Also amend your commits with -s for DCO to pass.

Signed-off-by: Christian Winkler <cwinkler@integrationmatters.com>
Signed-off-by: Christian Winkler <cwinkler@integrationmatters.com>
Signed-off-by: Christian Winkler <cwinkler@integrationmatters.com>
Signed-off-by: Christian Winkler <cwinkler@integrationmatters.com
Signed-off-by: Christian Winkler <cwinkler@integrationmatters.com>
Signed-off-by: Christian Winkler <cwinkler@integrationmatters.com
Signed-off-by: Christian Winkler <cwinkler@integrationmatters.com>
@fs-chris
Copy link
Contributor Author

The DCO thing is really a pain.
I hope that all requirements are met now.
If not, feel free to discard this PR and manually merge the changes into an own one.

@dblock
Copy link
Member

dblock commented Nov 29, 2023

The DCO thing is really a pain.

Yeah you get used to it :) It's really a small price to pay to make non-Engineers happy.

Copy link
Member

@dblock dblock left a comment

Choose a reason for hiding this comment

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

Thanks for hanging out with us @fs-chris!

@dblock dblock merged commit f46b347 into opensearch-project:2.8.1 Nov 29, 2023
26 checks passed
@dblock
Copy link
Member

dblock commented Nov 29, 2023

Oh crap I hit merge but just realized this PR was made into the 2.8.1 branch :( That wasn't supposed to happen. I've reverted via a force push and opened #750 as a copy of this.

@dblock dblock mentioned this pull request Nov 29, 2023
@dblock
Copy link
Member

dblock commented Nov 29, 2023

@fs-chris You need to make this PR into main and then we can backport it onto 2.x for the next 2.x release.

@fs-chris
Copy link
Contributor Author

fs-chris commented Nov 30, 2023

@fs-chris You need to make this PR into main and then we can backport it onto 2.x for the next 2.x release.

I cannot use main since it no longer works with the RestClient which our product heavily depends on (for working around so many other flaws in the actual client API).

So, please, anyone else to do this in main?

Thanks...

@dblock
Copy link
Member

dblock commented Nov 30, 2023

@fs-chris I see. It's just about order of operations. Make the PR in main, then (we will) backport it into 2.x branch instead of 2.8.1. Without making a PR in main the fix will be gone from the next major release.

@dblock
Copy link
Member

dblock commented Nov 30, 2023

So, please, anyone else to do this in main?

Hope someone wants to pick this up. We definitely appreciate your work, and as much time as you're willing to spend on this bug!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bulk UpdateOperation misses upsert options
3 participants