fix: fix hybrid search panic when has multi shard (milvus-io#30464)

/kind bug issue:milvus-io#30457 Signed-off-by: xige-16 <[email protected]> Signed-off-by: xige-16 <[email protected]>
coco-bigdata · Feb 2, 2024 · 05ebe7b · 05ebe7b
1 parent 02de842
commit 05ebe7b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/internal/proxy/task_hybrid_search.go b/internal/proxy/task_hybrid_search.go
@@ -222,9 +222,6 @@ func (t *hybridSearchTask) PreExecute(ctx context.Context) error {
 }
 
 func (t *hybridSearchTask) hybridSearchShard(ctx context.Context, nodeID int64, qn types.QueryNodeClient, channel string) error {
-	for _, searchTask := range t.searchTasks {
-		t.HybridSearchRequest.Reqs = append(t.HybridSearchRequest.Reqs, searchTask.SearchRequest)
-	}
 	hybridSearchReq := typeutil.Clone(t.HybridSearchRequest)
 	hybridSearchReq.GetBase().TargetID = nodeID
 	if t.partitionKeyMode {
@@ -272,6 +269,10 @@ func (t *hybridSearchTask) Execute(ctx context.Context) error {
 	tr := timerecord.NewTimeRecorder(fmt.Sprintf("proxy execute hybrid search %d", t.ID()))
 	defer tr.CtxElapse(ctx, "done")
 
+	for _, searchTask := range t.searchTasks {
+		t.HybridSearchRequest.Reqs = append(t.HybridSearchRequest.Reqs, searchTask.SearchRequest)
+	}
+
 	t.resultBuf = typeutil.NewConcurrentSet[*querypb.HybridSearchResult]()
 	err := t.lb.Execute(ctx, CollectionWorkLoad{
 		db:             t.request.GetDbName(),