enhance: Not pass empty group by field search param (#748)

When group by is not set, make sdk not passing empty GroupByField search param. Signed-off-by: Congqi Xia <[email protected]>
milvus-io · May 16, 2024 · 55cc3b2 · 55cc3b2
1 parent 785bac6
commit 55cc3b2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/client/ann_request.go b/client/ann_request.go
@@ -53,16 +53,20 @@ func (r *ANNSearchRequest) getMilvusSearchRequest(collectionInfo *collInfo, opts
 		return nil, err
 	}
 
-	searchParams := entity.MapKvPairs(map[string]string{
+	sp := map[string]string{
 		"anns_field":     r.fieldName,
 		"topk":           fmt.Sprintf("%d", r.limit),
 		"params":         string(bs),
 		"metric_type":    string(r.metricType),
 		"round_decimal":  "-1",
 		ignoreGrowingKey: strconv.FormatBool(opt.IgnoreGrowing),
 		offsetKey:        fmt.Sprintf("%d", opt.Offset),
-		groupByKey:       opt.GroupByField,
-	})
+	}
+	if opt.GroupByField != "" {
+		sp[groupByKey] = opt.GroupByField
+	}
+
+	searchParams := entity.MapKvPairs(sp)
 
 	result := &milvuspb.SearchRequest{
 		DbName:             "",

diff --git a/client/data.go b/client/data.go
@@ -400,7 +400,7 @@ func prepareSearchRequest(collName string, partitions []string,
 		return nil, err
 	}
 
-	searchParams := entity.MapKvPairs(map[string]string{
+	spMap := map[string]string{
 		"anns_field":     vectorField,
 		"topk":           fmt.Sprintf("%d", topK),
 		"params":         string(bs),
@@ -409,7 +409,11 @@ func prepareSearchRequest(collName string, partitions []string,
 		ignoreGrowingKey: strconv.FormatBool(opt.IgnoreGrowing),
 		offsetKey:        fmt.Sprintf("%d", opt.Offset),
 		groupByKey:       opt.GroupByField,
-	})
+	}
+	if opt.GroupByField != "" {
+		spMap[groupByKey] = opt.GroupByField
+	}
+	searchParams := entity.MapKvPairs(spMap)
 
 	req := &milvuspb.SearchRequest{
 		DbName:             "",