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

Avoid potential collision of createIdxChkReaders in querier_test.go (#585)

Browse source 
* Make chink ref monotonically increasing number in the `createIdxChkReaders` test func.
Signed-off-by: naivewong <867245430@qq.com>
This commit is contained in:
naivewong 2019-04-18 21:11:39 +08:00 committed by Krasi Georgiev
parent e2c6eb2c60
commit 7a12d4588a
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
querier_test.go
View file

@ -206,13 +206,11 @@ func createIdxChkReaders(tc []seriesSamples) (IndexReader, ChunkReader, int64, i
blockMint := int64(math.MaxInt64) blockMint := int64(math.MaxInt64)
blockMaxt := int64(math.MinInt64) blockMaxt := int64(math.MinInt64)
var chunkRef uint64
for i, s := range tc { for i, s := range tc {
i = i + 1 // 0 is not a valid posting. i = i + 1 // 0 is not a valid posting.
metas := make([]chunks.Meta, 0, len(s.chunks)) metas := make([]chunks.Meta, 0, len(s.chunks))
for _, chk := range s.chunks { for _, chk := range s.chunks {
// Collisions can be there, but for tests, its fine.
ref := rand.Uint64()
if chk[0].t < blockMint { if chk[0].t < blockMint {
blockMint = chk[0].t blockMint = chk[0].t
} }
@ -223,7 +221,7 @@ func createIdxChkReaders(tc []seriesSamples) (IndexReader, ChunkReader, int64, i
metas = append(metas, chunks.Meta{ metas = append(metas, chunks.Meta{
MinTime: chk[0].t, MinTime: chk[0].t,
MaxTime: chk[len(chk)-1].t, MaxTime: chk[len(chk)-1].t,
Ref: ref, Ref: chunkRef,
}) })
chunk := chunkenc.NewXORChunk() chunk := chunkenc.NewXORChunk()
@ -231,7 +229,8 @@ func createIdxChkReaders(tc []seriesSamples) (IndexReader, ChunkReader, int64, i
for _, smpl := range chk { for _, smpl := range chk {
app.Append(smpl.t, smpl.v) app.Append(smpl.t, smpl.v)
} }
chkReader[ref] = chunk chkReader[chunkRef] = chunk
chunkRef += 1
} }
ls := labels.FromMap(s.lset) ls := labels.FromMap(s.lset)