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

Merge pull request #3959 from prometheus/22-pick-ring 

Cherrypick #3942 onto release 2.2
This commit is contained in:
Fabian Reinartz 2018-03-14 07:02:37 -04:00 committed by GitHub
parent fcb8e9ac95 a8e3d0fc4b
commit 0847a605a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
storage/buffer.go
View File

@ -178,6 +178,7 @@ func (r *sampleRing) add(t int64, v float64) {
r.buf = buf r.buf = buf
r.i = r.f r.i = r.f
r.f += l r.f += l
l = 2 * l
} else { } else {
r.i++ r.i++
if r.i >= l { if r.i >= l {

5
storage/buffer_test.go
View File

@ -48,6 +48,11 @@ func TestSampleRing(t *testing.T) {
delta: 7, delta: 7,
size: 1, size: 1,
}, },
{
input: []int64{1, 2, 3, 4, 6},
delta: 4,
size: 4,
},
} }
for _, c := range cases { for _, c := range cases {
r := newSampleRing(c.delta, c.size) r := newSampleRing(c.delta, c.size)