Fix input type

m3db · Sep 4, 2020 · 36c0c65 · 36c0c65
1 parent 4348ec5
commit 36c0c65
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/query/graphite/native/aggregation_functions.go b/src/query/graphite/native/aggregation_functions.go
@@ -137,22 +137,22 @@ func divideSeries(ctx *common.Context, dividendSeriesList, divisorSeriesList sin
 
 // aggregate takes a list of series and returns a new series containing the
 // value aggregated across the series at each datapoint using the specified function.
-func aggregate(ctx *common.Context, series multiplePathSpecs, fname string) (ts.SeriesList, error) {
+func aggregate(ctx *common.Context, series singlePathSpec, fname string) (ts.SeriesList, error) {
 	switch fname {
 	case Empty, Sum, SumSeries, Total:
-		return sumSeries(ctx, series)
+		return sumSeries(ctx, multiplePathSpecs(series))
 	case Min, MinSeries:
-		return minSeries(ctx, series)
+		return minSeries(ctx, multiplePathSpecs(series))
 	case Max, MaxSeries:
-		return maxSeries(ctx, series)
+		return maxSeries(ctx, multiplePathSpecs(series))
 	case Avg, Average, AverageSeries:
-		return averageSeries(ctx,series)
+		return averageSeries(ctx,multiplePathSpecs(series))
 	case Multiply, MultiplySeries:
-		return multiplySeries(ctx, series)
+		return multiplySeries(ctx, multiplePathSpecs(series))
 	case Diff, DiffSeries:
-		return diffSeries(ctx, series)
+		return diffSeries(ctx, multiplePathSpecs(series))
 	case Count, CountSeries:
-		return countSeries(ctx, series)
+		return countSeries(ctx, multiplePathSpecs(series))
 	default:
 		return ts.NewSeriesList(), errors.NewInvalidParamsError(fmt.Errorf("invalid func %s", fname))
 	}

diff --git a/src/query/graphite/native/aggregation_functions_test.go b/src/query/graphite/native/aggregation_functions_test.go
@@ -136,11 +136,11 @@ func TestSumSeries(t *testing.T) {
 
 func TestAggregate(t *testing.T) {
 	testAggregatedSeries(t, func(ctx *common.Context, series multiplePathSpecs) (ts.SeriesList, error) {
-		return aggregate(ctx, series, "sum")
+		return aggregate(ctx, singlePathSpec(series), "sum")
 	}, 15.0, 28.0, 30.0, 17.0, "invalid sum value for step %d")
 
 	testAggregatedSeries(t, func(ctx *common.Context, series multiplePathSpecs) (ts.SeriesList, error) {
-		return aggregate(ctx, series, "maxSeries")
+		return aggregate(ctx, singlePathSpec(series), "maxSeries")
 	}, 15.0, 15.0, 17.0, 17.0, "invalid max value for step %d")
 }