mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-09 23:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #11643 from codesome/histochunkreset

Browse source 
Fix reset of a histogram chunk iterator
This commit is contained in:
Ganesh Vernekar 2022-11-30 21:59:40 +05:30 committed by GitHub
parent 414d31aee6 b8b0d45d69
commit 0e4cbd0f4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tsdb/chunkenc/histogram.go
View file

@ -624,9 +624,9 @@ func (it *histogramIterator) Err() error {
} }
func (it *histogramIterator) Reset(b []byte) { func (it *histogramIterator) Reset(b []byte) {
// The first 2 bytes contain chunk headers. // The first 3 bytes contain chunk headers.
// We skip that for actual samples. // We skip that for actual samples.
it.br = newBReader(b[2:]) it.br = newBReader(b[3:])
it.numTotal = binary.BigEndian.Uint16(b) it.numTotal = binary.BigEndian.Uint16(b)
it.numRead = 0 it.numRead = 0

16
tsdb/chunkenc/histogram_test.go
View file

@ -84,14 +84,14 @@ func TestHistogramChunkSameBuckets(t *testing.T) {
require.Equal(t, exp, act) require.Equal(t, exp, act)
// 2. Expand second iterator while reusing first one. // 2. Expand second iterator while reusing first one.
// it2 := c.Iterator(it1) it2 := c.Iterator(it)
// var res2 []pair var res2 []res
// for it2.Next() { for it2.Next() == ValHistogram {
// ts, v := it2.At() ts, h := it2.AtHistogram()
// res2 = append(res2, pair{t: ts, v: v}) res2 = append(res2, res{t: ts, h: h})
// } }
// require.NoError(t, it2.Err()) require.NoError(t, it2.Err())
// require.Equal(t, exp, res2) require.Equal(t, exp, res2)
// 3. Test iterator Seek. // 3. Test iterator Seek.
// mid := len(exp) / 2 // mid := len(exp) / 2