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

issue: ##36243 Signed-off-by: zhenshan.cao <[email protected]>
milvus-io · Sep 16, 2024 · dcd904d · dcd904d
1 parent 763fd0d
commit dcd904d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/internal/proxy/search_util.go b/internal/proxy/search_util.go
@@ -70,11 +70,7 @@ func parseSearchInfo(searchParamsPair []*commonpb.KeyValuePair, schema *schemapb
 			}
 			topK = externalLimit
 		} else {
-			if topKInParam < externalLimit {
-				topK = externalLimit
-			} else {
-				topK = topKInParam
-			}
+			topK = topKInParam
 		}
 	}
 

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