mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Addressed Brian's comments.

Browse source 
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
This commit is contained in:
Bartlomiej Plotka 2020-03-13 14:37:47 +00:00
parent fe802f29c9
commit cd9516316a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/fanout/fanout_test.go
View file

@ -79,7 +79,7 @@ func TestSelectSorted(t *testing.T) {
matcher, err := labels.NewMatcher(labels.MatchEqual, model.MetricNameLabel, "a") matcher, err := labels.NewMatcher(labels.MatchEqual, model.MetricNameLabel, "a")
testutil.Ok(t, err) testutil.Ok(t, err)
seriesSet, _, err := querier.Select(false, nil, matcher) seriesSet, _, err := querier.Select(true, nil, matcher)
testutil.Ok(t, err) testutil.Ok(t, err)
result := make(map[int64]float64) result := make(map[int64]float64)

2
tsdb/querier.go
View file

@ -98,7 +98,7 @@ func (q *querier) Select(sortSeries bool, hints *storage.SelectHints, ms ...*lab
for i, b := range q.blocks { for i, b := range q.blocks {
// Sorting Head series is slow, and unneeded when only the // Sorting Head series is slow, and unneeded when only the
// Head is being queried. Sorting blocks is a noop. // Head is being queried. Sorting blocks is a noop.
// Still we have to sort if blocks > 1 as Merged Series requires. // Still we have to sort if blocks > 1 as MergedSeriesSet requires it.
s, w, err := b.Select(true, hints, ms...) s, w, err := b.Select(true, hints, ms...)
ws = append(ws, w...) ws = append(ws, w...)
if err != nil { if err != nil {