mirror of
https://github.com/prometheus/prometheus.git
synced 2024-12-25 13:44:05 -08:00
b866db009b
There was a subtle and nasty bug in listSeriesIterator.Seek. In addition, the Seek call is defined to be a no-op if the current position of the iterator is already pointing to a suitable sample. This commit adds fast paths for this case to several potentially expensive Seek calls. Another bug was in concreteSeriesIterator.Seek. It always searched the whole series and not from the current position of the iterator. Signed-off-by: beorn7 <beorn@grafana.com>
178 lines
3.8 KiB
Go
178 lines
3.8 KiB
Go
// Copyright 2018 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 tsdbutil
|
|
|
|
import (
|
|
"math/rand"
|
|
"sort"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
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,
|
|
},
|
|
}
|
|
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.t, s.v)
|
|
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 sold.t >= s.t-c.delta && !found {
|
|
t.Fatalf("%d: expected sample %d to be in buffer but was not; buffer %v", i, sold.t, buffered)
|
|
}
|
|
if sold.t < s.t-c.delta && found {
|
|
t.Fatalf("%d: unexpected sample %d in buffer; 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() {
|
|
t, v := bit.At()
|
|
b = append(b, sample{t: t, v: v})
|
|
}
|
|
require.Equal(t, exp, b)
|
|
}
|
|
sampleEq := func(ets int64, ev float64) {
|
|
ts, v := it.At()
|
|
require.Equal(t, ets, ts)
|
|
require.Equal(t, ev, v)
|
|
}
|
|
|
|
it = NewBuffer(newListSeriesIterator([]sample{
|
|
{t: 1, v: 2},
|
|
{t: 2, v: 3},
|
|
{t: 3, v: 4},
|
|
{t: 4, v: 5},
|
|
{t: 5, v: 6},
|
|
{t: 99, v: 8},
|
|
{t: 100, v: 9},
|
|
{t: 101, v: 10},
|
|
}), 2)
|
|
|
|
require.True(t, it.Seek(-123), "seek failed")
|
|
sampleEq(1, 2)
|
|
bufferEq(nil)
|
|
|
|
require.True(t, it.Next(), "next failed")
|
|
sampleEq(2, 3)
|
|
bufferEq([]sample{{t: 1, v: 2}})
|
|
|
|
require.True(t, it.Next(), "next failed")
|
|
require.True(t, it.Next(), "next failed")
|
|
require.True(t, it.Next(), "next failed")
|
|
sampleEq(5, 6)
|
|
bufferEq([]sample{{t: 2, v: 3}, {t: 3, v: 4}, {t: 4, v: 5}})
|
|
|
|
require.True(t, it.Seek(5), "seek failed")
|
|
sampleEq(5, 6)
|
|
bufferEq([]sample{{t: 2, v: 3}, {t: 3, v: 4}, {t: 4, v: 5}})
|
|
|
|
require.True(t, it.Seek(101), "seek failed")
|
|
sampleEq(101, 10)
|
|
bufferEq([]sample{{t: 99, v: 8}, {t: 100, v: 9}})
|
|
|
|
require.False(t, it.Next(), "next succeeded unexpectedly")
|
|
}
|
|
|
|
type listSeriesIterator struct {
|
|
list []sample
|
|
idx int
|
|
}
|
|
|
|
func newListSeriesIterator(list []sample) *listSeriesIterator {
|
|
return &listSeriesIterator{list: list, idx: -1}
|
|
}
|
|
|
|
func (it *listSeriesIterator) At() (int64, float64) {
|
|
s := it.list[it.idx]
|
|
return s.t, s.v
|
|
}
|
|
|
|
func (it *listSeriesIterator) Next() bool {
|
|
it.idx++
|
|
return it.idx < len(it.list)
|
|
}
|
|
|
|
func (it *listSeriesIterator) Seek(t int64) bool {
|
|
if it.idx == -1 {
|
|
it.idx = 0
|
|
}
|
|
// No-op check.
|
|
if s := it.list[it.idx]; s.T() >= t {
|
|
return true
|
|
}
|
|
// Do binary search between current position and end.
|
|
it.idx += sort.Search(len(it.list)-it.idx, func(i int) bool {
|
|
s := it.list[i+it.idx]
|
|
return s.t >= t
|
|
})
|
|
|
|
return it.idx < len(it.list)
|
|
}
|
|
|
|
func (it *listSeriesIterator) Err() error {
|
|
return nil
|
|
}
|