-
Notifications
You must be signed in to change notification settings - Fork 125
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
Support filter and nested field in faiss engine radial search #1652
Support filter and nested field in faiss engine radial search #1652
Conversation
ae39f5a
to
28076de
Compare
@junqiu-lei For this patch, did we create a PR in faiss to upstream it? |
@jmazanec15 No, I mainly just followed the existing patch for search function https://github.com/opensearch-project/k-NN/blame/main/jni/patches/faiss/0001-Custom-patch-to-support-multi-vector.patch#L136-L158 |
faa45df
to
5931e82
Compare
src/main/java/org/opensearch/knn/index/query/KNNQueryBuilder.java
Outdated
Show resolved
Hide resolved
@junqiu-lei one minor comment but other than that it looks good |
Signed-off-by: Junqiu Lei <[email protected]>
Signed-off-by: Junqiu Lei <[email protected]>
Signed-off-by: Junqiu Lei <[email protected]>
5931e82
to
2080b8f
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please check this commit for the patch updated code. CC: @navneet1v
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, thanks
The backport to
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
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1652-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0cb4f36b0d3264f984258a5bff50c7f12448dacb
# Push it to GitHub
git push --set-upstream origin backport/backport-1652-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
…arch-project#1652) * Support filter and nested field in faiss engine radial search Signed-off-by: Junqiu Lei <[email protected]> (cherry picked from commit 0cb4f36) Signed-off-by: Junqiu Lei <[email protected]>
…search-project#1652) * Use 0.95 as default ratio for lucene radial search traversal similarity (opensearch-project#1619) Signed-off-by: Junqiu Lei <[email protected]>
… (#1658) * Use 0.95 as default ratio for lucene radial search traversal similarity (#1619) Signed-off-by: Junqiu Lei <[email protected]>
Description
This PR will allow user to use filter and nested field in faiss engine radial search by reusing existing logics from top-k search.
Issues Resolved
Part of #814
Check List
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.