diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go index f3960813ca3..57ecb7d2097 100644 --- a/pkg/ingester/ingester.go +++ b/pkg/ingester/ingester.go @@ -1878,7 +1878,7 @@ func (i *Ingester) metricsForLabelMatchersCommon(ctx context.Context, req *clien seriesSet := q.Select(ctx, true, hints, matchers...) sets = append(sets, seriesSet) } - mergedSet = storage.NewMergeSeriesSet(sets, 0, storage.ChainedSeriesMerge) + mergedSet = storage.NewMergeSeriesSet(sets, limit, storage.ChainedSeriesMerge) } else { mergedSet = q.Select(ctx, false, hints, matchersSet[0]...) } diff --git a/pkg/querier/blocks_store_queryable.go b/pkg/querier/blocks_store_queryable.go index ba7c74b6df1..c7953482451 100644 --- a/pkg/querier/blocks_store_queryable.go +++ b/pkg/querier/blocks_store_queryable.go @@ -484,9 +484,8 @@ func (q *blocksStoreQuerier) selectSorted(ctx context.Context, sp *storage.Selec storage.EmptySeriesSet() } - // TODO(johrry): pass limit when merging. return series.NewSeriesSetWithWarnings( - storage.NewMergeSeriesSet(resSeriesSets, 0, storage.ChainedSeriesMerge), + storage.NewMergeSeriesSet(resSeriesSets, int(limit), storage.ChainedSeriesMerge), resWarnings) } diff --git a/pkg/querier/blocks_store_queryable_test.go b/pkg/querier/blocks_store_queryable_test.go index fb33e6b2e70..162e606d4ff 100644 --- a/pkg/querier/blocks_store_queryable_test.go +++ b/pkg/querier/blocks_store_queryable_test.go @@ -647,7 +647,6 @@ func TestBlocksStoreQuerier_Select(t *testing.T) { }, limits: &blocksStoreLimitsMock{}, queryLimiter: noOpQueryLimiter, - // TODO (johrry): Update this after passing limit in merge expectedSeries: []seriesResult{ { lbls: labels.New(metricNameLabel, series1Label), @@ -655,12 +654,6 @@ func TestBlocksStoreQuerier_Select(t *testing.T) { {t: minT, v: 1}, {t: minT + 1, v: 2}, }, - }, { - lbls: labels.New(metricNameLabel, series2Label), - values: []valueResult{ - {t: minT, v: 1}, - {t: minT + 1, v: 3}, - }, }, }, },