From 303e70db25daac93e2a892004fdaa1cbc6772d15 Mon Sep 17 00:00:00 2001 From: Mario Trangoni Date: Thu, 20 Sep 2018 20:05:19 +0200 Subject: [PATCH] pkg/tsdb/elasticsearch/response_parser.go: simplify redundant code $ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./... pkg/tsdb/elasticsearch/response_parser.go:95:41:warning: should use make(map[string]string) instead (S1019) (megacheck) pkg/tsdb/elasticsearch/response_parser.go:125:41:warning: should use make(map[string]string) instead (S1019) (megacheck) pkg/tsdb/elasticsearch/response_parser.go:317:5:warning: redundant break statement (S1023) (megacheck) pkg/tsdb/elasticsearch/response_parser.go:358:5:warning: redundant break statement (S1023) (megacheck) --- pkg/tsdb/elasticsearch/response_parser.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/tsdb/elasticsearch/response_parser.go b/pkg/tsdb/elasticsearch/response_parser.go index 7bdab60389c..0090754840a 100644 --- a/pkg/tsdb/elasticsearch/response_parser.go +++ b/pkg/tsdb/elasticsearch/response_parser.go @@ -92,7 +92,7 @@ func (rp *responseParser) processBuckets(aggs map[string]interface{}, target *Qu } else { for _, b := range esAgg.Get("buckets").MustArray() { bucket := simplejson.NewFromAny(b) - newProps := make(map[string]string, 0) + newProps := make(map[string]string) for k, v := range props { newProps[k] = v @@ -122,7 +122,7 @@ func (rp *responseParser) processBuckets(aggs map[string]interface{}, target *Qu for _, bucketKey := range bucketKeys { bucket := simplejson.NewFromAny(buckets[bucketKey]) - newProps := make(map[string]string, 0) + newProps := make(map[string]string) for k, v := range props { newProps[k] = v @@ -314,7 +314,6 @@ func (rp *responseParser) processAggregationDocs(esAgg *simplejson.Json, aggDef switch metric.Type { case "count": addMetricValue(&values, rp.getMetricName(metric.Type), castToNullFloat(bucket.Get("doc_count"))) - break case "extended_stats": metaKeys := make([]string, 0) meta := metric.Meta.MustMap() @@ -355,7 +354,6 @@ func (rp *responseParser) processAggregationDocs(esAgg *simplejson.Json, aggDef } addMetricValue(&values, metricName, castToNullFloat(bucket.GetPath(metric.ID, "value"))) - break } }