mirror of
https://github.com/prometheus/prometheus.git
synced 2024-12-26 06:04:05 -08:00
d121db7a65
In most cases, there is no sample at `maxt`, so `PeekBack` has to be used. So far, `PeekBack` did not return a float histogram, and we disregarded even any returned normal histogram. This fixes both, and also tweaks the unit test to discover the problem (by using an earlier timestamp than "now" for the samples in the TSDB). Signed-off-by: beorn7 <beorn@grafana.com>
264 lines
6.7 KiB
Go
264 lines
6.7 KiB
Go
// Copyright 2017 The Prometheus Authors
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package storage
|
|
|
|
import (
|
|
"math/rand"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/prometheus/prometheus/model/histogram"
|
|
"github.com/prometheus/prometheus/tsdb/chunkenc"
|
|
)
|
|
|
|
func TestSampleRing(t *testing.T) {
|
|
cases := []struct {
|
|
input []int64
|
|
delta int64
|
|
size int
|
|
}{
|
|
{
|
|
input: []int64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
|
|
delta: 2,
|
|
size: 1,
|
|
},
|
|
{
|
|
input: []int64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
|
|
delta: 2,
|
|
size: 2,
|
|
},
|
|
{
|
|
input: []int64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
|
|
delta: 7,
|
|
size: 3,
|
|
},
|
|
{
|
|
input: []int64{1, 2, 3, 4, 5, 16, 17, 18, 19, 20},
|
|
delta: 7,
|
|
size: 1,
|
|
},
|
|
{
|
|
input: []int64{1, 2, 3, 4, 6},
|
|
delta: 4,
|
|
size: 4,
|
|
},
|
|
}
|
|
for _, c := range cases {
|
|
r := newSampleRing(c.delta, c.size)
|
|
|
|
input := []sample{}
|
|
for _, t := range c.input {
|
|
input = append(input, sample{
|
|
t: t,
|
|
v: float64(rand.Intn(100)),
|
|
})
|
|
}
|
|
|
|
for i, s := range input {
|
|
r.add(s)
|
|
buffered := r.samples()
|
|
|
|
for _, sold := range input[:i] {
|
|
found := false
|
|
for _, bs := range buffered {
|
|
if bs.t == sold.t && bs.v == sold.v {
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
|
|
if found {
|
|
require.GreaterOrEqual(t, sold.t, s.t-c.delta, "%d: unexpected sample %d in buffer; buffer %v", i, sold.t, buffered)
|
|
} else {
|
|
require.Less(t, sold.t, s.t-c.delta, "%d: expected sample %d to be in buffer but was not; buffer %v", i, sold.t, buffered)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestBufferedSeriesIterator(t *testing.T) {
|
|
var it *BufferedSeriesIterator
|
|
|
|
bufferEq := func(exp []sample) {
|
|
var b []sample
|
|
bit := it.Buffer()
|
|
for bit.Next() == chunkenc.ValFloat {
|
|
t, v := bit.At()
|
|
b = append(b, sample{t: t, v: v})
|
|
}
|
|
require.Equal(t, exp, b, "buffer mismatch")
|
|
}
|
|
sampleEq := func(ets int64, ev float64) {
|
|
ts, v := it.At()
|
|
require.Equal(t, ets, ts, "timestamp mismatch")
|
|
require.Equal(t, ev, v, "value mismatch")
|
|
}
|
|
prevSampleEq := func(ets int64, ev float64, eok bool) {
|
|
ts, v, _, _, ok := it.PeekBack(1)
|
|
require.Equal(t, eok, ok, "exist mismatch")
|
|
require.Equal(t, ets, ts, "timestamp mismatch")
|
|
require.Equal(t, ev, v, "value mismatch")
|
|
}
|
|
|
|
it = NewBufferIterator(NewListSeriesIterator(samples{
|
|
sample{t: 1, v: 2},
|
|
sample{t: 2, v: 3},
|
|
sample{t: 3, v: 4},
|
|
sample{t: 4, v: 5},
|
|
sample{t: 5, v: 6},
|
|
sample{t: 99, v: 8},
|
|
sample{t: 100, v: 9},
|
|
sample{t: 101, v: 10},
|
|
}), 2)
|
|
|
|
require.Equal(t, chunkenc.ValFloat, it.Seek(-123), "seek failed")
|
|
sampleEq(1, 2)
|
|
prevSampleEq(0, 0, false)
|
|
bufferEq(nil)
|
|
|
|
require.Equal(t, chunkenc.ValFloat, it.Next(), "next failed")
|
|
sampleEq(2, 3)
|
|
prevSampleEq(1, 2, true)
|
|
bufferEq([]sample{{t: 1, v: 2}})
|
|
|
|
require.Equal(t, chunkenc.ValFloat, it.Next(), "next failed")
|
|
require.Equal(t, chunkenc.ValFloat, it.Next(), "next failed")
|
|
require.Equal(t, chunkenc.ValFloat, it.Next(), "next failed")
|
|
sampleEq(5, 6)
|
|
prevSampleEq(4, 5, true)
|
|
bufferEq([]sample{{t: 2, v: 3}, {t: 3, v: 4}, {t: 4, v: 5}})
|
|
|
|
require.Equal(t, chunkenc.ValFloat, it.Seek(5), "seek failed")
|
|
sampleEq(5, 6)
|
|
prevSampleEq(4, 5, true)
|
|
bufferEq([]sample{{t: 2, v: 3}, {t: 3, v: 4}, {t: 4, v: 5}})
|
|
|
|
require.Equal(t, chunkenc.ValFloat, it.Seek(101), "seek failed")
|
|
sampleEq(101, 10)
|
|
prevSampleEq(100, 9, true)
|
|
bufferEq([]sample{{t: 99, v: 8}, {t: 100, v: 9}})
|
|
|
|
require.Equal(t, chunkenc.ValNone, it.Next(), "next succeeded unexpectedly")
|
|
require.Equal(t, chunkenc.ValNone, it.Seek(1024), "seek succeeded unexpectedly")
|
|
}
|
|
|
|
// At() should not be called once Next() returns false.
|
|
func TestBufferedSeriesIteratorNoBadAt(t *testing.T) {
|
|
done := false
|
|
|
|
m := &mockSeriesIterator{
|
|
seek: func(int64) chunkenc.ValueType { return chunkenc.ValNone },
|
|
at: func() (int64, float64) {
|
|
require.False(t, done, "unexpectedly done")
|
|
done = true
|
|
return 0, 0
|
|
},
|
|
next: func() chunkenc.ValueType {
|
|
if done {
|
|
return chunkenc.ValNone
|
|
}
|
|
return chunkenc.ValFloat
|
|
},
|
|
err: func() error { return nil },
|
|
}
|
|
|
|
it := NewBufferIterator(m, 60)
|
|
it.Next()
|
|
it.Next()
|
|
}
|
|
|
|
func BenchmarkBufferedSeriesIterator(b *testing.B) {
|
|
// Simulate a 5 minute rate.
|
|
it := NewBufferIterator(newFakeSeriesIterator(int64(b.N), 30), 5*60)
|
|
|
|
b.SetBytes(16)
|
|
b.ReportAllocs()
|
|
b.ResetTimer()
|
|
|
|
for it.Next() != chunkenc.ValNone {
|
|
// scan everything
|
|
}
|
|
require.NoError(b, it.Err())
|
|
}
|
|
|
|
type mockSeriesIterator struct {
|
|
seek func(int64) chunkenc.ValueType
|
|
at func() (int64, float64)
|
|
next func() chunkenc.ValueType
|
|
err func() error
|
|
}
|
|
|
|
func (m *mockSeriesIterator) Seek(t int64) chunkenc.ValueType { return m.seek(t) }
|
|
func (m *mockSeriesIterator) At() (int64, float64) { return m.at() }
|
|
func (m *mockSeriesIterator) Next() chunkenc.ValueType { return m.next() }
|
|
func (m *mockSeriesIterator) Err() error { return m.err() }
|
|
|
|
func (m *mockSeriesIterator) AtHistogram() (int64, *histogram.Histogram) {
|
|
return 0, nil // Not really mocked.
|
|
}
|
|
|
|
func (m *mockSeriesIterator) AtFloatHistogram() (int64, *histogram.FloatHistogram) {
|
|
return 0, nil // Not really mocked.
|
|
}
|
|
|
|
func (m *mockSeriesIterator) AtT() int64 {
|
|
return 0 // Not really mocked.
|
|
}
|
|
|
|
type fakeSeriesIterator struct {
|
|
nsamples int64
|
|
step int64
|
|
idx int64
|
|
}
|
|
|
|
func newFakeSeriesIterator(nsamples, step int64) *fakeSeriesIterator {
|
|
return &fakeSeriesIterator{nsamples: nsamples, step: step, idx: -1}
|
|
}
|
|
|
|
func (it *fakeSeriesIterator) At() (int64, float64) {
|
|
return it.idx * it.step, 123 // Value doesn't matter.
|
|
}
|
|
|
|
func (it *fakeSeriesIterator) AtHistogram() (int64, *histogram.Histogram) {
|
|
return it.idx * it.step, &histogram.Histogram{} // Value doesn't matter.
|
|
}
|
|
|
|
func (it *fakeSeriesIterator) AtFloatHistogram() (int64, *histogram.FloatHistogram) {
|
|
return it.idx * it.step, &histogram.FloatHistogram{} // Value doesn't matter.
|
|
}
|
|
|
|
func (it *fakeSeriesIterator) AtT() int64 {
|
|
return it.idx * it.step
|
|
}
|
|
|
|
func (it *fakeSeriesIterator) Next() chunkenc.ValueType {
|
|
it.idx++
|
|
if it.idx >= it.nsamples {
|
|
return chunkenc.ValNone
|
|
}
|
|
return chunkenc.ValFloat
|
|
}
|
|
|
|
func (it *fakeSeriesIterator) Seek(t int64) chunkenc.ValueType {
|
|
it.idx = t / it.step
|
|
if it.idx >= it.nsamples {
|
|
return chunkenc.ValNone
|
|
}
|
|
return chunkenc.ValFloat
|
|
}
|
|
|
|
func (it *fakeSeriesIterator) Err() error { return nil }
|