mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 13:44:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Post-merge fixes

Browse source 
Signed-off-by: beorn7 <beorn@grafana.com>
This commit is contained in:
beorn7 2021-11-30 17:20:28 +01:00
parent e4e24453fa
commit 68e02be963
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
storage/remote/codec_test.go
View file

@ -24,6 +24,7 @@ import (
"github.com/prometheus/prometheus/model/textparse" "github.com/prometheus/prometheus/model/textparse"
"github.com/prometheus/prometheus/prompb" "github.com/prometheus/prometheus/prompb"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/tsdb/chunkenc"
) )
var writeRequestFixture = &prompb.WriteRequest{ var writeRequestFixture = &prompb.WriteRequest{
@ -205,31 +206,31 @@ func TestConcreteSeriesIterator(t *testing.T) {
it := series.Iterator() it := series.Iterator()
// Seek to the first sample with ts=1. // 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() ts, v := it.At()
require.Equal(t, int64(1), ts) require.Equal(t, int64(1), ts)
require.Equal(t, 1., v) require.Equal(t, 1., v)
// Seek one further, next sample still has ts=1. // 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() ts, v = it.At()
require.Equal(t, int64(1), ts) require.Equal(t, int64(1), ts)
require.Equal(t, 1.5, v) require.Equal(t, 1.5, v)
// Seek again to 1 and make sure we stay where we are. // 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() ts, v = it.At()
require.Equal(t, int64(1), ts) require.Equal(t, int64(1), ts)
require.Equal(t, 1.5, v) require.Equal(t, 1.5, v)
// Another seek. // Another seek.
require.True(t, it.Seek(3)) require.Equal(t, chunkenc.ValFloat, it.Seek(3))
ts, v = it.At() ts, v = it.At()
require.Equal(t, int64(3), ts) require.Equal(t, int64(3), ts)
require.Equal(t, 3., v) require.Equal(t, 3., v)
// And we don't go back. // And we don't go back.
require.True(t, it.Seek(2)) require.Equal(t, chunkenc.ValFloat, it.Seek(2))
ts, v = it.At() ts, v = it.At()
require.Equal(t, int64(3), ts) require.Equal(t, int64(3), ts)
require.Equal(t, 3., v) require.Equal(t, 3., v)

20
storage/series_test.go
View file

@ -17,37 +17,45 @@ import (
"testing" "testing"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/tsdb/chunkenc"
) )
func TestListSeriesIterator(t *testing.T) { 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. // 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() ts, v := it.At()
require.Equal(t, int64(1), ts) require.Equal(t, int64(1), ts)
require.Equal(t, 1., v) require.Equal(t, 1., v)
// Seek one further, next sample still has ts=1. // 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() ts, v = it.At()
require.Equal(t, int64(1), ts) require.Equal(t, int64(1), ts)
require.Equal(t, 1.5, v) require.Equal(t, 1.5, v)
// Seek again to 1 and make sure we stay where we are. // 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() ts, v = it.At()
require.Equal(t, int64(1), ts) require.Equal(t, int64(1), ts)
require.Equal(t, 1.5, v) require.Equal(t, 1.5, v)
// Another seek. // Another seek.
require.True(t, it.Seek(3)) require.Equal(t, chunkenc.ValFloat, it.Seek(3))
ts, v = it.At() ts, v = it.At()
require.Equal(t, int64(3), ts) require.Equal(t, int64(3), ts)
require.Equal(t, 3., v) require.Equal(t, 3., v)
// And we don't go back. // And we don't go back.
require.True(t, it.Seek(2)) require.Equal(t, chunkenc.ValFloat, it.Seek(2))
ts, v = it.At() ts, v = it.At()
require.Equal(t, int64(3), ts) require.Equal(t, int64(3), ts)
require.Equal(t, 3., v) require.Equal(t, 3., v)