[query] Fix Graphite asPercent function to handle nodes and multiple …

…total divisor series (#3142)

src/dbnode/network/server/tchannelthrift/convert/convert_test.go

@@ -22,6 +22,7 @@ package convert_test
 
 import (
 	stdctx "context"
+	"errors"
 	"fmt"
 	"testing"
 	"time"
@@ -33,7 +34,6 @@ import (
 	"github.com/m3db/m3/src/dbnode/storage/limits"
 	"github.com/m3db/m3/src/dbnode/x/xpool"
 	"github.com/m3db/m3/src/m3ninx/idx"
-	"github.com/m3db/m3/src/query/graphite/errors"
 	xerrors "github.com/m3db/m3/src/x/errors"
 	"github.com/m3db/m3/src/x/ident"
 	"github.com/m3db/m3/src/x/pool"

src/query/api/v1/handler/graphite/render.go

@@ -32,11 +32,11 @@ import (
 	"github.com/m3db/m3/src/query/api/v1/options"
 	"github.com/m3db/m3/src/query/block"
 	"github.com/m3db/m3/src/query/graphite/common"
-	"github.com/m3db/m3/src/query/graphite/errors"
 	"github.com/m3db/m3/src/query/graphite/native"
 	graphite "github.com/m3db/m3/src/query/graphite/storage"
 	"github.com/m3db/m3/src/query/graphite/ts"
 	"github.com/m3db/m3/src/query/models"
+	"github.com/m3db/m3/src/x/errors"
 	"github.com/m3db/m3/src/x/headers"
 	xhttp "github.com/m3db/m3/src/x/net/http"
 )

src/query/api/v1/handler/graphite/render_parser.go

@@ -22,6 +22,7 @@ package graphite
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"math"
@@ -31,11 +32,11 @@ import (
 
 	"github.com/m3db/m3/src/query/api/v1/handler/graphite/pickle"
 	"github.com/m3db/m3/src/query/api/v1/options"
-	"github.com/m3db/m3/src/query/graphite/errors"
 	"github.com/m3db/m3/src/query/graphite/graphite"
 	"github.com/m3db/m3/src/query/graphite/ts"
 	"github.com/m3db/m3/src/query/storage"
 	"github.com/m3db/m3/src/query/util/json"
+	xerrors "github.com/m3db/m3/src/x/errors"
 	xhttp "github.com/m3db/m3/src/x/net/http"
 )
 
@@ -47,8 +48,8 @@ const (
 )
 
 var (
-	errNoTarget           = errors.NewInvalidParamsError(errors.New("no 'target' specified"))
-	errFromNotBeforeUntil = errors.NewInvalidParamsError(errors.New("'from' must come before 'until'"))
+	errNoTarget           = xerrors.NewInvalidParamsError(errors.New("no 'target' specified"))
+	errFromNotBeforeUntil = xerrors.NewInvalidParamsError(errors.New("'from' must come before 'until'"))
 )
 
 // WriteRenderResponse writes the response to a render request
@@ -124,15 +125,15 @@ func ParseRenderRequest(
 		now,
 		tzOffsetForAbsoluteTime,
 	); err != nil {
-		return nil, p, nil, errors.NewInvalidParamsError(fmt.Errorf("invalid 'from': %s", fromString))
+		return nil, p, nil, xerrors.NewInvalidParamsError(fmt.Errorf("invalid 'from': %s", fromString))
 	}
 
 	if p.Until, err = graphite.ParseTime(
 		untilString,
 		now,
 		tzOffsetForAbsoluteTime,
 	); err != nil {
-		return nil, p, nil, errors.NewInvalidParamsError(fmt.Errorf("invalid 'until': %s", untilString))
+		return nil, p, nil, xerrors.NewInvalidParamsError(fmt.Errorf("invalid 'until': %s", untilString))
 	}
 
 	if !p.From.Before(p.Until) {
@@ -156,8 +157,8 @@ func ParseRenderRequest(
 	if len(offset) > 0 {
 		dur, err := graphite.ParseDuration(offset)
 		if err != nil {
-			err = errors.NewInvalidParamsError(err)
-			return nil, p, nil, errors.NewRenamedError(err, fmt.Errorf("invalid 'offset': %w", err))
+			err = xerrors.NewInvalidParamsError(err)
+			return nil, p, nil, xerrors.NewRenamedError(err, fmt.Errorf("invalid 'offset': %w", err))
 		}
 
 		p.Until = p.Until.Add(dur)
@@ -169,7 +170,7 @@ func ParseRenderRequest(
 		p.MaxDataPoints, err = strconv.ParseInt(maxDataPointsString, 10, 64)
 
 		if err != nil || p.MaxDataPoints < 1 {
-			return nil, p, nil, errors.NewInvalidParamsError(fmt.Errorf("invalid 'maxDataPoints': %s", maxDataPointsString))
+			return nil, p, nil, xerrors.NewInvalidParamsError(fmt.Errorf("invalid 'maxDataPoints': %s", maxDataPointsString))
 		}
 	} else {
 		p.MaxDataPoints = math.MaxInt64
@@ -182,9 +183,9 @@ func ParseRenderRequest(
 		p.From,
 		tzOffsetForAbsoluteTime,
 	); err != nil && len(compareString) != 0 {
-		return nil, p, nil, errors.NewInvalidParamsError(fmt.Errorf("invalid 'compare': %s", compareString))
+		return nil, p, nil, xerrors.NewInvalidParamsError(fmt.Errorf("invalid 'compare': %s", compareString))
 	} else if p.From.Before(compareFrom) {
-		return nil, p, nil, errors.NewInvalidParamsError(fmt.Errorf("'compare' must be in the past"))
+		return nil, p, nil, xerrors.NewInvalidParamsError(fmt.Errorf("'compare' must be in the past"))
 	} else {
 		p.Compare = compareFrom.Sub(p.From)
 	}

src/query/api/v1/handler/prom/prom.go

@@ -21,18 +21,17 @@
 package prom
 
 import (
+	"errors"
 	"net/http"
 	"time"
 
+	"github.com/prometheus/prometheus/promql"
+	"github.com/prometheus/prometheus/promql/parser"
 	promstorage "github.com/prometheus/prometheus/storage"
 
 	"github.com/m3db/m3/src/query/api/v1/options"
 	"github.com/m3db/m3/src/query/block"
-	"github.com/m3db/m3/src/query/graphite/errors"
 	"github.com/m3db/m3/src/query/storage/prometheus"
-
-	"github.com/prometheus/prometheus/promql"
-	"github.com/prometheus/prometheus/promql/parser"
 )
 
 // NB: since Prometheus engine is not brought up in the usual fashion,

src/query/graphite/common/aliasing.go

@@ -26,8 +26,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/m3db/m3/src/query/graphite/errors"
 	"github.com/m3db/m3/src/query/graphite/ts"
+	"github.com/m3db/m3/src/x/errors"
 )
 
 var (

src/query/graphite/common/basic_functions.go

@@ -21,24 +21,25 @@
 package common
 
 import (
+	"errors"
 	"fmt"
 	"math"
 	"regexp"
 	"strconv"
 	"strings"
 	"time"
 
-	"github.com/m3db/m3/src/query/graphite/errors"
 	"github.com/m3db/m3/src/query/graphite/ts"
+	xerrors "github.com/m3db/m3/src/x/errors"
 )
 
 var (
 	// ErrNegativeCount occurs when the request count is < 0.
-	ErrNegativeCount = errors.NewInvalidParamsError(errors.New("n must be positive"))
+	ErrNegativeCount = xerrors.NewInvalidParamsError(errors.New("n must be positive"))
 	// ErrEmptySeriesList occurs when a function requires a series as input
-	ErrEmptySeriesList = errors.NewInvalidParamsError(errors.New("empty series list"))
+	ErrEmptySeriesList = xerrors.NewInvalidParamsError(errors.New("empty series list"))
 	// ErrInvalidIntervalFormat occurs when invalid interval string encountered
-	ErrInvalidIntervalFormat = errors.NewInvalidParamsError(errors.New("invalid format"))
+	ErrInvalidIntervalFormat = xerrors.NewInvalidParamsError(errors.New("invalid format"))
 
 	reInterval *regexp.Regexp
 
@@ -115,7 +116,7 @@ func Identity(ctx *Context, name string) (ts.SeriesList, error) {
 func Normalize(ctx *Context, input ts.SeriesList) (ts.SeriesList, time.Time, time.Time, int, error) {
 	numSeries := input.Len()
 	if numSeries == 0 {
-		return ts.NewSeriesList(), ctx.StartTime, ctx.EndTime, -1, errors.NewInvalidParamsError(ErrEmptySeriesList)
+		return ts.NewSeriesList(), ctx.StartTime, ctx.EndTime, -1, xerrors.NewInvalidParamsError(ErrEmptySeriesList)
 	}
 	if numSeries == 1 {
 		return input, input.Values[0].StartTime(), input.Values[0].EndTime(), input.Values[0].MillisPerStep(), nil
@@ -186,14 +187,15 @@ func ParseInterval(fullInterval string) (time.Duration, error) {
 	allIntervals := reInterval.FindAllString(fullInterval, -1)
 	output := time.Duration(0)
 	if allIntervals == nil {
-		return 0, errors.NewInvalidParamsError(fmt.Errorf("Unrecognized interval string: %s", fullInterval))
+		return 0, xerrors.NewInvalidParamsError(
+			fmt.Errorf("unrecognized interval string: %s", fullInterval))
 	}
-	
+
 	for _, interval := range allIntervals {
 		if m := reInterval.FindStringSubmatch(strings.TrimSpace(interval)); len(m) != 0 {
 			amount, err := strconv.ParseInt(m[1], 10, 32)
 			if err != nil {
-				return 0, errors.NewInvalidParamsError(err)
+				return 0, xerrors.NewInvalidParamsError(err)
 			}
 
 			interval := intervals[strings.ToLower(m[2])]

src/query/graphite/common/basic_functions_test.go

@@ -25,8 +25,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/m3db/m3/src/query/graphite/errors"
 	"github.com/m3db/m3/src/query/graphite/ts"
+	"github.com/m3db/m3/src/x/errors"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -110,10 +110,10 @@ func TestNormalize(t *testing.T) {
 	require.Equal(t, expectedEnd, end)
 	require.Equal(t, expectedStep, step)
 	expected := []TestSeries{
-		TestSeries{Name: "a", Data: []float64{nan, nan, nan, 10, 10, 10, 10, 10, 10, nan, nan, nan}},
-		TestSeries{Name: "b", Data: []float64{15, 15, 15, 15, 15, 15, nan, nan, nan, nan, nan, nan}},
-		TestSeries{Name: "c", Data: []float64{nan, nan, nan, nan, nan, nan, 17, 17, 17, 17, 17, 17}},
-		TestSeries{Name: "d", Data: []float64{nan, nan, nan, 3, 3, 3, 3, 3, 3, nan, nan, nan}},
+		{Name: "a", Data: []float64{nan, nan, nan, 10, 10, 10, 10, 10, 10, nan, nan, nan}},
+		{Name: "b", Data: []float64{15, 15, 15, 15, 15, 15, nan, nan, nan, nan, nan, nan}},
+		{Name: "c", Data: []float64{nan, nan, nan, nan, nan, nan, 17, 17, 17, 17, 17, 17}},
+		{Name: "d", Data: []float64{nan, nan, nan, 3, 3, 3, 3, 3, 3, nan, nan, nan}},
 	}
 
 	CompareOutputsAndExpected(t, expectedStep, expectedStart, expected, normalized.Values)

src/query/graphite/common/percentiles.go

@@ -25,8 +25,8 @@ import (
 	"math"
 	"sort"
 
-	"github.com/m3db/m3/src/query/graphite/errors"
 	"github.com/m3db/m3/src/query/graphite/ts"
+	"github.com/m3db/m3/src/x/errors"
 )
 
 const (

src/query/graphite/common/transform.go

@@ -24,8 +24,8 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/m3db/m3/src/query/graphite/errors"
 	"github.com/m3db/m3/src/query/graphite/ts"
+	"github.com/m3db/m3/src/x/errors"
 )
 
 // TransformFunc is used by Transform to apply a function

src/query/graphite/graphite/glob.go

@@ -25,7 +25,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/m3db/m3/src/query/graphite/errors"
+	"github.com/m3db/m3/src/x/errors"
 )
 
 const (