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.

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

MB-62167: Fix windows crash #246

Merged
merged 2 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
3 changes: 1 addition & 2 deletions faiss_vector_cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,7 @@ func (vc *vectorIndexCache) createAndCache(fieldID uint16, mem []byte, except *r
indexSize, n := binary.Uvarint(mem[pos : pos+binary.MaxVarintLen64])
pos += n

index, err = faiss.ReadIndexFromBuffer(mem[pos:pos+int(indexSize)],
faiss.IOFlagReadMmap|faiss.IOFlagSkipPrefetch)
index, err = faiss.ReadIndexFromBuffer(mem[pos:pos+int(indexSize)], vectorIndexIOFlags)
if err != nil {
return nil, nil, nil, err
}
Expand Down
22 changes: 22 additions & 0 deletions faiss_vector_io_flags_unix.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Copyright (c) 2024 Couchbase, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build vectors && !windows
// +build vectors,!windows

package zap

import faiss "github.com/blevesearch/go-faiss"

const vectorIndexIOFlags = faiss.IOFlagReadMmap | faiss.IOFlagSkipPrefetch
CascadingRadium marked this conversation as resolved.
Show resolved Hide resolved
22 changes: 22 additions & 0 deletions faiss_vector_io_flags_win.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Copyright (c) 2024 Couchbase, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build vectors && windows
// +build vectors,windows

package zap

import faiss "github.com/blevesearch/go-faiss"

const vectorIndexIOFlags = faiss.IOFlagReadOnly
3 changes: 1 addition & 2 deletions section_faiss_vector_index.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,7 @@ func (v *vectorIndexOpaque) mergeAndWriteVectorIndexes(sbs []*SegmentBase,
}
// read the index bytes. todo: parallelize this
indexBytes := segBase.mem[indexes[segI].startOffset : indexes[segI].startOffset+int(indexes[segI].indexSize)]
index, err := faiss.ReadIndexFromBuffer(indexBytes,
faiss.IOFlagReadMmap|faiss.IOFlagSkipPrefetch)
index, err := faiss.ReadIndexFromBuffer(indexBytes, vectorIndexIOFlags)
if err != nil {
freeReconstructedIndexes(vecIndexes)
return err
Expand Down
Loading