From 168f346620b51c47612f596e0fde3786a35d4cd8 Mon Sep 17 00:00:00 2001 From: yah01 Date: Mon, 24 Jul 2023 17:47:00 +0800 Subject: [PATCH] Remove deprecated interface (#25864) Signed-off-by: yah01 --- .../querynodev2/segments/load_index_info.go | 31 ++----------------- internal/querynodev2/segments/segment.go | 27 ++-------------- .../querynodev2/segments/segment_loader.go | 2 +- 3 files changed, 6 insertions(+), 54 deletions(-) diff --git a/internal/querynodev2/segments/load_index_info.go b/internal/querynodev2/segments/load_index_info.go index d463d88107..4cdee24aac 100644 --- a/internal/querynodev2/segments/load_index_info.go +++ b/internal/querynodev2/segments/load_index_info.go @@ -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") } diff --git a/internal/querynodev2/segments/segment.go b/internal/querynodev2/segments/segment.go index c4147c5a16..fceea87d60 100644 --- a/internal/querynodev2/segments/segment.go +++ b/internal/querynodev2/segments/segment.go @@ -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", diff --git a/internal/querynodev2/segments/segment_loader.go b/internal/querynodev2/segments/segment_loader.go index 8bcf65978c..88335fc75e 100644 --- a/internal/querynodev2/segments/segment_loader.go +++ b/internal/querynodev2/segments/segment_loader.go @@ -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,