From 68e02be963603f2d06315de96b54c221b454955b Mon Sep 17 00:00:00 2001 From: beorn7 Date: Tue, 30 Nov 2021 17:20:28 +0100 Subject: [PATCH] Post-merge fixes Signed-off-by: beorn7 --- storage/remote/codec_test.go | 11 ++++++----- storage/series_test.go | 20 ++++++++++++++------ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/storage/remote/codec_test.go b/storage/remote/codec_test.go index 1432736e13..e27e80a227 100644 --- a/storage/remote/codec_test.go +++ b/storage/remote/codec_test.go @@ -24,6 +24,7 @@ import ( "github.com/prometheus/prometheus/model/textparse" "github.com/prometheus/prometheus/prompb" "github.com/prometheus/prometheus/storage" + "github.com/prometheus/prometheus/tsdb/chunkenc" ) var writeRequestFixture = &prompb.WriteRequest{ @@ -205,31 +206,31 @@ func TestConcreteSeriesIterator(t *testing.T) { it := series.Iterator() // Seek to the first sample with ts=1. - require.True(t, it.Seek(1)) + require.Equal(t, chunkenc.ValFloat, it.Seek(1)) ts, v := it.At() require.Equal(t, int64(1), ts) require.Equal(t, 1., v) // Seek one further, next sample still has ts=1. - require.True(t, it.Next()) + require.Equal(t, chunkenc.ValFloat, it.Next()) ts, v = it.At() require.Equal(t, int64(1), ts) require.Equal(t, 1.5, v) // Seek again to 1 and make sure we stay where we are. - require.True(t, it.Seek(1)) + require.Equal(t, chunkenc.ValFloat, it.Seek(1)) ts, v = it.At() require.Equal(t, int64(1), ts) require.Equal(t, 1.5, v) // Another seek. - require.True(t, it.Seek(3)) + require.Equal(t, chunkenc.ValFloat, it.Seek(3)) ts, v = it.At() require.Equal(t, int64(3), ts) require.Equal(t, 3., v) // And we don't go back. - require.True(t, it.Seek(2)) + require.Equal(t, chunkenc.ValFloat, it.Seek(2)) ts, v = it.At() require.Equal(t, int64(3), ts) require.Equal(t, 3., v) diff --git a/storage/series_test.go b/storage/series_test.go index 384009de43..80bae9b41b 100644 --- a/storage/series_test.go +++ b/storage/series_test.go @@ -17,37 +17,45 @@ import ( "testing" "github.com/stretchr/testify/require" + + "github.com/prometheus/prometheus/tsdb/chunkenc" ) func TestListSeriesIterator(t *testing.T) { - it := NewListSeriesIterator(samples{sample{0, 0}, sample{1, 1}, sample{1, 1.5}, sample{2, 2}, sample{3, 3}}) + it := NewListSeriesIterator(samples{ + sample{0, 0, nil, nil}, + sample{1, 1, nil, nil}, + sample{1, 1.5, nil, nil}, + sample{2, 2, nil, nil}, + sample{3, 3, nil, nil}, + }) // Seek to the first sample with ts=1. - require.True(t, it.Seek(1)) + require.Equal(t, chunkenc.ValFloat, it.Seek(1)) ts, v := it.At() require.Equal(t, int64(1), ts) require.Equal(t, 1., v) // Seek one further, next sample still has ts=1. - require.True(t, it.Next()) + require.Equal(t, chunkenc.ValFloat, it.Next()) ts, v = it.At() require.Equal(t, int64(1), ts) require.Equal(t, 1.5, v) // Seek again to 1 and make sure we stay where we are. - require.True(t, it.Seek(1)) + require.Equal(t, chunkenc.ValFloat, it.Seek(1)) ts, v = it.At() require.Equal(t, int64(1), ts) require.Equal(t, 1.5, v) // Another seek. - require.True(t, it.Seek(3)) + require.Equal(t, chunkenc.ValFloat, it.Seek(3)) ts, v = it.At() require.Equal(t, int64(3), ts) require.Equal(t, 3., v) // And we don't go back. - require.True(t, it.Seek(2)) + require.Equal(t, chunkenc.ValFloat, it.Seek(2)) ts, v = it.At() require.Equal(t, int64(3), ts) require.Equal(t, 3., v)