Remove unnecessary whitespace changes, add comment.

This commit is contained in:
Tom Wilkie 2017-07-13 11:16:35 +01:00
parent 98ac07f86a
commit 014bd31a86
2 changed files with 2 additions and 1 deletions

View file

@ -946,6 +946,7 @@ func (sl *scrapeLoop) addReportSample(app storage.Appender, s string, t int64, v
// Suffix s with the invalid \xff unicode rune to avoid collisions // Suffix s with the invalid \xff unicode rune to avoid collisions
// with scraped metrics. // with scraped metrics.
s2 := s + "\xff" s2 := s + "\xff"
ref, ok := sl.cache.getRef(s2) ref, ok := sl.cache.getRef(s2)
if ok { if ok {
met := sl.cache.lsets[ref].lset met := sl.cache.lsets[ref].lset
@ -963,7 +964,6 @@ func (sl *scrapeLoop) addReportSample(app storage.Appender, s string, t int64, v
return err return err
} }
} }
met := labels.Labels{ met := labels.Labels{
labels.Label{Name: labels.MetricName, Value: s}, labels.Label{Name: labels.MetricName, Value: s},
} }

View file

@ -162,6 +162,7 @@ type mergeQuerier struct {
queriers []Querier queriers []Querier
} }
// NewMergeQuerier returns a new Querier that merges results of input queriers.
func NewMergeQuerier(queriers []Querier) Querier { func NewMergeQuerier(queriers []Querier) Querier {
return &mergeQuerier{ return &mergeQuerier{
queriers: queriers, queriers: queriers,