Merge Grafana's fork changes

expr/functions/aliasByBase64/function.go

@@ -46,8 +46,7 @@ func (f *aliasByBase64) Do(ctx context.Context, e parser.Expr, from, until int64
 		if withoutFieldArg {
 			decoded, err := base64.StdEncoding.DecodeString(a.Name)
 			if err == nil {
-				r = a.CopyLink()
-				r.Name = string(decoded)
+				r = a.CopyName(string(decoded))
 			} else {
 				r = a
 			}

expr/functions/cairo/png/cairo.go

@@ -13,6 +13,7 @@ import (
 	"net/http"
 	"os"
 	"sort"
+	"strconv"
 	"strings"
 	"time"
 
@@ -790,7 +791,7 @@ func EvalExprGraph(ctx context.Context, e parser.Expr, from, until int64, values
 					return nil, err
 				}
 				r.Dashed = d
-				r.Tags["dashed"] = fmt.Sprintf("%f", d)
+				r.Tags["dashed"] = strconv.FormatFloat(d, 'g', -1, 64)
 			case "drawAsInfinite":
 				r.DrawAsInfinite = true
 				r.Tags["drawAsInfinite"] = "1"

expr/functions/delay/function.go

@@ -2,7 +2,6 @@ package delay
 
 import (
 	"context"
-	"fmt"
 	"math"
 
 	"github.com/go-graphite/carbonapi/expr/helper"
@@ -65,7 +64,7 @@ func (f *delay) Do(ctx context.Context, e parser.Expr, from, until int64, values
 
 		result := series.CopyName("delay(" + series.Name + "," + stepsStr + ")")
 		result.Values = newValues
-		result.Tags["delay"] = fmt.Sprintf("%d", steps)
+		result.Tags["delay"] = stepsStr
 
 		results[i] = result
 	}

expr/functions/exp/function.go

@@ -2,7 +2,6 @@ package exp
 
 import (
 	"context"
-	"fmt"
 	"math"
 
 	"github.com/go-graphite/carbonapi/expr/helper"
@@ -38,7 +37,7 @@ func (f *exp) Do(ctx context.Context, e parser.Expr, from, until int64, values m
 
 	for _, a := range args {
 		r := a.CopyLink()
-		r.Name = fmt.Sprintf("exp(%s)", a.Name)
+		r.Name = "exp(" + a.Name + ")"
 		r.Values = make([]float64, len(a.Values))
 		r.Tags["exp"] = "e"
 

expr/functions/exponentialMovingAverage/function.go

@@ -79,7 +79,7 @@ func (f *exponentialMovingAverage) Do(ctx context.Context, e parser.Expr, from,
 
 	for _, a := range arg {
 		r := a.CopyLink()
-		r.Name = fmt.Sprintf("%s(%s,%s)", e.Target(), a.Name, argstr)
+		r.Name = e.Target() + "(" + a.Name + "," + argstr + ")"
 
 		var vals []float64
 

expr/functions/identity/function.go

@@ -2,7 +2,6 @@ package identity
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/go-graphite/carbonapi/expr/interfaces"
 	"github.com/go-graphite/carbonapi/expr/types"
@@ -46,7 +45,7 @@ func (f *identity) Do(ctx context.Context, e parser.Expr, from, until int64, val
 
 	p := types.MetricData{
 		FetchResponse: pb.FetchResponse{
-			Name:              fmt.Sprintf("identity(%s)", name),
+			Name:              "identity(" + name + ")",
 			StartTime:         from,
 			StopTime:          until,
 			StepTime:          step,

expr/functions/integralByInterval/function.go

@@ -2,7 +2,6 @@ package integralByInterval
 
 import (
 	"context"
-	"fmt"
 	"math"
 
 	"github.com/go-graphite/carbonapi/expr/helper"
@@ -55,7 +54,7 @@ func (f *integralByInterval) Do(ctx context.Context, e parser.Expr, from, until
 		current := 0.0
 		currentTime := arg.StartTime
 
-		name := fmt.Sprintf("integralByInterval(%s,'%s')", arg.Name, e.Args()[1].StringValue())
+		name := "integralByInterval(" + arg.Name + ",'" + e.Args()[1].StringValue() + "')"
 		result := arg.CopyLink()
 		result.Name = name
 		result.PathExpression = name

expr/functions/linearRegression/function.go

@@ -2,8 +2,8 @@ package linearRegression
 
 import (
 	"context"
-	"fmt"
 	"math"
+	"strconv"
 
 	"github.com/go-graphite/carbonapi/expr/consolidations"
 	"github.com/go-graphite/carbonapi/expr/helper"
@@ -45,9 +45,9 @@ func (f *linearRegression) Do(ctx context.Context, e parser.Expr, from, until in
 	for _, a := range arg {
 		r := a.CopyLink()
 		if len(e.Args()) > 2 {
-			r.Name = fmt.Sprintf("linearRegression(%s,'%s','%s')", a.GetName(), e.Arg(1).StringValue(), e.Arg(2).StringValue())
+			r.Name = "linearRegression(" + a.GetName() + ",'" + e.Arg(1).StringValue() + "','" + e.Arg(2).StringValue() + "')"
 		} else if len(e.Args()) > 1 {
-			r.Name = fmt.Sprintf("linearRegression(%s,'%s')", a.GetName(), e.Arg(2).StringValue())
+			r.Name = "linearRegression(" + a.GetName() + ",'" + e.Arg(1).StringValue() + "')"
 		} else {
 			r.Name = "linearRegression(" + a.Name + ")"
 		}
@@ -88,7 +88,7 @@ func (f *linearRegression) Do(ctx context.Context, e parser.Expr, from, until in
 		for i := range r.Values {
 			r.Values[i] = consolidations.Poly(float64(i), c.RawMatrix().Data...)
 		}
-		r.Tags["linearRegressions"] = fmt.Sprintf("%d, %d", a.GetStartTime(), a.GetStopTime())
+		r.Tags["linearRegressions"] = strconv.FormatInt(a.GetStartTime(), 10) + ", " + strconv.FormatInt(a.GetStopTime(), 10)
 
 		results = append(results, r)
 	}

expr/functions/movingMedian/function.go

@@ -2,7 +2,6 @@ package movingMedian
 
 import (
 	"context"
-	"fmt"
 	"math"
 	"strconv"
 
@@ -144,7 +143,7 @@ func (f *movingMedian) Do(ctx context.Context, e parser.Expr, from, until int64,
 				}
 			}
 		}
-		r.Tags["movingMedian"] = fmt.Sprintf("%d", windowSize)
+		r.Tags["movingMedian"] = argstr
 		result[n] = r
 	}
 	return result, nil

expr/functions/nPercentile/function.go

@@ -2,7 +2,6 @@ package nPercentile
 
 import (
 	"context"
-	"fmt"
 	"math"
 	"strconv"
 
@@ -46,9 +45,9 @@ func (f *nPercentile) Do(ctx context.Context, e parser.Expr, from, until int64,
 	results := make([]*types.MetricData, len(arg))
 	for i, a := range arg {
 		r := a.CopyLink()
-		r.Name = fmt.Sprintf("nPercentile(%s,%s)", a.Name, percentStr)
+		r.Name = "nPercentile(" + a.Name + "," + percentStr + ")"
 		r.Values = make([]float64, len(a.Values))
-		r.Tags["nPercentile"] = fmt.Sprintf("%f", percent)
+		r.Tags["nPercentile"] = percentStr
 		var values []float64
 		for _, v := range a.Values {
 			if !math.IsNaN(v) {

expr/functions/offset/function.go

@@ -44,7 +44,7 @@ func (f *offset) Do(ctx context.Context, e parser.Expr, from, until int64, value
 
 	for i, a := range arg {
 		r := a.CopyLink()
-		r.Name = fmt.Sprintf("%s(%s,%s)", e.Target(), a.Name, factorStr)
+		r.Name = e.Target() + "(" + a.Name + "," + factorStr + ")"
 		r.Values = make([]float64, len(a.Values))
 		r.Tags[e.Target()] = fmt.Sprintf("%f", factor)
 

expr/functions/offsetToZero/function.go

@@ -2,8 +2,8 @@ package offsetToZero
 
 import (
 	"context"
-	"fmt"
 	"math"
+	"strconv"
 
 	"github.com/go-graphite/carbonapi/expr/helper"
 	"github.com/go-graphite/carbonapi/expr/interfaces"
@@ -42,7 +42,7 @@ func (f *offsetToZero) Do(ctx context.Context, e parser.Expr, from, until int64,
 		for i, v := range a.Values {
 			r.Values[i] = v - minimum
 		}
-		r.Tags["offsetToZero"] = fmt.Sprintf("%f", minimum)
+		r.Tags["offsetToZero"] = strconv.FormatFloat(minimum, 'g', -1, 64)
 		return r
 	})
 }

expr/functions/pow/function.go

@@ -2,7 +2,6 @@ package pow
 
 import (
 	"context"
-	"fmt"
 	"math"
 	"strconv"
 
@@ -45,9 +44,9 @@ func (f *pow) Do(ctx context.Context, e parser.Expr, from, until int64, values m
 
 	for j, a := range arg {
 		r := a.CopyLink()
-		r.Name = fmt.Sprintf("pow(%s,%s)", a.Name, factorStr)
+		r.Name = "pow(" + a.Name + "," + factorStr + ")"
 		r.Values = make([]float64, len(a.Values))
-		r.Tags["pow"] = fmt.Sprintf("%f", factor)
+		r.Tags["pow"] = factorStr
 
 		for i, v := range a.Values {
 			if math.IsNaN(v) {

expr/functions/removeBelowSeries/function.go

@@ -2,8 +2,8 @@ package removeBelowSeries
 
 import (
 	"context"
-	"fmt"
 	"math"
+	"strconv"
 	"strings"
 
 	"github.com/go-graphite/carbonapi/expr/consolidations"
@@ -72,7 +72,7 @@ func (f *removeBelowSeries) Do(ctx context.Context, e parser.Expr, from, until i
 		r := a.CopyLink()
 		r.Name = e.Target() + "(" + a.Name + ", " + numberStr + ")"
 		r.Values = make([]float64, len(a.Values))
-		r.Tags["removeBelowSeries"] = fmt.Sprintf("%f", threshold)
+		r.Tags["removeBelowSeries"] = strconv.FormatFloat(threshold, 'f', -1, 64)
 
 		for i, v := range a.Values {
 			if math.IsNaN(v) || condition(v, threshold) {

expr/functions/removeBetweenPercentile/function.go

@@ -2,8 +2,8 @@ package removeBetweenPercentile
 
 import (
 	"context"
-	"fmt"
 	"math"
+	"strconv"
 
 	"github.com/go-graphite/carbonapi/expr/consolidations"
 	"github.com/go-graphite/carbonapi/expr/helper"
@@ -67,9 +67,10 @@ func (f *removeBetweenPercentile) Do(ctx context.Context, e parser.Expr, from, u
 		}
 	}
 
+	numberStr := strconv.FormatFloat(number, 'f', -1, 64)
 	for i, a := range args {
 		r := a.CopyLink()
-		r.Name = fmt.Sprintf("%s(%s, %g)", e.Target(), a.Name, number)
+		r.Name = e.Target() + "(" + a.Name + ", " + numberStr + ")"
 
 		for _, v := range a.Values {
 			if !(v > lowerThresholds[i] && v < higherThresholds[i]) {

expr/functions/round/function.go

@@ -2,7 +2,6 @@ package round
 
 import (
 	"context"
-	"fmt"
 	"strconv"
 
 	"github.com/go-graphite/carbonapi/expr/helper"
@@ -41,9 +40,7 @@ func (f *round) Do(ctx context.Context, e parser.Expr, from, until int64, values
 	if err != nil {
 		return nil, err
 	}
-	if withPrecision {
-		precisionStr = strconv.Itoa(precision)
-	}
+	precisionStr = strconv.Itoa(precision)
 
 	results := make([]*types.MetricData, len(arg))
 	for j, a := range arg {
@@ -59,7 +56,7 @@ func (f *round) Do(ctx context.Context, e parser.Expr, from, until int64, values
 			r.Values[i] = helper.SafeRound(v, precision)
 		}
 
-		r.Tags["round"] = fmt.Sprintf("%d", precision)
+		r.Tags["round"] = precisionStr
 		results[j] = r
 
 	}

expr/functions/scale/function.go

@@ -2,7 +2,6 @@ package scale
 
 import (
 	"context"
-	"fmt"
 	"strconv"
 
 	"github.com/go-graphite/carbonapi/expr/helper"
@@ -51,11 +50,10 @@ func (f *scale) Do(ctx context.Context, e parser.Expr, from, until int64, values
 		if timestamp == 0 {
 			r.Name = "scale(" + a.Name + "," + scaleStr + ")"
 		} else {
-			r.Name = fmt.Sprintf("scale(%s,%g,%d)", a.Name, scale, timestamp)
 			r.Name = "scale(" + a.Name + "," + scaleStr + "," + e.Arg(2).StringValue() + ")"
 		}
 		r.Values = make([]float64, len(a.Values))
-		r.Tags["scale"] = fmt.Sprintf("%f", scale)
+		r.Tags["scale"] = scaleStr
 
 		currentTimestamp := a.StartTime
 		for i, v := range a.Values {

expr/functions/scaleToSeconds/function.go

@@ -2,7 +2,6 @@ package scaleToSeconds
 
 import (
 	"context"
-	"fmt"
 	"strconv"
 
 	"github.com/go-graphite/carbonapi/expr/helper"
@@ -47,7 +46,7 @@ func (f *scaleToSeconds) Do(ctx context.Context, e parser.Expr, from, until int6
 		r := a.CopyLink()
 		r.Name = "scaleToSeconds(" + a.Name + "," + secondsStr + ")"
 		r.Values = make([]float64, len(a.Values))
-		r.Tags["scaleToSeconds"] = fmt.Sprintf("%f", seconds)
+		r.Tags["scaleToSeconds"] = secondsStr
 
 		factor := seconds / float64(a.StepTime)
 

expr/functions/sigmoid/function.go

@@ -2,7 +2,6 @@ package sigmoid
 
 import (
 	"context"
-	"fmt"
 	"math"
 
 	"github.com/go-graphite/carbonapi/expr/helper"
@@ -39,7 +38,7 @@ func (f *sigmoid) Do(ctx context.Context, e parser.Expr, from, until int64, valu
 
 	for _, a := range arg {
 		r := a.CopyLink()
-		r.Name = fmt.Sprintf("sigmoid(%s)", a.Name)
+		r.Name = "sigmoid(" + a.Name + ")"
 		r.Values = make([]float64, len(a.Values))
 		r.Tags["sigmoid"] = "sigmoid"
 

expr/functions/timeSlice/function.go

@@ -2,7 +2,6 @@ package timeSlice
 
 import (
 	"context"
-	"fmt"
 	"math"
 	"strconv"
 	"time"
@@ -60,8 +59,8 @@ func (f *timeSlice) Do(ctx context.Context, e parser.Expr, from, until int64, va
 		r := a.CopyLink()
 		r.Name = "timeSlice(" + a.Name + "," + startStr + "," + endStr + ")"
 		r.Values = make([]float64, len(a.Values))
-		r.Tags["timeSliceStart"] = fmt.Sprintf("%d", start)
-		r.Tags["timeSliceEnd"] = fmt.Sprintf("%d", end)
+		r.Tags["timeSliceStart"] = startStr
+		r.Tags["timeSliceEnd"] = endStr
 
 		current := from
 		for i, v := range a.Values {

expr/functions/timeStack/function.go

@@ -3,6 +3,7 @@ package timeStack
 import (
 	"context"
 	"fmt"
+	"strconv"
 
 	"github.com/go-graphite/carbonapi/expr/helper"
 	"github.com/go-graphite/carbonapi/expr/interfaces"
@@ -34,6 +35,7 @@ func (f *timeStack) Do(ctx context.Context, e parser.Expr, from, until int64, va
 	if err != nil {
 		return nil, err
 	}
+	unitStr := e.Arg(1).StringValue()
 
 	start, err := e.GetIntArg(2)
 	if err != nil {
@@ -55,13 +57,14 @@ func (f *timeStack) Do(ctx context.Context, e parser.Expr, from, until int64, va
 			return nil, err
 		}
 
+		offsStr := strconv.FormatInt(offs, 10)
 		for _, a := range arg {
 			r := a.CopyLink()
 			r.Name = fmt.Sprintf("timeShift(%s,%d)", a.Name, offs)
 			r.StartTime = a.StartTime - offs
 			r.StopTime = a.StopTime - offs
-			r.Tags["timeShiftUnit"] = fmt.Sprintf("%d", unit)
-			r.Tags["timeShift"] = fmt.Sprintf("%d", offs)
+			r.Tags["timeShiftUnit"] = unitStr
+			r.Tags["timeShift"] = offsStr
 			results = append(results, r)
 		}
 	}