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.

Sign up for GitHub

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

Reuse buffers while querying vector indexes #216

Closed
wants to merge 1 commit into from
Closed

Reuse buffers while querying vector indexes #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions faiss_vector_posting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,14 +266,14 @@ func (vpl *VecPostingsIterator) BytesWritten() uint64 {

// vectorIndexWrapper conforms to scorch_segment_api's VectorIndex interface
type vectorIndexWrapper struct {
search func(qVector []float32, k int64, except *roaring.Bitmap) (segment.VecPostingsList, error)
search func(qVector []float32, k int64, except *roaring.Bitmap, distanceBuffer []float32, labelBuffer []int64) (segment.VecPostingsList, error)
Copy link
Member

Choose a reason for hiding this comment

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

This is detail bleed across projects.

close func()
size func() uint64
}

func (i *vectorIndexWrapper) Search(qVector []float32, k int64, except *roaring.Bitmap) (
func (i *vectorIndexWrapper) Search(qVector []float32, k int64, except *roaring.Bitmap, distanceBuffer []float32, labelBuffer []int64) (
segment.VecPostingsList, error) {
return i.search(qVector, k, except)
return i.search(qVector, k, except, distanceBuffer, labelBuffer)
}

func (i *vectorIndexWrapper) Close() {
Expand All @@ -298,7 +298,7 @@ func (sb *SegmentBase) InterpretVectorIndex(field string) (segment.VectorIndex,

var (
wrapVecIndex = &vectorIndexWrapper{
search: func(qVector []float32, k int64, except *roaring.Bitmap) (segment.VecPostingsList, error) {
search: func(qVector []float32, k int64, except *roaring.Bitmap, distanceBuffer []float32, labelBuffer []int64) (segment.VecPostingsList, error) {
// 1. returned postings list (of type PostingsList) has two types of information - docNum and its score.
// 2. both the values can be represented using roaring bitmaps.
// 3. the Iterator (of type PostingsIterator) returned would operate in terms of VecPostings.
Expand All @@ -324,7 +324,7 @@ func (sb *SegmentBase) InterpretVectorIndex(field string) (segment.VectorIndex,
}
}

scores, ids, err := vecIndex.SearchWithoutIDs(qVector, k, vectorIDsToExclude)
scores, ids, err := vecIndex.SearchWithoutIDs(qVector, k, vectorIDsToExclude, distanceBuffer, labelBuffer)

if err != nil {
return nil, err
Expand Down
14 changes: 11 additions & 3 deletions faiss_vector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,12 @@ func TestVectorSegment(t *testing.T) {
t.Fatal(err)
}

pl, err := vecIndex.Search([]float32{0.0, 0.0, 0.0}, 3, nil)
// since only one segment is present we just make the buffer of size K here itself
bufSize := 3
distanceBuffer := make([]float32, bufSize)
labelBuffer := make([]int64, bufSize)

pl, err := vecIndex.Search([]float32{0.0, 0.0, 0.0}, 3, nil, distanceBuffer, labelBuffer)
if err != nil {
vecIndex.Close()
t.Fatal(err)
Expand Down Expand Up @@ -562,8 +567,11 @@ func TestPersistedVectorSegment(t *testing.T) {
if err != nil {
t.Fatal(err)
}

pl, err := vecIndex.Search([]float32{0.0, 0.0, 0.0}, 3, nil)
// since only one segment is present we just make the buffer of size K here itself
bufSize := 3
distanceBuffer := make([]float32, bufSize)
labelBuffer := make([]int64, bufSize)
pl, err := vecIndex.Search([]float32{0.0, 0.0, 0.0}, 3, nil, distanceBuffer, labelBuffer)
if err != nil {
vecIndex.Close()
t.Fatal(err)
Expand Down
Loading