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

Add support for phase_took & search_pipeline request params #1036

Merged
merged 1 commit into from
Jul 3, 2024

Conversation

dzane17
Copy link
Contributor

@dzane17 dzane17 commented Jun 20, 2024

Description

Add support for phase_took & search_pipeline request params to OpenSearch Java client

Ref in OpenSearch Core: RestSearchAction.java#L150-L227

Issues Resolved

Resolves #1025

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.

@dzane17 dzane17 force-pushed the phase-took branch 2 times, most recently from 6649a17 to de41971 Compare June 20, 2024 16:32
@dzane17 dzane17 marked this pull request as ready for review June 20, 2024 16:57
dblock
dblock previously requested changes Jun 21, 2024
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.

Looks good, needs tests please?

Signed-off-by: David Zane <davizane@amazon.com>
public void phaseTook() {
SearchRequest request = new SearchRequest.Builder().phaseTook(true).build();

assertEquals("{}", toJson(request));
Copy link
Member

@dblock dblock Jul 2, 2024

Choose a reason for hiding this comment

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

Shouldn't phase_took appear somewhere in the JSON?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

phase_took and pipeline are query parameters whereas search_after and ext are in the request body. I think that's what toJson is testing

@dblock
Copy link
Member

dblock commented Jul 2, 2024

@Xtansia care to take a look?

@Xtansia Xtansia requested a review from dblock July 2, 2024 23:43
@Xtansia
Copy link
Collaborator

Xtansia commented Jul 2, 2024

Looks correct to me

@Xtansia Xtansia dismissed dblock’s stale review July 3, 2024 00:07

Test have been added

@Xtansia Xtansia merged commit a8aa97b into opensearch-project:main Jul 3, 2024
56 checks passed
@dzane17 dzane17 deleted the phase-took branch July 3, 2024 00:13
@Xtansia Xtansia added the backport 2.x Backport to 2.x branch label Jul 3, 2024
@opensearch-trigger-bot
Copy link

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-1036-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a8aa97ba52090344c8fbbf0f5ebc33835dc1440b
# Push it to GitHub
git push --set-upstream origin backport/backport-1036-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-1036-to-2.x.

@Xtansia
Copy link
Collaborator

Xtansia commented Jul 3, 2024

@dzane17 Could you please follow the above instructions to backport this change into the 2.x branch?

dzane17 added a commit to dzane17/opensearch-java that referenced this pull request Jul 3, 2024
…ch-project#1036)

Signed-off-by: David Zane <davizane@amazon.com>
(cherry picked from commit a8aa97b)
@dzane17
Copy link
Contributor Author

dzane17 commented Jul 3, 2024

@Xtansia Done, created 2.x backport PR. Please review above. Thanks

Xtansia pushed a commit that referenced this pull request Jul 3, 2024
…1067)

Signed-off-by: David Zane <davizane@amazon.com>
(cherry picked from commit a8aa97b)
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.

[FEATURE] Search request params missing in Java client
3 participants