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

Re-use label builder in promql aggregation (#5641)

Browse source 
For my benchmarks on aggregation this reduces allocations by ~5% (~10%
time improvement):

```
benchmark                                                    old ns/op     new ns/op     delta
BenchmarkEvaluations/benchdata/aggregators.test/promxy-4     727692        649626        -10.73%

benchmark                                                    old allocs     new allocs     delta
BenchmarkEvaluations/benchdata/aggregators.test/promxy-4     2566           2434           -5.14%

benchmark                                                    old bytes     new bytes     delta
BenchmarkEvaluations/benchdata/aggregators.test/promxy-4     162760        148854        -8.54%
```

Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>
This commit is contained in:
Thomas Jackson 2019-06-11 01:24:50 -07:00 committed by Brian Brazil
parent e23fa22233
commit a000cec011
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/labels/labels.go
View file

@ -292,6 +292,13 @@ func NewBuilder(base Labels) *Builder {
} }
} }
// Reset clears all current state for the builder
func (b *Builder) Reset(base Labels) {
b.base = base
b.del = b.del[:0]
b.add = b.add[:0]
}
// Del deletes the label of the given name. // Del deletes the label of the given name.
func (b *Builder) Del(ns ...string) *Builder { func (b *Builder) Del(ns ...string) *Builder {
for _, n := range ns { for _, n := range ns {

6
promql/engine.go
View file

@ -1718,11 +1718,13 @@ func (ev *evaluator) aggregation(op ItemType, grouping []string, without bool, p
} }
} }
lb := labels.NewBuilder(nil)
for _, s := range vec { for _, s := range vec {
metric := s.Metric metric := s.Metric
if op == ItemCountValues { if op == ItemCountValues {
lb := labels.NewBuilder(metric) lb.Reset(metric)
lb.Set(valueLabel, strconv.FormatFloat(s.V, 'f', -1, 64)) lb.Set(valueLabel, strconv.FormatFloat(s.V, 'f', -1, 64))
metric = lb.Labels() metric = lb.Labels()
} }
@ -1742,7 +1744,7 @@ func (ev *evaluator) aggregation(op ItemType, grouping []string, without bool, p
var m labels.Labels var m labels.Labels
if without { if without {
lb := labels.NewBuilder(metric) lb.Reset(metric)
lb.Del(grouping...) lb.Del(grouping...)
lb.Del(labels.MetricName) lb.Del(labels.MetricName)
m = lb.Labels() m = lb.Labels()