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

Make MultiSearchItem.status optional #660

Merged
merged 4 commits into from
Oct 12, 2023

Conversation

Xtansia
Copy link
Collaborator

@Xtansia Xtansia commented Oct 11, 2023

Description

Make MultiSearchItem.status optional as it is returned by regular msearch requests but not in msearchTemplate requests.

Issues Resolved

Fixes #520

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.

var index = "test-msearch-template";
createDocuments(index);

var searchResponse = javaClient().msearchTemplate(
Copy link
Collaborator

Choose a reason for hiding this comment

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

If a multi search template example is not present, it would be great to add it to the guides and working samples.

@dblock dblock merged commit d2916e4 into opensearch-project:main Oct 12, 2023
39 checks passed
@VachaShah VachaShah added the backport 2.x Backport to 2.x branch label Oct 12, 2023
@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-660-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d2916e42f7c1af931192bb48a6079948d6af1535
# Push it to GitHub
git push --set-upstream origin backport/backport-660-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-660-to-2.x.

@Xtansia Xtansia deleted the fix/msearch-template branch October 12, 2023 21:05
Xtansia added a commit to Xtansia/opensearch-java that referenced this pull request Oct 12, 2023
* Add failing msearchTemplate integration test

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

* Make `MultiSearchItem.status` optional

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

* Add changelog entry

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

* spotlessApply

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

---------

Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit d2916e4)
VachaShah pushed a commit that referenced this pull request Oct 12, 2023
* Add failing msearchTemplate integration test

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

* Make `MultiSearchItem.status` optional

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

* Add changelog entry

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

* spotlessApply

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

---------

Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit d2916e4)
@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
3 participants