Repository navigation
Filtered search inside greedy search, with a two-heap search buffer - #456
Draft
yuejiaointel wants to merge 16 commits into
Draft
yuejiaointel wants to merge 16 commits into
yuejiaointel wants to merge 16 commits into
Conversation
Reuse the MutableBuffer valid/invalid mechanism: a FilteredValidBuilder marks an entry invalid if it is deleted or the predicate rejects its external id. New MutableVamanaIndex::search overload taking a predicate, padding rows with id -1 / +inf and returning per-query found counts. Supplement path checks the predicate before computing the distance. Orchestrator virtual appended last.
Replace the separate filtered search overload with two optional trailing arguments on MutableVamanaIndex::search (an id predicate and a per-query result count). Without a predicate the existing code path runs unchanged. check_and_supplement_search_buffer gets an optional predicate that is checked before the distance is computed. The filter predicate type is now a type-erased std::function, so FilteredValidBuilder is no longer a template. The orchestrator keeps one appended virtual that forwards to the index search.
The optional filter on MutableVamanaIndex::search now only chooses which builder the existing greedy search closure uses; both cases call the same per_thread_batch_search. FilteredValidBuilder derives from ValidBuilder. The buffer top-up in single_search applies the filter when the search closure carries one. The per-query result count out-parameter is removed (callers count non-padding ids). per_thread_batch_search now pads result rows with fewer than k entries (id size_t(-1), distance +inf) instead of reading past the end of the search buffer, and the post-search id translation skips the padding.
Give ValidBuilder an optional predicate and pass it down through internal_search_builder, greedy_search_closure and search() as optional arguments, instead of a separate builder and search path. Filtered-only checks: the supplement fallback skips failing ids, copy-out pads short rows with id -1 and the worst score, translation skips padded ids.
The orchestrator reports filtered search as unsupported for indexes whose search has no filter argument (the concurrent index), instead of failing to compile. In the filtered test, drop the unfiltered-padding section (padding is filtered-only) and add an inner-product case checking padding uses -inf.
Experiment: with a filter, MutableBuffer keeps a min-heap of entries to visit and a max-heap of the best valid entries during the search, instead of one sorted list. greedy_search is unchanged; cleanup() sorts the results once at the end.
ValidBuilder can be given the search buffer. With a filter, it first asks the buffer whether the entry would be dropped anyway (can_skip) and, if so, returns it as invalid without looking up the external id or calling the filter. Results are unchanged.
The filter skip in ValidBuilder asks can_skip; in heap mode the worst kept entry is not back().
This reverts commit 71e93e9.
… drop" This reverts commit dd7c723.
The existing [filtered] dynamic index test drives heap mode end to end.
ValidBuilder can be given the search buffer. With a filter, it first asks the buffer whether the entry would be dropped anyway (can_skip) and, if so, returns it as invalid without looking up the external id or calling the filter. Results are unchanged.
The filter skip in ValidBuilder asks can_skip; in heap mode the worst kept entry is not back().
yuejiaointel
changed the title
This was referenced Oct 27, 2026
In heap mode, MutableBuffer now calls the filter itself: a neighbor goes to the results heap only if it could improve the results and passes the filter. ValidBuilder is back to the main behaviour (deleted check only).
This branch has not been deployed
This file contains hidden or 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
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.
What this changes
ValidBuilderis unchanged.MutableBufferkeeps a min-heap of nodes to visit and a max-heap of the best passing nodes (the results), instead of one sorted list.greedy_search, and the batch iterator are unchanged.Difference from today's search buffer (sorted list)
MutableBufferkeeps one sorted array: each insert is a binary search plus a shift. The next node to visit is a pointer to the best unvisited entry, the worst kept entry is the last valid one, and a duplicate is found by scanning the entries with an equal distance.Files
include/svs/index/vamana/dynamic_search_buffer.h:MutableBuffergets an opt-in heap mode that takes the filter as a callable on internal ids.include/svs/index/vamana/dynamic_index.h:MutableVamanaIndex::searchtakes an optional filter; when given, it turns heap mode on.include/svs/index/vamana/extensions.h: the top-up step and result copy-out respect the filter and pad with the worst score when fewer than k pass.include/svs/orchestrators/dynamic_vamana.h: newfiltered_searchentry point on the dynamic Vamana orchestrator (appended last in the interface; uncompressed data only).bindings/c/src/filtered_search.hpp: the C API filtered search on a dynamic index now callsfiltered_search(search window = max(k, window)) and falls back to the batch-iterator loop when the data type does not support it.Tests
Existing tests.
Results
Not benchmarked yet for this version.
🤖 Generated with Claude Code