Adjusts Seeded knn searches to clean up user and internal interfaces #14170
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tteofili
approved these changes
Jan 28, 2025
cpoerschke
reviewed
Jan 29, 2025
Comment on lines
75
to
76
| this.delegate = knnQuery; | ||
| this.seedWeight = seedWeight; |
There was a problem hiding this comment.
minor/subjective: init order to match member declaration order
Suggested change
| this.delegate = knnQuery; | |
| this.seedWeight = seedWeight; | |
| this.seedWeight = seedWeight; | |
| this.delegate = knnQuery; |
cpoerschke
reviewed
Jan 29, 2025
| /** | ||
| * Iterator of valid entry points for the kNN search | ||
| * | ||
| * @return DocIdSetIterator of entry points, default is empty iterator |
There was a problem hiding this comment.
Suggested change
| * @return DocIdSetIterator of entry points, default is empty iterator | |
| * @return DocIdSetIterator of entry points |
cpoerschke
reviewed
Jan 29, 2025
| /** | ||
| * Number of valid entry points for the kNN search | ||
| * | ||
| * @return number of entry points, default is 0 |
There was a problem hiding this comment.
Suggested change
| * @return number of entry points, default is 0 | |
| * @return number of entry points |
cpoerschke
reviewed
Jan 29, 2025
| private final int[] seedOrds; | ||
|
|
||
| static SeededHnswGraphSearcher fromEntryPoints( | ||
| AbstractHnswGraphSearcher delegate, int numEps, DocIdSetIterator eps, HnswGraph graph) |
There was a problem hiding this comment.
maybe
Suggested change
| AbstractHnswGraphSearcher delegate, int numEps, DocIdSetIterator eps, HnswGraph graph) | |
| AbstractHnswGraphSearcher delegate, int numEps, DocIdSetIterator eps, int graphSize) |
cpoerschke
reviewed
Jan 29, 2025
Comment on lines
54
to
55
| * @param parentBitSet The leaf parent bitset | ||
| * @param searchStrategy The search strategy to use |
There was a problem hiding this comment.
Suggested change
| * @param parentBitSet The leaf parent bitset | |
| * @param searchStrategy The search strategy to use | |
| * @param searchStrategy The search strategy to use | |
| * @param parentBitSet The leaf parent bitset |
tteofili
approved these changes
Jan 30, 2025
benwtrent
added a commit
that referenced
this pull request
Feb 3, 2025
…14170) This is a bugfix and refactor for seeded knn searches. First, Since we are using collectors, we don't actually need unique queries for every input type. Consequently, I have collapsed the two individual seeded queries into a single query that delegates to a provided kNN query. Then the collector manager is simply wrapped, so that the entry points can be provided. Second, the interactions in the hnsw graph were not clear. Consequently, I did a minor refactor of HNSW searcher to have a "SeededSearcher", where instead of searching the graph for the entry points, it provides them directly. Third, instead of continually overloading collectors, I opted to add a new "searchstrategy" value to KnnCollector. This way various strategies can be executed with different options. I think Seeded could eventually be replaced with something.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a bugfix and refactor for seeded knn searches.
First, Since we are using collectors, we don't actually need unique queries for every input type. Consequently, I have collapsed the two individual seeded queries into a single query that delegates to a provided kNN query. Then the collector manager is simply wrapped, so that the entry points can be provided.
Second, the interactions in the hnsw graph were not clear. Consequently, I did a minor refactor of HNSW searcher to have a "SeededSearcher", where instead of searching the graph for the entry points, it provides them directly.
Third, instead of continually overloading collectors, I opted to add a new "searchstrategy" value to KnnCollector. This way various strategies can be executed with different options. I think
Seededcould eventually be replaced with something.