-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Bypass HNSW graph building for tiny segments #14963
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
Draft
shubhamvishu
wants to merge
1
commit into
apache:main
Choose a base branch
from
shubhamvishu:tiny-segments
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -76,11 +76,14 @@ public final class Lucene99HnswVectorsReader extends KnnVectorsReader | |
private final FieldInfos fieldInfos; | ||
private final IntObjectHashMap<FieldEntry> fields; | ||
private final IndexInput vectorIndex; | ||
private final boolean bypassTinySegments; | ||
|
||
public Lucene99HnswVectorsReader(SegmentReadState state, FlatVectorsReader flatVectorsReader) | ||
public Lucene99HnswVectorsReader( | ||
SegmentReadState state, FlatVectorsReader flatVectorsReader, boolean bypassTinySegments) | ||
throws IOException { | ||
this.fields = new IntObjectHashMap<>(); | ||
this.flatVectorsReader = flatVectorsReader; | ||
this.bypassTinySegments = bypassTinySegments; | ||
this.fieldInfos = state.fieldInfos; | ||
String metaFileName = | ||
IndexFileNames.segmentFileName( | ||
|
@@ -122,12 +125,18 @@ public Lucene99HnswVectorsReader(SegmentReadState state, FlatVectorsReader flatV | |
} | ||
} | ||
|
||
public Lucene99HnswVectorsReader(SegmentReadState state, FlatVectorsReader flatVectorsReader) | ||
throws IOException { | ||
this(state, flatVectorsReader, false); | ||
} | ||
|
||
private Lucene99HnswVectorsReader( | ||
Lucene99HnswVectorsReader reader, FlatVectorsReader flatVectorsReader) { | ||
this.flatVectorsReader = flatVectorsReader; | ||
this.fieldInfos = reader.fieldInfos; | ||
this.fields = reader.fields; | ||
this.vectorIndex = reader.vectorIndex; | ||
this.bypassTinySegments = reader.bypassTinySegments; | ||
} | ||
|
||
@Override | ||
|
@@ -326,16 +335,19 @@ private void search( | |
final KnnCollector collector = | ||
new OrdinalTranslatedKnnCollector(knnCollector, scorer::ordToDoc); | ||
final Bits acceptedOrds = scorer.getAcceptOrds(acceptDocs); | ||
HnswGraph graph = getGraph(fieldEntry); | ||
boolean doHnsw = knnCollector.k() < scorer.maxOrd(); | ||
boolean doHnsw = | ||
knnCollector.k() < scorer.maxOrd() | ||
&& (bypassTinySegments == false | ||
|| fieldEntry.size() > Lucene99HnswVectorsFormat.HNSW_GRAPH_THRESHOLD); | ||
Comment on lines
+338
to
+341
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The reader should just look to see if there is a graph. |
||
// Take into account if quantized? E.g. some scorer cost? | ||
int filteredDocCount = 0; | ||
// The approximate number of vectors that would be visited if we did not filter | ||
int unfilteredVisit = HnswGraphSearcher.expectedVisitedNodes(knnCollector.k(), graph.size()); | ||
int unfilteredVisit = | ||
HnswGraphSearcher.expectedVisitedNodes(knnCollector.k(), fieldEntry.size()); | ||
if (acceptDocs instanceof BitSet bitSet) { | ||
// Use approximate cardinality as this is good enough, but ensure we don't exceed the graph | ||
// size as that is illogical | ||
filteredDocCount = Math.min(bitSet.approximateCardinality(), graph.size()); | ||
filteredDocCount = Math.min(bitSet.approximateCardinality(), fieldEntry.size()); | ||
if (unfilteredVisit >= filteredDocCount) { | ||
doHnsw = false; | ||
} | ||
|
Oops, something went wrong.
Oops, something went wrong.
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.
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.
If we allow this to be a parameter, it should be a threshold that refers to the typical
k
used when querying.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.
Makes sense