Remove codes related to deprecated field (#19897)

Signed-off-by: yah01 <yang.cen@zilliz.com>

Signed-off-by: yah01 <yang.cen@zilliz.com>
pull/19903/head
yah01 2022-10-19 18:29:26 +08:00 committed by GitHub
parent 579c50fa1a
commit 52cd40fbc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 18 deletions

View File

@ -182,9 +182,6 @@ func FilterInIndexedSegments(handler Handler, indexCoord types.IndexCoord, segme
func extractSegmentsWithVectorIndex(vecFieldID map[int64]int64, segentIndexInfo map[int64]*indexpb.SegmentInfo) []int64 {
indexedSegments := make(typeutil.UniqueSet)
for _, indexInfo := range segentIndexInfo {
if !indexInfo.GetEnableIndex() {
continue
}
for _, index := range indexInfo.GetIndexInfos() {
if index.GetFieldID() == vecFieldID[indexInfo.GetCollectionID()] {
indexedSegments.Insert(indexInfo.GetSegmentID())

View File

@ -170,20 +170,16 @@ func (broker *CoordinatorBroker) GetIndexInfo(ctx context.Context, collectionID
return nil, err
}
segmentInfo := resp.SegmentInfo[segmentID]
segmentInfo, ok := resp.SegmentInfo[segmentID]
if !ok || len(segmentInfo.GetIndexInfos()) == 0 {
return nil, WrapErrIndexNotExist(segmentID)
}
indexes := make([]*querypb.FieldIndexInfo, 0)
indexInfo := &querypb.FieldIndexInfo{
EnableIndex: segmentInfo.EnableIndex,
}
if !segmentInfo.EnableIndex {
indexes = append(indexes, indexInfo)
return indexes, nil
}
for _, info := range segmentInfo.GetIndexInfos() {
indexInfo = &querypb.FieldIndexInfo{
indexes = append(indexes, &querypb.FieldIndexInfo{
FieldID: info.GetFieldID(),
EnableIndex: segmentInfo.EnableIndex,
EnableIndex: true,
IndexName: info.GetIndexName(),
IndexID: info.GetIndexID(),
BuildID: info.GetBuildID(),
@ -192,9 +188,7 @@ func (broker *CoordinatorBroker) GetIndexInfo(ctx context.Context, collectionID
IndexSize: int64(info.GetSerializedSize()),
IndexVersion: info.GetIndexVersion(),
NumRows: info.GetNumRows(),
}
indexes = append(indexes, indexInfo)
})
}
return indexes, nil

View File

@ -16,7 +16,10 @@
package meta
import "errors"
import (
"errors"
"fmt"
)
var (
// Read errors
@ -27,4 +30,11 @@ var (
// Store errors
ErrStoreCollectionFailed = errors.New("StoreCollectionFailed")
ErrStoreReplicaFailed = errors.New("StoreReplicaFailed")
// Index errors
ErrIndexNotExist = errors.New("IndexNotExist")
)
func WrapErrIndexNotExist(segmentID int64) error {
return fmt.Errorf("%w(segmentID=%d)", ErrIndexNotExist, segmentID)
}

View File

@ -234,7 +234,7 @@ func (loader *segmentLoader) loadFiles(ctx context.Context, segment *Segment,
if segment.getType() == segmentTypeSealed {
fieldID2IndexInfo := make(map[int64]*querypb.FieldIndexInfo)
for _, indexInfo := range loadInfo.IndexInfos {
if indexInfo != nil && indexInfo.EnableIndex && len(indexInfo.IndexFilePaths) > 0 {
if len(indexInfo.IndexFilePaths) > 0 {
fieldID := indexInfo.FieldID
fieldID2IndexInfo[fieldID] = indexInfo
}