github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Modify tests to check for mint, maxt 

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
pull/5805/head
Goutham Veeramachaneni 2017-04-14 00:37:21 +05:30
parent b60c2068bc
commit 239f8b9eb5
No known key found for this signature in database
GPG Key ID: F1C217E8E9023CAD
2 changed files with 110 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
querier.go
View File

@ -582,10 +582,15 @@ func (it *chunkSeriesIterator) inBounds(t int64) bool {
}
func (it *chunkSeriesIterator) Seek(t int64) (ok bool) {
if t >= it.maxt || t <= it.mint {
if t > it.maxt {
return false
}
// Seek to the first valid value after t.
if t < it.mint {
t = it.mint
}
// Only do binary search forward to stay in line with other iterators
// that can only move forward.
x := sort.Search(len(it.chunks[it.i:]), func(i int) bool { return it.chunks[i].MinTime >= t })

166
querier_test.go
View File

@ -532,6 +532,8 @@ func TestSeriesIterator(t *testing.T) {
itcases := []struct {
a, b, c []sample
exp []sample
mint, maxt int64
}{
{
a: []sample{},
@ -539,77 +541,56 @@ func TestSeriesIterator(t *testing.T) {
c: []sample{},
exp: []sample{},
mint: math.MinInt64,
maxt: math.MaxInt64,
},
{
a: []sample{
{1, 2},
{2, 3},
{3, 5},
{6, 1},
{1, 2}, {2, 3}, {3, 5}, {6, 1},
},
b: []sample{},
c: []sample{
{7, 89},
{9, 8},
{7, 89}, {9, 8},
},
exp: []sample{
{1, 2},
{2, 3},
{3, 5},
{6, 1},
{7, 89},
{9, 8},
{1, 2}, {2, 3}, {3, 5}, {6, 1}, {7, 89}, {9, 8},
},
mint: math.MinInt64,
maxt: math.MaxInt64,
},
{
a: []sample{},
b: []sample{
{1, 2},
{2, 3},
{3, 5},
{6, 1},
{1, 2}, {2, 3}, {3, 5}, {6, 1},
},
c: []sample{
{7, 89},
{9, 8},
{7, 89}, {9, 8},
},
exp: []sample{
{1, 2},
{2, 3},
{3, 5},
{6, 1},
{7, 89},
{9, 8},
{1, 2}, {2, 3}, {3, 5}, {6, 1}, {7, 89}, {9, 8},
},
mint: 2,
maxt: 8,
},
{
a: []sample{
{1, 2},
{2, 3},
{3, 5},
{6, 1},
{1, 2}, {2, 3}, {3, 5}, {6, 1},
},
b: []sample{
{7, 89},
{9, 8},
{7, 89}, {9, 8},
},
c: []sample{
{10, 22},
{203, 3493},
{10, 22}, {203, 3493},
},
exp: []sample{
{1, 2},
{2, 3},
{3, 5},
{6, 1},
{7, 89},
{9, 8},
{10, 22},
{203, 3493},
{1, 2}, {2, 3}, {3, 5}, {6, 1}, {7, 89}, {9, 8}, {10, 22}, {203, 3493},
},
mint: 6,
maxt: 10,
},
}
@ -619,6 +600,8 @@ func TestSeriesIterator(t *testing.T) {
seek int64
success bool
exp []sample
mint, maxt int64
}{
{
a: []sample{},
@ -635,34 +618,31 @@ func TestSeriesIterator(t *testing.T) {
},
b: []sample{},
c: []sample{
{7, 89},
{9, 8},
{7, 89}, {9, 8},
},
seek: 10,
success: false,
exp: nil,
mint: math.MinInt64,
maxt: math.MaxInt64,
},
{
a: []sample{},
b: []sample{
{1, 2},
{3, 5},
{6, 1},
{1, 2}, {3, 5}, {6, 1},
},
c: []sample{
{7, 89},
{9, 8},
{7, 89}, {9, 8},
},
seek: 2,
success: true,
exp: []sample{
{3, 5},
{6, 1},
{7, 89},
{9, 8},
{3, 5}, {6, 1}, {7, 89}, {9, 8},
},
mint: 5,
maxt: 8,
},
{
a: []sample{
@ -672,16 +652,16 @@ func TestSeriesIterator(t *testing.T) {
{9, 8},
},
c: []sample{
{10, 22},
{203, 3493},
{10, 22}, {203, 3493},
},
seek: 10,
success: true,
exp: []sample{
{10, 22},
{203, 3493},
{10, 22}, {203, 3493},
},
mint: 10,
maxt: 203,
},
{
a: []sample{
@ -691,8 +671,7 @@ func TestSeriesIterator(t *testing.T) {
{9, 8},
},
c: []sample{
{10, 22},
{203, 3493},
{10, 22}, {203, 3493},
},
seek: 203,
@ -700,6 +679,8 @@ func TestSeriesIterator(t *testing.T) {
exp: []sample{
{203, 3493},
},
mint: 7,
maxt: 203,
},
}
@ -710,8 +691,15 @@ func TestSeriesIterator(t *testing.T) {
chunkFromSamples(tc.b),
chunkFromSamples(tc.c),
}
res := newChunkSeriesIterator(chkMetas, math.MinInt64, math.MaxInt64)
exp := newListSeriesIterator(tc.exp)
res := newChunkSeriesIterator(chkMetas, tc.mint, tc.maxt)
smplValid := make([]sample, 0)
for _, s := range tc.exp {
if s.t >= tc.mint && s.t <= tc.maxt {
smplValid = append(smplValid, s)
}
}
exp := newListSeriesIterator(smplValid)
smplExp, errExp := expandSeriesIterator(exp)
smplRes, errRes := expandSeriesIterator(res)
@ -721,14 +709,68 @@ func TestSeriesIterator(t *testing.T) {
}
t.Run("Seek", func(t *testing.T) {
for _, tc := range seekcases {
extra := []struct {
a, b, c []sample
seek int64
success bool
exp []sample
mint, maxt int64
}{
{
a: []sample{
{6, 1},
},
b: []sample{
{9, 8},
},
c: []sample{
{10, 22}, {203, 3493},
},
seek: 203,
success: false,
exp: nil,
mint: 2,
maxt: 202,
},
{
a: []sample{
{6, 1},
},
b: []sample{
{9, 8},
},
c: []sample{
{10, 22}, {203, 3493},
},
seek: 5,
success: true,
exp: []sample{{10, 22}},
mint: 10,
maxt: 202,
},
}
seekcases2 := append(seekcases, extra...)
for _, tc := range seekcases2 {
chkMetas := []*ChunkMeta{
chunkFromSamples(tc.a),
chunkFromSamples(tc.b),
chunkFromSamples(tc.c),
}
res := newChunkSeriesIterator(chkMetas, math.MinInt64, math.MaxInt64)
exp := newListSeriesIterator(tc.exp)
res := newChunkSeriesIterator(chkMetas, tc.mint, tc.maxt)
smplValid := make([]sample, 0)
for _, s := range tc.exp {
if s.t >= tc.mint && s.t <= tc.maxt {
smplValid = append(smplValid, s)
}
}
exp := newListSeriesIterator(smplValid)
require.Equal(t, tc.success, res.Seek(tc.seek))