milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated interface (#25864) 

Signed-off-by: yah01 <yah2er0ne@outlook.com>
pull/25880/head
yah01 2023-07-24 17:47:00 +08:00 committed by GitHub
parent 779d677eb2
commit 168f346620
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
internal/querynodev2/segments/load_index_info.go
View File

@ -25,7 +25,6 @@ package segments
import "C"
import (
"path/filepath"
"unsafe"
"github.com/milvus-io/milvus-proto/go-api/v2/schemapb"
@ -57,7 +56,7 @@ func deleteLoadIndexInfo(info *LoadIndexInfo) {
C.DeleteLoadIndexInfo(info.cLoadIndexInfo)
}
func (li *LoadIndexInfo) appendLoadIndexInfo(bytesIndex [][]byte, indexInfo *querypb.FieldIndexInfo, collectionID int64, partitionID int64, segmentID int64, fieldType schemapb.DataType) error {
func (li *LoadIndexInfo) appendLoadIndexInfo(indexInfo *querypb.FieldIndexInfo, collectionID int64, partitionID int64, segmentID int64, fieldType schemapb.DataType) error {
fieldID := indexInfo.FieldID
indexPaths := indexInfo.IndexFilePaths
@ -87,7 +86,7 @@ func (li *LoadIndexInfo) appendLoadIndexInfo(bytesIndex [][]byte, indexInfo *que
}
}
err = li.appendIndexData(bytesIndex, indexPaths)
err = li.appendIndexData(indexPaths)
return err
}
@ -135,7 +134,7 @@ func (li *LoadIndexInfo) appendFieldInfo(collectionID int64, partitionID int64,
}
// appendIndexData appends index path to cLoadIndexInfo and create index
func (li *LoadIndexInfo) appendIndexData(bytesIndex [][]byte, indexKeys []string) error {
func (li *LoadIndexInfo) appendIndexData(indexKeys []string) error {
for _, indexPath := range indexKeys {
err := li.appendIndexFile(indexPath)
if err != nil {
@ -143,30 +142,6 @@ func (li *LoadIndexInfo) appendIndexData(bytesIndex [][]byte, indexKeys []string
}
}
if bytesIndex != nil {
var cBinarySet C.CBinarySet
status := C.NewBinarySet(&cBinarySet)
defer C.DeleteBinarySet(cBinarySet)
if err := HandleCStatus(&status, "NewBinarySet failed"); err != nil {
return err
}
for i, byteIndex := range bytesIndex {
indexPtr := unsafe.Pointer(&byteIndex[0])
indexLen := C.int64_t(len(byteIndex))
binarySetKey := filepath.Base(indexKeys[i])
indexKey := C.CString(binarySetKey)
status = C.AppendIndexBinary(cBinarySet, indexPtr, indexLen, indexKey)
C.free(unsafe.Pointer(indexKey))
if err := HandleCStatus(&status, "LoadIndexInfo AppendIndexBinary failed"); err != nil {
return err
}
}
status = C.AppendIndex(li.cLoadIndexInfo, cBinarySet)
return HandleCStatus(&status, "AppendIndex failed")
}
status := C.AppendIndexV2(li.cLoadIndexInfo)
return HandleCStatus(&status, "AppendIndex failed")
}

27
internal/querynodev2/segments/segment.go
View File

@ -831,37 +831,14 @@ func (s *LocalSegment) LoadDeltaData(deltaData *storage.DeleteData) error {
return nil
}
func (s *LocalSegment) LoadIndex(bytesIndex [][]byte, indexInfo *querypb.FieldIndexInfo, fieldType schemapb.DataType) error {
func (s *LocalSegment) LoadIndex(indexInfo *querypb.FieldIndexInfo, fieldType schemapb.DataType) error {
loadIndexInfo, err := newLoadIndexInfo()
defer deleteLoadIndexInfo(loadIndexInfo)
if err != nil {
return err
}
err = loadIndexInfo.appendLoadIndexInfo(bytesIndex, indexInfo, s.collectionID, s.partitionID, s.segmentID, fieldType)
if err != nil {
if loadIndexInfo.cleanLocalData() != nil {
log.Warn("failed to clean cached data on disk after append index failed",
zap.Int64("buildID", indexInfo.BuildID),
zap.Int64("index version", indexInfo.IndexVersion))
}
return err
}
if s.Type() != SegmentTypeSealed {
errMsg := fmt.Sprintln("updateSegmentIndex failed, illegal segment type ", s.typ, "segmentID = ", s.ID())
return errors.New(errMsg)
}
return s.LoadIndexInfo(indexInfo, loadIndexInfo)
}
func (s *LocalSegment) LoadIndexData(indexInfo *querypb.FieldIndexInfo, fieldType schemapb.DataType) error {
loadIndexInfo, err := newLoadIndexInfo()
defer deleteLoadIndexInfo(loadIndexInfo)
if err != nil {
return err
}
err = loadIndexInfo.appendLoadIndexInfo(nil, indexInfo, s.collectionID, s.partitionID, s.segmentID, fieldType)
err = loadIndexInfo.appendLoadIndexInfo(indexInfo, s.collectionID, s.partitionID, s.segmentID, fieldType)
if err != nil {
if loadIndexInfo.cleanLocalData() != nil {
log.Warn("failed to clean cached data on disk after append index failed",

2
internal/querynodev2/segments/segment_loader.go
View File

@ -607,7 +607,7 @@ func (loader *segmentLoader) loadFieldIndex(ctx context.Context, segment *LocalS
return err
}
return segment.LoadIndexData(indexInfo, fieldType)
return segment.LoadIndex(indexInfo, fieldType)
}
func (loader *segmentLoader) insertIntoSegment(segment *LocalSegment,