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

[Backport 2.x] Added rescorer in hybrid query (#917) #924

Merged
merged 2 commits into from
Oct 4, 2024

Conversation

martin-gaievski
Copy link
Member

Manually backport 9f4a49a from #917

* Initial version for rescorer

Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit 9f4a49a)
Signed-off-by: Martin Gaievski <[email protected]>
@martin-gaievski martin-gaievski force-pushed the backport/backport-917-to-2.x branch from 54083ab to b7a9245 Compare October 4, 2024 03:27
Copy link
Member

@vibrantvarun vibrantvarun left a comment

Choose a reason for hiding this comment

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

BWC test looks good, just had a small comment.

…wc/HybridSearchWithRescoreIT.java


update pipeline name

Co-authored-by: Varun Jain <[email protected]>
Signed-off-by: Martin Gaievski <[email protected]>
Copy link
Member

@vibrantvarun vibrantvarun left a comment

Choose a reason for hiding this comment

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

LGTM, thanks

@martin-gaievski martin-gaievski merged commit fe50537 into 2.x Oct 4, 2024
125 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.17 failed:

The process '/usr/bin/git' failed with exit code 1

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.17 2.17
# Navigate to the new working tree
cd .worktrees/backport-2.17
# Create a new branch
git switch --create backport/backport-924-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fe50537712d80f71998b6223a195f38c9fe0498c
# Push it to GitHub
git push --set-upstream origin backport/backport-924-to-2.17
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.17

Then, create a pull request where the base branch is 2.17 and the compare/head branch is backport/backport-924-to-2.17.

martin-gaievski added a commit that referenced this pull request Oct 4, 2024
* Added rescorer in hybrid query (#917)

* Initial version for rescorer

Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit 9f4a49a)
Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit fe50537)
martin-gaievski added a commit to martin-gaievski/neural-search that referenced this pull request Oct 4, 2024
opensearch-project#924)

* Added rescorer in hybrid query (opensearch-project#917)

* Initial version for rescorer

Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit 9f4a49a)
Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit fe50537)
martin-gaievski added a commit that referenced this pull request Oct 4, 2024
* Added rescorer in hybrid query (#917)

* Initial version for rescorer

Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit 9f4a49a)
Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit fe50537)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants