fix utest

Author: yuchen-db

internal/cortex/querier/queryrange/query_range.go

@@ -292,13 +292,15 @@ func (prometheusCodec) MergeResponse(_ Request, responses ...Response) (Response
 	response := PrometheusResponse{
 		Status: StatusSuccess,
 		Data: PrometheusData{
-			ResultType:         model.ValMatrix.String(),
-			Result:             matrixMerge(promResponses),
-			Stats:              StatsMerge(responses),
-			Analysis:           AnalyzesMerge(analyzes...),
-			SeriesStatsCounter: SeriesStatsCounterMerge(seriesStatsCounters...),
+			ResultType: model.ValMatrix.String(),
+			Result:     matrixMerge(promResponses),
+			Stats:      StatsMerge(responses),
+			Analysis:   AnalyzesMerge(analyzes...),
 		},
 	}
+	if len(seriesStatsCounters) > 0 {
+		response.Data.SeriesStatsCounter = SeriesStatsCounterMerge(seriesStatsCounters...)
+	}
 	response.Headers = QueryBytesFetchedPrometheusResponseHeaders(responses...)
 	if len(resultsCacheGenNumberHeaderValues) != 0 {
 		response.Headers = append(response.Headers, &PrometheusResponseHeader{

pkg/queryfrontend/queryinstant_codec.go

@@ -84,12 +84,14 @@ func (c queryInstantCodec) MergeResponse(req queryrange.Request, responses ...qu
 						Matrix: matrixMerge(promResponses),
 					},
 				},
-				Analysis:           queryrange.AnalyzesMerge(analyzes...),
-				Stats:              queryrange.StatsMerge(responses),
-				SeriesStatsCounter: queryrange.SeriesStatsCounterMerge(seriesStatsCounters...),
+				Analysis: queryrange.AnalyzesMerge(analyzes...),
+				Stats:    queryrange.StatsMerge(responses),
 			},
 			Headers: queryrange.QueryBytesFetchedPrometheusResponseHeaders(responses...),
 		}
+		if len(seriesStatsCounters) > 0 {
+			res.(*queryrange.PrometheusInstantQueryResponse).Data.SeriesStatsCounter = queryrange.SeriesStatsCounterMerge(seriesStatsCounters...)
+		}
 	default:
 		v, err := vectorMerge(req, promResponses)
 		if err != nil {
@@ -104,12 +106,14 @@ func (c queryInstantCodec) MergeResponse(req queryrange.Request, responses ...qu
 						Vector: v,
 					},
 				},
-				Analysis:           queryrange.AnalyzesMerge(analyzes...),
-				Stats:              queryrange.StatsMerge(responses),
-				SeriesStatsCounter: queryrange.SeriesStatsCounterMerge(seriesStatsCounters...),
+				Analysis: queryrange.AnalyzesMerge(analyzes...),
+				Stats:    queryrange.StatsMerge(responses),
 			},
 			Headers: queryrange.QueryBytesFetchedPrometheusResponseHeaders(responses...),
 		}
+		if len(seriesStatsCounters) > 0 {
+			res.(*queryrange.PrometheusInstantQueryResponse).Data.SeriesStatsCounter = queryrange.SeriesStatsCounterMerge(seriesStatsCounters...)
+		}
 	}
 
 	return res, nil

pkg/queryfrontend/queryinstant_codec_test.go

@@ -173,10 +173,10 @@ func TestQueryInstantCodec_DecodeRequest(t *testing.T) {
 			codec := NewThanosQueryInstantCodec(tc.partialResponse)
 			req, err := codec.DecodeRequest(context.Background(), r, nil)
 			if tc.expectedError != nil {
-				testutil.Equals(t, err, tc.expectedError)
+				testutil.Equals(t, tc.expectedError, err)
 			} else {
 				testutil.Ok(t, err)
-				testutil.Equals(t, req, tc.expectedRequest)
+				testutil.Equals(t, tc.expectedRequest, req)
 			}
 		})
 	}
@@ -264,10 +264,10 @@ func TestQueryInstantCodec_EncodeRequest(t *testing.T) {
 			codec := NewThanosQueryInstantCodec(false)
 			r, err := codec.EncodeRequest(context.TODO(), tc.req)
 			if tc.expectedError != nil {
-				testutil.Equals(t, err, tc.expectedError)
+				testutil.Equals(t, tc.expectedError, err)
 			} else {
 				testutil.Ok(t, err)
-				testutil.Equals(t, tc.checkFunc(r), true)
+				testutil.Equals(t, true, tc.checkFunc(r))
 			}
 		})
 	}
@@ -945,8 +945,8 @@ func TestMergeResponse(t *testing.T) {
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			resp, err := codec.MergeResponse(tc.req, tc.resps...)
-			testutil.Equals(t, err, tc.expectedErr)
-			testutil.Equals(t, resp, tc.expectedResp)
+			testutil.Equals(t, tc.expectedErr, err)
+			testutil.Equals(t, tc.expectedResp, resp)
 		})
 	}
 }