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

Make the linter happy

Browse source
This commit is contained in:
Charles Korn 2023-10-12 12:29:44 +11:00
parent 4bf8ec202c
commit 6c45249fb5
No known key found for this signature in database
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
storage/merge.go
View file

@ -594,7 +594,17 @@ func (c *chainSampleIterator) Next() chunkenc.ValueType {
for { for {
currValueType = c.curr.Next() currValueType = c.curr.Next()
if currValueType != chunkenc.ValNone {
if currValueType == chunkenc.ValNone {
if c.curr.Err() != nil {
// Abort if we've hit an error.
return chunkenc.ValNone
} else if len(c.h) == 0 {
// No iterator left to iterate.
c.curr = nil
return chunkenc.ValNone
}
} else {
currT = c.curr.AtT() currT = c.curr.AtT()
if currT == c.lastT { if currT == c.lastT {
// Ignoring sample for the same timestamp. // Ignoring sample for the same timestamp.
@ -614,13 +624,6 @@ func (c *chainSampleIterator) Next() chunkenc.ValueType {
} }
// Current iterator does not hold the smallest timestamp. // Current iterator does not hold the smallest timestamp.
heap.Push(&c.h, c.curr) heap.Push(&c.h, c.curr)
} else if c.curr.Err() != nil {
// Abort if we've hit an error.
return chunkenc.ValNone
} else if len(c.h) == 0 {
// No iterator left to iterate.
c.curr = nil
return chunkenc.ValNone
} }
c.curr = heap.Pop(&c.h).(chunkenc.Iterator) c.curr = heap.Pop(&c.h).(chunkenc.Iterator)