Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[query] implemented Graphite's powSeries function #3038

Merged
merged 10 commits into from
Dec 28, 2020
7 changes: 7 additions & 0 deletions src/query/graphite/native/aggregation_functions.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,13 @@ func minSeries(ctx *common.Context, series multiplePathSpecs) (ts.SeriesList, er
return combineSeries(ctx, series, wrapPathExpr(minSeriesFnName, ts.SeriesList(series)), ts.Min)
}

// powSeries takes a list of series and returns a new series containing the
// pow value across the series at each datapoint
DeanWahle marked this conversation as resolved.
Show resolved Hide resolved
// nolint: hugeParam
robskillington marked this conversation as resolved.
Show resolved Hide resolved
func powSeries(ctx *common.Context, series multiplePathSpecs) (ts.SeriesList, error) {
return combineSeries(ctx, series, wrapPathExpr(powSeriesFnName, ts.SeriesList(series)), ts.Pow)
}

// maxSeries takes a list of series and returns a new series containing the
// maximum value across the series at each datapoint
func maxSeries(ctx *common.Context, series multiplePathSpecs) (ts.SeriesList, error) {
Expand Down
34 changes: 34 additions & 0 deletions src/query/graphite/native/aggregation_functions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,40 @@ func TestStdDevSeries(t *testing.T) {
common.CompareOutputsAndExpected(t, 60000, start, expectedResults, result.Values)
}

func TestPowSeries(t *testing.T) {
var (
ctrl = xgomock.NewController(t)
store = storage.NewMockStorage(ctrl)
now = time.Now().Truncate(time.Hour)
engine = NewEngine(store, CompileOptions{})
startTime = now.Add(-3 * time.Minute)
endTime = now.Add(-time.Minute)
ctx = common.NewContext(common.ContextOptions{
Start: startTime,
End: endTime,
Engine: engine,
})
)

fakeSeries1 := ts.NewSeries(ctx, "foo.bar.g.zed.g", startTime,
common.NewTestSeriesValues(ctx, 60000, []float64{0, 1, 2, 3, 4}))
fakeSeries2 := ts.NewSeries(ctx, "foo.bar.g.zed.g", startTime,
common.NewTestSeriesValues(ctx, 60000, []float64{2, 4, 1, 3, 3}))
fakeSeries3 := ts.NewSeries(ctx, "foo.bar.g.zed.g", startTime,
common.NewTestSeriesValues(ctx, 60000, []float64{5, 4, 3, 2, 1}))

listOfFakeSeries := []*ts.Series{fakeSeries1, fakeSeries2, fakeSeries3}

expectedValues := []float64{0, 1, 8, 729, 64}
result, err := powSeries(ctx, multiplePathSpecs(singlePathSpec{Values: listOfFakeSeries}))
if err != nil {
fmt.Println(err)
}
for i := 0; i < result.Values[0].Len(); i++ {
require.Equal(t, result.Values[0].ValueAt(i), expectedValues[i])
}
}

func TestAggregate(t *testing.T) {
testAggregatedSeries(t, func(ctx *common.Context, series multiplePathSpecs) (ts.SeriesList, error) {
return aggregate(ctx, singlePathSpec(series), "sum")
Expand Down
1 change: 1 addition & 0 deletions src/query/graphite/native/builtin_functions.go
Original file line number Diff line number Diff line change
Expand Up @@ -2471,6 +2471,7 @@ func init() {
MustRegisterFunction(perSecond).WithDefaultParams(map[uint8]interface{}{
2: math.NaN(), // maxValue
})
MustRegisterFunction(powSeries)
MustRegisterFunction(rangeOfSeries)
MustRegisterFunction(randomWalkFunction).WithDefaultParams(map[uint8]interface{}{
2: 60, // step
Expand Down
1 change: 1 addition & 0 deletions src/query/graphite/native/builtin_functions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3528,6 +3528,7 @@ func TestFunctionsRegistered(t *testing.T) {
"offset",
"offsetToZero",
"perSecond",
"powSeries",
"randomWalk",
"randomWalkFunction",
"rangeOfSeries",
Expand Down
1 change: 1 addition & 0 deletions src/query/graphite/native/functions.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ const (
minSeriesFnName = "minSeries"
multiplyFnName = "multiply"
multiplySeriesFnName = "multiplySeries"
powSeriesFnName = "powSeries"
rangeFnName = "range"
rangeOfFnName = "rangeOf"
rangeOfSeriesFnName = "rangeOfSeries"
Expand Down
3 changes: 3 additions & 0 deletions src/query/graphite/ts/series.go
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,9 @@ func Max(a, b float64, count int) float64 { return math.Max(a, b) }
// Last finds the latter of two values.
func Last(a, b float64, count int) float64 { return b }

// Pow returns the first value to the power of the second value
func Pow(a, b float64, count int) float64 { return math.Pow(a, b) }

// Median finds the median of a slice of values.
func Median(vals []float64, count int) float64 {
if count < 1 {
Expand Down