mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-21 03:16:00 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

storage: Avoid duplicate function call in sampleRingIterator (#11502)

Browse source 
Signed-off-by: beorn7 <beorn@grafana.com>
This commit is contained in:
Björn Rabenstein 2022-11-01 18:34:47 +01:00 committed by GitHub
parent fa6e05903f
commit bd26ce440c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
storage/buffer.go
View file

@ -233,6 +233,10 @@ func (r *sampleRing) iterator() chunkenc.Iterator {
type sampleRingIterator struct { type sampleRingIterator struct {
r *sampleRing r *sampleRing
i int i int
t int64
v float64
h *histogram.Histogram
fh *histogram.FloatHistogram
} }
func (it *sampleRingIterator) Next() chunkenc.ValueType { func (it *sampleRingIterator) Next() chunkenc.ValueType {
@ -241,12 +245,16 @@ func (it *sampleRingIterator) Next() chunkenc.ValueType {
return chunkenc.ValNone return chunkenc.ValNone
} }
s := it.r.at(it.i) s := it.r.at(it.i)
it.t = s.t
switch { switch {
case s.h != nil: case s.h != nil:
it.h = s.h
return chunkenc.ValHistogram return chunkenc.ValHistogram
case s.fh != nil: case s.fh != nil:
it.fh = s.fh
return chunkenc.ValFloatHistogram return chunkenc.ValFloatHistogram
default: default:
it.v = s.v
return chunkenc.ValFloat return chunkenc.ValFloat
} }
} }
@ -260,26 +268,22 @@ func (it *sampleRingIterator) Err() error {
} }
func (it *sampleRingIterator) At() (int64, float64) { func (it *sampleRingIterator) At() (int64, float64) {
s := it.r.at(it.i) return it.t, it.v
return s.t, s.v
} }
func (it *sampleRingIterator) AtHistogram() (int64, *histogram.Histogram) { func (it *sampleRingIterator) AtHistogram() (int64, *histogram.Histogram) {
s := it.r.at(it.i) return it.t, it.h
return s.t, s.h
} }
func (it *sampleRingIterator) AtFloatHistogram() (int64, *histogram.FloatHistogram) { func (it *sampleRingIterator) AtFloatHistogram() (int64, *histogram.FloatHistogram) {
s := it.r.at(it.i) if it.fh == nil {
if s.fh == nil { return it.t, it.h.ToFloat()
return s.t, s.h.ToFloat()
} }
return s.t, s.fh return it.t, it.fh
} }
func (it *sampleRingIterator) AtT() int64 { func (it *sampleRingIterator) AtT() int64 {
s := it.r.at(it.i) return it.t
return s.t
} }
func (r *sampleRing) at(i int) sample { func (r *sampleRing) at(i int) sample {