Merge pull request #1050 from cortexproject/maps-yno

tomwilkie · web-flow · commit ed37310553e0 · 2018-10-02T20:48:04.000+01:00
Small optimisation in chunk indexing
diff --git a/pkg/util/extract/extract.go b/pkg/util/extract/extract.go
@@ -22,10 +22,8 @@ func MetricNameFromLabelPairs(labels []client.LabelPair) ([]byte, error) {
 
 // MetricNameFromMetric extract the metric name from a model.Metric
 func MetricNameFromMetric(m model.Metric) (model.LabelValue, error) {
-	for name, value := range m {
-		if name == model.MetricNameLabel {
-			return value, nil
-		}
+	if value, found := m[model.MetricNameLabel]; found {
+		return value, nil
 	}
 	return "", fmt.Errorf("no MetricNameLabel for chunk")
 }

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,8 @@ func MetricNameFromLabelPairs(labels []client.LabelPair) ([]byte, error) {`
`22`	`22`
`23`	`23`	`// MetricNameFromMetric extract the metric name from a model.Metric`
`24`	`24`	`func MetricNameFromMetric(m model.Metric) (model.LabelValue, error) {`
`25`		`- for name, value := range m {`
`26`		`- if name == model.MetricNameLabel {`
`27`		`- return value, nil`
`28`		`- }`
	`25`	`+ if value, found := m[model.MetricNameLabel]; found {`
	`26`	`+ return value, nil`
`29`	`27`	`}`
`30`	`28`	`return "", fmt.Errorf("no MetricNameLabel for chunk")`
`31`	`29`	`}`