From ed95568a05f90a131b73adf39c0f2278f8e36fd3 Mon Sep 17 00:00:00 2001 From: congqixia Date: Tue, 24 Sep 2024 18:01:13 +0800 Subject: [PATCH] enhance: Fix PR conflict in reduce unit test (#36470) Related to #36433 #36180 Signed-off-by: Congqi Xia --- internal/querynodev2/segments/result_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/querynodev2/segments/result_test.go b/internal/querynodev2/segments/result_test.go index d8cfef88cbad1..7bd6dc42c7706 100644 --- a/internal/querynodev2/segments/result_test.go +++ b/internal/querynodev2/segments/result_test.go @@ -147,7 +147,7 @@ func (suite *ResultSuite) TestResult_MergeSegcoreRetrieveResults() { } result, err := MergeSegcoreRetrieveResultsV1(context.Background(), []*segcorepb.RetrieveResults{result1, result2}, - NewMergeParam(typeutil.Unlimited, make([]int64, 0), nil, false)) + NewMergeParam(typeutil.Unlimited, make([]int64, 0), nil, reduce.IReduceNoOrder)) suite.NoError(err) suite.Equal(3, len(result.GetFieldsData())) suite.Equal([]int64{1}, result.GetIds().GetIntId().GetData())