github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-21 14:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

app/vmselect/promql: add group() aggregate function to MetricsQL

Browse source 
This function has been added in Prometheus 2.20. See https://github.com/prometheus/prometheus/pull/7480
This commit is contained in:
Aliaksandr Valialkin 2020-07-17 15:16:01 +03:00
parent c64914a7e4
commit fc8fe38a82
6 changed files with 68 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/vmselect/promql/aggr.go
View file

@ -27,6 +27,7 @@ var aggrFuncs = map[string]aggrFunc{
"bottomk": newAggrFuncTopK(true),
"topk": newAggrFuncTopK(false),
"quantile": aggrFuncQuantile,
"group": aggrFuncGroup,
// PromQL extension funcs
"median": aggrFuncMedian,
@ -138,6 +139,27 @@ func aggrFuncAny(afa *aggrFuncArg) ([]*timeseries, error) {
return aggrFuncExt(afe, args[0], &afa.ae.Modifier, limit, true)
}
func aggrFuncGroup(afa *aggrFuncArg) ([]*timeseries, error) {
args := afa.args
if err := expectTransformArgsNum(args, 1); err != nil {
return nil, err
}
afe := func(tss []*timeseries) []*timeseries {
// See https://github.com/prometheus/prometheus/commit/72425d4e3d14d209cc3f3f6e10e3240411303399
values := tss[0].Values
for j := range values {
values[j] = 1
}
return tss[:1]
}
limit := afa.ae.Limit
if limit > 1 {
// Only a single time series per group must be returned
limit = 1
}
return aggrFuncExt(afe, args[0], &afa.ae.Modifier, limit, false)
}
func aggrFuncSum(tss []*timeseries) []*timeseries {
if len(tss) == 1 {
// Fast path - nothing to sum.

41
app/vmselect/promql/exec_test.go
View file

@ -3842,6 +3842,46 @@ func TestExecSuccess(t *testing.T) {
resultExpected := []netstorage.Result{r}
f(q, resultExpected)
})
t.Run(`group() by (test)`, func(t *testing.T) {
t.Parallel()
q := `group((
label_set(5, "__name__", "data", "test", "three samples", "point", "a"),
label_set(6, "__name__", "data", "test", "three samples", "point", "b"),
label_set(7, "__name__", "data", "test", "three samples", "point", "c"),
)) by (test)`
r := netstorage.Result{
MetricName: metricNameExpected,
Values: []float64{1, 1, 1, 1, 1, 1},
Timestamps: timestampsExpected,
}
r.MetricName.MetricGroup = nil
r.MetricName.Tags = []storage.Tag{{
Key: []byte("test"),
Value: []byte("three samples"),
}}
resultExpected := []netstorage.Result{r}
f(q, resultExpected)
})
t.Run(`group() without (point)`, func(t *testing.T) {
t.Parallel()
q := `group((
label_set(5, "__name__", "data", "test", "three samples", "point", "a"),
label_set(6, "__name__", "data", "test", "three samples", "point", "b"),
label_set(7, "__name__", "data", "test", "three samples", "point", "c"),
)) without (point)`
r := netstorage.Result{
MetricName: metricNameExpected,
Values: []float64{1, 1, 1, 1, 1, 1},
Timestamps: timestampsExpected,
}
r.MetricName.MetricGroup = nil
r.MetricName.Tags = []storage.Tag{{
Key: []byte("test"),
Value: []byte("three samples"),
}}
resultExpected := []netstorage.Result{r}
f(q, resultExpected)
})
t.Run(`topk(-1)`, func(t *testing.T) {
t.Parallel()
q := `sort(topk(-1, label_set(10, "foo", "bar") or label_set(time()/150, "baz", "sss")))`
@ -5632,6 +5672,7 @@ func TestExecError(t *testing.T) {
f(`count_values()`)
f(`quantile()`)
f(`any()`)
f(`group()`)
f(`topk()`)
f(`topk_min()`)
f(`topk_max()`)

2
go.mod
View file

@ -9,7 +9,7 @@ require (
// like https://github.com/valyala/fasthttp/commit/996610f021ff45fdc98c2ce7884d5fa4e7f9199b
github.com/VictoriaMetrics/fasthttp v1.0.1
github.com/VictoriaMetrics/metrics v1.11.3
github.com/VictoriaMetrics/metricsql v0.2.4
github.com/VictoriaMetrics/metricsql v0.2.5
github.com/aws/aws-sdk-go v1.33.5
github.com/cespare/xxhash/v2 v2.1.1
github.com/golang/snappy v0.0.1

4
go.sum
View file

@ -53,8 +53,8 @@ github.com/VictoriaMetrics/metrics v1.11.2 h1:t/ceLP6SvagUqypCKU7cI7+tQn54+TIV/t
github.com/VictoriaMetrics/metrics v1.11.2/go.mod h1:LU2j9qq7xqZYXz8tF3/RQnB2z2MbZms5TDiIg9/NHiQ=
github.com/VictoriaMetrics/metrics v1.11.3 h1:eSfXc0CrquKa1VTNUvhP+dhNjLUZHQGTFfp19mYCQWE=
github.com/VictoriaMetrics/metrics v1.11.3/go.mod h1:LU2j9qq7xqZYXz8tF3/RQnB2z2MbZms5TDiIg9/NHiQ=
github.com/VictoriaMetrics/metricsql v0.2.4 h1:240YwT8B4KITVFE7EOrf1rVvsY+5fYsAzyb+bI6/q50=
github.com/VictoriaMetrics/metricsql v0.2.4/go.mod h1:UIjd9S0W1UnTWlJdM0wLS+2pfuPqjwqKoK8yTos+WyE=
github.com/VictoriaMetrics/metricsql v0.2.5 h1:9kL+RA2yuPfMpYdqycRbKOJ9WKdDmPmV6hAju5L6ti0=
github.com/VictoriaMetrics/metricsql v0.2.5/go.mod h1:UIjd9S0W1UnTWlJdM0wLS+2pfuPqjwqKoK8yTos+WyE=
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
github.com/aws/aws-sdk-go v1.33.5 h1:p2fr1ryvNTU6avUWLI+/H7FGv0TBIjzVM5WDgXBBv4U=

1
vendor/github.com/VictoriaMetrics/metricsql/aggr.go generated vendored
View file

@ -17,6 +17,7 @@ var aggrFuncs = map[string]bool{
"bottomk": true,
"topk": true,
"quantile": true,
"group": true,
// MetricsQL extension funcs
"median": true,

2
vendor/modules.txt vendored
View file

@ -16,7 +16,7 @@ github.com/VictoriaMetrics/fasthttp/fasthttputil
github.com/VictoriaMetrics/fasthttp/stackless
# github.com/VictoriaMetrics/metrics v1.11.3
github.com/VictoriaMetrics/metrics
# github.com/VictoriaMetrics/metricsql v0.2.4
# github.com/VictoriaMetrics/metricsql v0.2.5
github.com/VictoriaMetrics/metricsql
github.com/VictoriaMetrics/metricsql/binaryop
# github.com/aws/aws-sdk-go v1.33.5