mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-12 16:44:05 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #4185 from prometheus/4184-dedup-read-recent

Browse source 
Dedupe samples in the mergeIterator.
This commit is contained in:
Tom Wilkie 2018-05-23 12:43:07 +01:00 committed by GitHub
parent 2b228b4260 ba418780be
commit 18e6fa7c8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
storage/fanout.go
View file

@ -432,7 +432,6 @@ func (c *mergeIterator) At() (t int64, v float64) {
panic("mergeIterator.At() called after .Next() returned false.") panic("mergeIterator.At() called after .Next() returned false.")
} }
// TODO do I need to dedupe or just merge?
return c.h[0].At() return c.h[0].At()
} }
@ -443,6 +442,7 @@ func (c *mergeIterator) Next() bool {
heap.Push(&c.h, iter) heap.Push(&c.h, iter)
} }
} }
return len(c.h) > 0 return len(c.h) > 0
} }
@ -450,9 +450,17 @@ func (c *mergeIterator) Next() bool {
return false return false
} }
iter := heap.Pop(&c.h).(SeriesIterator) currt, currv := c.At()
if iter.Next() { for len(c.h) > 0 {
heap.Push(&c.h, iter) nextt, nextv := c.h[0].At()
if nextt != currt || nextv != currv {
break
}
iter := heap.Pop(&c.h).(SeriesIterator)
if iter.Next() {
heap.Push(&c.h, iter)
}
} }
return len(c.h) > 0 return len(c.h) > 0

8
storage/fanout_test.go
View file

@ -136,6 +136,14 @@ func TestMergeIterator(t *testing.T) {
}, },
expected: []sample{{0, 0}, {1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5}}, expected: []sample{{0, 0}, {1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5}},
}, },
{
input: []SeriesIterator{
newListSeriesIterator([]sample{{0, 0}, {1, 1}}),
newListSeriesIterator([]sample{{0, 0}, {2, 2}}),
newListSeriesIterator([]sample{{2, 2}, {3, 3}}),
},
expected: []sample{{0, 0}, {1, 1}, {2, 2}, {3, 3}},
},
} { } {
merged := newMergeIterator(tc.input) merged := newMergeIterator(tc.input)
actual := drainSamples(merged) actual := drainSamples(merged)