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

fix: keep inner topK to avoid exceeding efSearch (#36284) 

issue: #https://github.com/milvus-io/milvus/issues/36243

Signed-off-by: zhenshan.cao <zhenshan.cao@zilliz.com>
pull/36310/head
zhenshan.cao 2024-09-16 11:01:25 +08:00 committed by GitHub
parent 763fd0dfc5
commit dcd904d2fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/proxy/search_util.go
View File

@ -70,11 +70,7 @@ func parseSearchInfo(searchParamsPair []*commonpb.KeyValuePair, schema *schemapb
} }
topK = externalLimit topK = externalLimit
} else { } else {
if topKInParam < externalLimit { topK = topKInParam
topK = externalLimit
} else {
topK = topKInParam
}
} }
} }

6
internal/proxy/task_search_test.go
View File

@ -2259,7 +2259,7 @@ func TestTaskSearch_parseSearchInfo(t *testing.T) {
info, offset, err := parseSearchInfo(offsetParam, nil, rank) info, offset, err := parseSearchInfo(offsetParam, nil, rank)
assert.NoError(t, err) assert.NoError(t, err)
assert.NotNil(t, info) assert.NotNil(t, info)
assert.Equal(t, externalLimit, info.GetTopk()) assert.Equal(t, int64(10), info.GetTopk())
assert.Equal(t, int64(0), offset) assert.Equal(t, int64(0), offset)
}) })
@ -2446,13 +2446,13 @@ func TestTaskSearch_parseSearchInfo(t *testing.T) {
schema := &schemapb.CollectionSchema{ schema := &schemapb.CollectionSchema{
Fields: fields, Fields: fields,
} }
info, _, err := parseSearchInfo(normalParam, schema, false) info, _, err := parseSearchInfo(normalParam, schema, nil)
assert.Nil(t, info) assert.Nil(t, info)
assert.Error(t, err) assert.Error(t, err)
assert.True(t, strings.Contains(err.Error(), "exceeds configured max group size")) assert.True(t, strings.Contains(err.Error(), "exceeds configured max group size"))
resetSearchParamsValue(normalParam, GroupSizeKey, `10`) resetSearchParamsValue(normalParam, GroupSizeKey, `10`)
info, _, err = parseSearchInfo(normalParam, schema, false) info, _, err = parseSearchInfo(normalParam, schema, nil)
assert.NotNil(t, info) assert.NotNil(t, info)
assert.NoError(t, err) assert.NoError(t, err)
}) })