refine group_strict_size parameter(#37482)

Signed-off-by: MrPresent-Han <[email protected]>
milvus-io · Nov 6, 2024 · e403334 · e403334
1 parent 8275e40
commit e403334
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/internal/distributed/proxy/httpserver/constant.go b/internal/distributed/proxy/httpserver/constant.go
@@ -148,6 +148,6 @@ const (
 	ParamRangeFilter     = "range_filter"
 	ParamGroupByField    = "group_by_field"
 	ParamGroupSize       = "group_size"
-	ParamGroupStrictSize = "group_strict_size"
+	ParamStrictGroupSize = "strict_group_size"
 	BoundedTimestamp     = 2
 )
diff --git a/internal/distributed/proxy/httpserver/handler_v2.go b/internal/distributed/proxy/httpserver/handler_v2.go
@@ -995,7 +995,7 @@ func (h *HandlersV2) search(ctx context.Context, c *gin.Context, anyReq any, dbN
 	}
 	if httpReq.GroupByField != "" && httpReq.GroupSize > 0 {
 		searchParams = append(searchParams, &commonpb.KeyValuePair{Key: ParamGroupSize, Value: strconv.FormatInt(int64(httpReq.GroupSize), 10)})
-		searchParams = append(searchParams, &commonpb.KeyValuePair{Key: ParamGroupStrictSize, Value: strconv.FormatBool(httpReq.GroupStrictSize)})
+		searchParams = append(searchParams, &commonpb.KeyValuePair{Key: ParamStrictGroupSize, Value: strconv.FormatBool(httpReq.StrictGroupSize)})
 	}
 	searchParams = append(searchParams, &commonpb.KeyValuePair{Key: proxy.AnnsFieldKey, Value: httpReq.AnnsField})
 	body, _ := c.Get(gin.BodyBytesKey)
@@ -1100,7 +1100,7 @@ func (h *HandlersV2) advancedSearch(ctx context.Context, c *gin.Context, anyReq
 	}
 	if httpReq.GroupByField != "" && httpReq.GroupSize > 0 {
 		req.RankParams = append(req.RankParams, &commonpb.KeyValuePair{Key: ParamGroupSize, Value: strconv.FormatInt(int64(httpReq.GroupSize), 10)})
-		req.RankParams = append(req.RankParams, &commonpb.KeyValuePair{Key: ParamGroupStrictSize, Value: strconv.FormatBool(httpReq.GroupStrictSize)})
+		req.RankParams = append(req.RankParams, &commonpb.KeyValuePair{Key: ParamStrictGroupSize, Value: strconv.FormatBool(httpReq.GroupStrictSize)})
 	}
 	resp, err := wrapperProxyWithLimit(ctx, c, req, h.checkAuth, false, "/milvus.proto.milvus.MilvusService/HybridSearch", true, h.proxy, func(reqCtx context.Context, req any) (interface{}, error) {
 		return h.proxy.HybridSearch(reqCtx, req.(*milvuspb.HybridSearchRequest))

diff --git a/internal/distributed/proxy/httpserver/request_v2.go b/internal/distributed/proxy/httpserver/request_v2.go
@@ -160,7 +160,7 @@ type SearchReqV2 struct {
 	Filter           string        `json:"filter"`
 	GroupByField     string        `json:"groupingField"`
 	GroupSize        int32         `json:"groupSize"`
-	GroupStrictSize  bool          `json:"groupStrictSize"`
+	StrictGroupSize  bool          `json:"groupStrictSize"`
 	Limit            int32         `json:"limit"`
 	Offset           int32         `json:"offset"`
 	OutputFields     []string      `json:"outputFields"`

diff --git a/internal/proxy/search_util.go b/internal/proxy/search_util.go
@@ -390,7 +390,7 @@ func parseGroupByInfo(searchParamsPair []*commonpb.KeyValuePair, schema *schemap
 
 	// 3.  parse group strict size
 	var groupStrictSize bool
-	groupStrictSizeStr, err := funcutil.GetAttrByKeyFromRepeatedKV(GroupStrictSize, searchParamsPair)
+	groupStrictSizeStr, err := funcutil.GetAttrByKeyFromRepeatedKV(StrictGroupSize, searchParamsPair)
 	if err != nil {
 		groupStrictSize = false
 	} else {

diff --git a/internal/proxy/task.go b/internal/proxy/task.go
@@ -55,7 +55,7 @@ const (
 	IteratorField        = "iterator"
 	GroupByFieldKey      = "group_by_field"
 	GroupSizeKey         = "group_size"
-	GroupStrictSize      = "group_strict_size"
+	StrictGroupSize      = "strict_group_size"
 	RankGroupScorer      = "rank_group_scorer"
 	AnnsFieldKey         = "anns_field"
 	TopKKey              = "topk"

diff --git a/internal/proxy/task_search_test.go b/internal/proxy/task_search_test.go
@@ -2336,7 +2336,7 @@ func TestTaskSearch_parseSearchInfo(t *testing.T) {
 			Value: strconv.FormatInt(3, 10),
 		})
 		testRankParamsPairs = append(testRankParamsPairs, &commonpb.KeyValuePair{
-			Key:   GroupStrictSize,
+			Key:   StrictGroupSize,
 			Value: "false",
 		})
 		testRankParamsPairs = append(testRankParamsPairs, &commonpb.KeyValuePair{
@@ -2358,7 +2358,7 @@ func TestTaskSearch_parseSearchInfo(t *testing.T) {
 			Value: strconv.FormatInt(10, 10),
 		})
 		params = append(params, &commonpb.KeyValuePair{
-			Key:   GroupStrictSize,
+			Key:   StrictGroupSize,
 			Value: "true",
 		})