mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 06:04:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Return zeros if At() is called after Next() returns false.

Browse source
This commit is contained in:
Tom Wilkie 2017-07-13 14:40:29 +01:00
parent 014bd31a86
commit 2e0d8487e3
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
storage/fanout.go
View file

@ -341,9 +341,7 @@ func (m *mergeSeries) Iterator() SeriesIterator {
for _, s := range m.series { for _, s := range m.series {
iterators = append(iterators, s.Iterator()) iterators = append(iterators, s.Iterator())
} }
return &mergeIterator{ return newMergeIterator(iterators)
iterators: iterators,
}
} }
type mergeIterator struct { type mergeIterator struct {
@ -369,6 +367,11 @@ func (c *mergeIterator) Seek(t int64) bool {
} }
func (c *mergeIterator) At() (t int64, v float64) { func (c *mergeIterator) At() (t int64, v float64) {
if len(c.h) == 0 {
log.Error("mergeIterator.At() called after .Next() returned false.")
return 0, 0
}
// TODO do I need to dedupe or just merge? // TODO do I need to dedupe or just merge?
return c.h[0].At() return c.h[0].At()
} }