From c0ecbb38af753d72be5652a6ac4dbd1971c4b46a Mon Sep 17 00:00:00 2001 From: beorn7 Date: Thu, 19 Mar 2020 16:28:23 +0100 Subject: [PATCH] Fix tests that were broken by #7009 Signed-off-by: beorn7 --- storage/fanout/fanout_test.go | 8 ++------ tsdb/head_test.go | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/storage/fanout/fanout_test.go b/storage/fanout/fanout_test.go index 0554444fd..d62b6f5e1 100644 --- a/storage/fanout/fanout_test.go +++ b/storage/fanout/fanout_test.go @@ -131,7 +131,7 @@ func TestFanoutErrors(t *testing.T) { defer querier.Close() matcher := labels.MustNewMatcher(labels.MatchEqual, "a", "b") - ss, warnings, err := querier.SelectSorted(nil, matcher) + ss, warnings, err := querier.Select(true, nil, matcher) testutil.Equals(t, tc.err, err) testutil.Equals(t, tc.warnings, warnings) @@ -169,11 +169,7 @@ func (errStorage) Close() error { type errQuerier struct{} -func (errQuerier) Select(*storage.SelectParams, ...*labels.Matcher) (storage.SeriesSet, storage.Warnings, error) { - return nil, nil, errSelect -} - -func (errQuerier) SelectSorted(*storage.SelectParams, ...*labels.Matcher) (storage.SeriesSet, storage.Warnings, error) { +func (errQuerier) Select(bool, *storage.SelectHints, ...*labels.Matcher) (storage.SeriesSet, storage.Warnings, error) { return nil, nil, errSelect } diff --git a/tsdb/head_test.go b/tsdb/head_test.go index bea95271a..57e5c3a92 100644 --- a/tsdb/head_test.go +++ b/tsdb/head_test.go @@ -1630,7 +1630,7 @@ func testHeadSeriesChunkRace(t *testing.T) { h.gc() wg.Done() }() - ss, _, err := q.Select(nil, matcher) + ss, _, err := q.Select(false, nil, matcher) testutil.Ok(t, err) testutil.Ok(t, ss.Err()) wg.Wait()