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

fix: bm25 search failed when nq > 1 and remove idf oracle when no bm25 field exist. (#36886) 

relate: https://github.com/milvus-io/milvus/issues/35853

Signed-off-by: aoiasd <zhicheng.yue@zilliz.com>
pull/36910/head
aoiasd 2024-10-16 12:51:23 +08:00 committed by GitHub
parent b2037c95a8
commit 72dc07ba48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/querynodev2/delegator/delegator.go
View File

@ -908,7 +908,10 @@ func NewShardDelegator(ctx context.Context, collectionID UniqueID, replicaID Uni
excludedSegments := NewExcludedSegments(paramtable.Get().QueryNodeCfg.CleanExcludeSegInterval.GetAsDuration(time.Second))
idfOracle := NewIDFOracle(collection.Schema().GetFunctions())
var idfOracle IDFOracle
if len(collection.Schema().GetFunctions()) > 0 {
idfOracle = NewIDFOracle(collection.Schema().GetFunctions())
}
sd := &shardDelegator{
collectionID: collectionID,
replicaID: replicaID,

12
internal/querynodev2/delegator/delegator_data.go
View File

@ -154,7 +154,9 @@ func (sd *shardDelegator) ProcessInsert(insertRecords map[int64]*InsertData) {
if !sd.pkOracle.Exists(growing, paramtable.GetNodeID()) {
// register created growing segment after insert, avoid to add empty growing to delegator
sd.pkOracle.Register(growing, paramtable.GetNodeID())
sd.idfOracle.Register(segmentID, insertData.BM25Stats, segments.SegmentTypeGrowing)
if sd.idfOracle != nil {
sd.idfOracle.Register(segmentID, insertData.BM25Stats, segments.SegmentTypeGrowing)
}
sd.segmentManager.Put(context.Background(), segments.SegmentTypeGrowing, growing)
sd.addGrowing(SegmentEntry{
NodeID: paramtable.GetNodeID(),
@ -166,7 +168,7 @@ func (sd *shardDelegator) ProcessInsert(insertRecords map[int64]*InsertData) {
}
sd.growingSegmentLock.Unlock()
} else {
} else if sd.idfOracle != nil {
sd.idfOracle.UpdateGrowing(growing.ID(), insertData.BM25Stats)
}
log.Info("insert into growing segment",
@ -385,7 +387,7 @@ func (sd *shardDelegator) LoadGrowing(ctx context.Context, infos []*querypb.Segm
for _, segment := range loaded {
sd.pkOracle.Register(segment, paramtable.GetNodeID())
if len(sd.isBM25Field) > 0 {
if sd.idfOracle != nil {
sd.idfOracle.Register(segment.ID(), segment.GetBM25Stats(), segments.SegmentTypeGrowing)
}
}
@ -688,7 +690,7 @@ func (sd *shardDelegator) loadStreamDelete(ctx context.Context,
sd.pkOracle.Register(candidate, targetNodeID)
}
if bm25Stats != nil {
if sd.idfOracle != nil {
bm25Stats.Range(func(segmentID int64, stats map[int64]*storage.BM25Stats) bool {
sd.idfOracle.Register(segmentID, stats, segments.SegmentTypeSealed)
return false
@ -998,7 +1000,7 @@ func (sd *shardDelegator) buildBM25IDF(req *internalpb.SearchRequest) (float64,
pb := &commonpb.PlaceholderGroup{}
proto.Unmarshal(req.GetPlaceholderGroup(), pb)
if len(pb.Placeholders) != 1 || len(pb.Placeholders[0].Values) != 1 {
if len(pb.Placeholders) != 1 || len(pb.Placeholders[0].Values) == 0 {
return 0, merr.WrapErrParameterInvalidMsg("please provide varchar for bm25")
}

4
internal/querynodev2/delegator/distribution.go
View File

@ -370,7 +370,9 @@ func (d *distribution) genSnapshot() chan struct{} {
d.current.Store(newSnapShot)
// shall be a new one
d.snapshots.GetOrInsert(d.snapshotVersion, newSnapShot)
d.idfOracle.SyncDistribution(newSnapShot)
if d.idfOracle != nil {
d.idfOracle.SyncDistribution(newSnapShot)
}
// first snapshot, return closed chan
if last == nil {