mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-28 14:12:10 -08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

Propagate errors through mergeSeriesSet correctly.

Browse source
This commit is contained in:
Tom Wilkie 2017-07-13 15:02:01 +01:00
parent 2e0d8487e3
commit 994a7f27d6
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
storage/fanout.go
View file

@ -246,7 +246,8 @@ func (q *mergeQuerier) Close() error {
type mergeSeriesSet struct { type mergeSeriesSet struct {
currentLabels labels.Labels currentLabels labels.Labels
currentSets []SeriesSet currentSets []SeriesSet
sets seriesSetHeap heap seriesSetHeap
sets []SeriesSet
} }
func newMergeSeriesSet(sets []SeriesSet) SeriesSet { func newMergeSeriesSet(sets []SeriesSet) SeriesSet {
@ -259,7 +260,8 @@ func newMergeSeriesSet(sets []SeriesSet) SeriesSet {
} }
} }
return &mergeSeriesSet{ return &mergeSeriesSet{
sets: h, heap: h,
sets: sets,
} }
} }
@ -268,18 +270,18 @@ func (c *mergeSeriesSet) Next() bool {
// we can drop them, otherwise they should be inserted back into the heap. // we can drop them, otherwise they should be inserted back into the heap.
for _, set := range c.currentSets { for _, set := range c.currentSets {
if set.Next() { if set.Next() {
heap.Push(&c.sets, set) heap.Push(&c.heap, set)
} }
} }
if len(c.sets) == 0 { if len(c.heap) == 0 {
return false return false
} }
// Now, pop items of the heap that have equal label sets. // Now, pop items of the heap that have equal label sets.
c.currentSets = nil c.currentSets = nil
c.currentLabels = c.sets[0].At().Labels() c.currentLabels = c.heap[0].At().Labels()
for len(c.sets) > 0 && labels.Equal(c.currentLabels, c.sets[0].At().Labels()) { for len(c.heap) > 0 && labels.Equal(c.currentLabels, c.heap[0].At().Labels()) {
set := heap.Pop(&c.sets).(SeriesSet) set := heap.Pop(&c.heap).(SeriesSet)
c.currentSets = append(c.currentSets, set) c.currentSets = append(c.currentSets, set)
} }
return true return true