Skip to content

Pass limit to merge serieset for labels API #6619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 1, 2025
Merged

Pass limit to merge serieset for labels API #6619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
302ff60
pass limit to merge serieset
yeya24 Feb 28, 2025
68f616e
update comment
yeya24 Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/ingester/ingester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]...)
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/querier/blocks_store_queryable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
7 changes: 0 additions & 7 deletions pkg/querier/blocks_store_queryable_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,20 +647,13 @@ 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),
values: []valueResult{
{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},
},
},
},
},
Expand Down
Loading