From dc5cf8f57c5fb7e81c8e1251a8cad5b80469798b Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Wed, 29 Apr 2020 09:31:50 -0400 Subject: [PATCH] Allow to aggregate binary operations. (#1970) * Allow to aggregate binary operations. For example: `sum by (job) (count_over_time({namespace="tns"}[5m] |= "level=error") / count_over_time({namespace="tns"}[5m]))` would have failed previously. Signed-off-by: Cyril Tovena * Add missing () rules in yacc. Signed-off-by: Cyril Tovena --- pkg/logql/ast_test.go | 5 + pkg/logql/engine_test.go | 52 ++++++ pkg/logql/expr.y | 34 ++-- pkg/logql/expr.y.go | 375 ++++++++++++++++++++++----------------- pkg/logql/parser_test.go | 74 +++++++- 5 files changed, 355 insertions(+), 185 deletions(-) diff --git a/pkg/logql/ast_test.go b/pkg/logql/ast_test.go index 511e38419962..c0ced73b991a 100644 --- a/pkg/logql/ast_test.go +++ b/pkg/logql/ast_test.go @@ -64,6 +64,11 @@ func Test_SampleExpr_String(t *testing.T) { sum by (cluster) (count_over_time({job="postgres"}[5m])) `, `sum by (cluster) (count_over_time({job="mysql"}[5m])) / min(count_over_time({job="mysql"}[5m])) `, + `sum by (job) ( + count_over_time({namespace="tns"} |= "level=error"[5m]) + / + count_over_time({namespace="tns"}[5m]) + )`, } { t.Run(tc, func(t *testing.T) { expr, err := ParseExpr(tc) diff --git a/pkg/logql/engine_test.go b/pkg/logql/engine_test.go index 1add8d72bfe9..7d6cf71917ac 100644 --- a/pkg/logql/engine_test.go +++ b/pkg/logql/engine_test.go @@ -1006,6 +1006,58 @@ func TestEngine_NewRangeQuery(t *testing.T) { }, }, }, + { + `avg by (app) ( + sum by (app) (rate({app=~"foo|bar"} |~".+bar" [1m])) + + sum by (app) (rate({app=~"foo|bar"} |~".+bar" [1m])) / + sum by (app) (rate({app=~"foo|bar"} |~".+bar" [1m])) + ) * 2 + `, + time.Unix(60, 0), time.Unix(180, 0), 30 * time.Second, logproto.FORWARD, 100, + [][]*logproto.Stream{ + { + newStream(testSize, factor(5, identity), `{app="foo"}`), + newStream(testSize, factor(5, identity), `{app="bar"}`), + }, + }, + []SelectParams{ + {&logproto.QueryRequest{Direction: logproto.FORWARD, Start: time.Unix(0, 0), End: time.Unix(180, 0), Limit: 0, Selector: `{app=~"foo|bar"}|~".+bar"`}}, + }, + promql.Matrix{ + promql.Series{ + Metric: labels.Labels{{Name: "app", Value: "bar"}}, + Points: []promql.Point{{T: 60 * 1000, V: 2.4}, {T: 90 * 1000, V: 2.4}, {T: 120 * 1000, V: 2.4}, {T: 150 * 1000, V: 2.4}, {T: 180 * 1000, V: 2.4}}, + }, + promql.Series{ + Metric: labels.Labels{{Name: "app", Value: "foo"}}, + Points: []promql.Point{{T: 60 * 1000, V: 2.4}, {T: 90 * 1000, V: 2.4}, {T: 120 * 1000, V: 2.4}, {T: 150 * 1000, V: 2.4}, {T: 180 * 1000, V: 2.4}}, + }, + }, + }, + { + ` sum ( + sum by (app) (rate({app=~"foo|bar"} |~".+bar" [1m])) + + sum by (app) (rate({app=~"foo|bar"} |~".+bar" [1m])) / + sum by (app) (rate({app=~"foo|bar"} |~".+bar" [1m])) + ) + 1 + `, + time.Unix(60, 0), time.Unix(180, 0), 30 * time.Second, logproto.FORWARD, 100, + [][]*logproto.Stream{ + { + newStream(testSize, factor(5, identity), `{app="foo"}`), + newStream(testSize, factor(5, identity), `{app="bar"}`), + }, + }, + []SelectParams{ + {&logproto.QueryRequest{Direction: logproto.FORWARD, Start: time.Unix(0, 0), End: time.Unix(180, 0), Limit: 0, Selector: `{app=~"foo|bar"}|~".+bar"`}}, + }, + promql.Matrix{ + promql.Series{ + Metric: labels.Labels{}, + Points: []promql.Point{{T: 60 * 1000, V: 3.4}, {T: 90 * 1000, V: 3.4}, {T: 120 * 1000, V: 3.4}, {T: 150 * 1000, V: 3.4}, {T: 180 * 1000, V: 3.4}}, + }, + }, + }, { `1+1--1`, time.Unix(60, 0), time.Unix(180, 0), 30 * time.Second, 0, logproto.FORWARD, 100, diff --git a/pkg/logql/expr.y b/pkg/logql/expr.y index ee042818c35c..2b844851fa4b 100644 --- a/pkg/logql/expr.y +++ b/pkg/logql/expr.y @@ -20,6 +20,7 @@ import ( RangeOp string Selector []*labels.Matcher VectorAggregationExpr SampleExpr + MetricExpr SampleExpr VectorOp string BinOpExpr SampleExpr binOp string @@ -35,6 +36,7 @@ import ( %type grouping %type labels %type logExpr +%type metricExpr %type logRangeExpr %type matcher %type matchers @@ -64,11 +66,15 @@ root: expr { exprlex.(*lexer).expr = $1 }; expr: logExpr { $$ = $1 } - | rangeAggregationExpr { $$ = $1 } - | vectorAggregationExpr { $$ = $1 } - | binOpExpr { $$ = $1 } - | literalExpr { $$ = $1 } - | OPEN_PARENTHESIS expr CLOSE_PARENTHESIS { $$ = $2 } + | metricExpr { $$ = $1 } + ; + +metricExpr: + rangeAggregationExpr { $$ = $1 } + | vectorAggregationExpr { $$ = $1 } + | binOpExpr { $$ = $1 } + | literalExpr { $$ = $1 } + | OPEN_PARENTHESIS metricExpr CLOSE_PARENTHESIS { $$ = $2 } ; logExpr: @@ -91,17 +97,12 @@ rangeAggregationExpr: rangeOp OPEN_PARENTHESIS logRangeExpr CLOSE_PARENTHESIS { vectorAggregationExpr: // Aggregations with 1 argument. - vectorOp OPEN_PARENTHESIS rangeAggregationExpr CLOSE_PARENTHESIS { $$ = mustNewVectorAggregationExpr($3, $1, nil, nil) } - | vectorOp OPEN_PARENTHESIS vectorAggregationExpr CLOSE_PARENTHESIS { $$ = mustNewVectorAggregationExpr($3, $1, nil, nil) } - | vectorOp grouping OPEN_PARENTHESIS rangeAggregationExpr CLOSE_PARENTHESIS { $$ = mustNewVectorAggregationExpr($4, $1, $2, nil,) } - | vectorOp grouping OPEN_PARENTHESIS vectorAggregationExpr CLOSE_PARENTHESIS { $$ = mustNewVectorAggregationExpr($4, $1, $2, nil,) } - | vectorOp OPEN_PARENTHESIS rangeAggregationExpr CLOSE_PARENTHESIS grouping { $$ = mustNewVectorAggregationExpr($3, $1, $5, nil) } - | vectorOp OPEN_PARENTHESIS vectorAggregationExpr CLOSE_PARENTHESIS grouping { $$ = mustNewVectorAggregationExpr($3, $1, $5, nil) } + vectorOp OPEN_PARENTHESIS metricExpr CLOSE_PARENTHESIS { $$ = mustNewVectorAggregationExpr($3, $1, nil, nil) } + | vectorOp grouping OPEN_PARENTHESIS metricExpr CLOSE_PARENTHESIS { $$ = mustNewVectorAggregationExpr($4, $1, $2, nil,) } + | vectorOp OPEN_PARENTHESIS metricExpr CLOSE_PARENTHESIS grouping { $$ = mustNewVectorAggregationExpr($3, $1, $5, nil) } // Aggregations with 2 arguments. - | vectorOp OPEN_PARENTHESIS NUMBER COMMA vectorAggregationExpr CLOSE_PARENTHESIS { $$ = mustNewVectorAggregationExpr($5, $1, nil, &$3) } - | vectorOp OPEN_PARENTHESIS NUMBER COMMA vectorAggregationExpr CLOSE_PARENTHESIS grouping { $$ = mustNewVectorAggregationExpr($5, $1, $7, &$3) } - | vectorOp OPEN_PARENTHESIS NUMBER COMMA rangeAggregationExpr CLOSE_PARENTHESIS { $$ = mustNewVectorAggregationExpr($5, $1, nil, &$3) } - | vectorOp OPEN_PARENTHESIS NUMBER COMMA rangeAggregationExpr CLOSE_PARENTHESIS grouping { $$ = mustNewVectorAggregationExpr($5, $1, $7, &$3) } + | vectorOp OPEN_PARENTHESIS NUMBER COMMA metricExpr CLOSE_PARENTHESIS { $$ = mustNewVectorAggregationExpr($5, $1, nil, &$3) } + | vectorOp OPEN_PARENTHESIS NUMBER COMMA metricExpr CLOSE_PARENTHESIS grouping { $$ = mustNewVectorAggregationExpr($5, $1, $7, &$3) } ; filter: @@ -144,11 +145,13 @@ binOpExpr: | expr DIV expr { $$ = mustNewBinOpExpr("/", $1, $3) } | expr MOD expr { $$ = mustNewBinOpExpr("%", $1, $3) } | expr POW expr { $$ = mustNewBinOpExpr("^", $1, $3) } + ; literalExpr: NUMBER { $$ = mustNewLiteralExpr( $1, false ) } | ADD NUMBER { $$ = mustNewLiteralExpr( $2, false ) } | SUB NUMBER { $$ = mustNewLiteralExpr( $2, true ) } + ; vectorOp: SUM { $$ = OpTypeSum } @@ -165,6 +168,7 @@ vectorOp: rangeOp: COUNT_OVER_TIME { $$ = OpTypeCountOverTime } | RATE { $$ = OpTypeRate } + ; labels: diff --git a/pkg/logql/expr.y.go b/pkg/logql/expr.y.go index 451430fd76a2..1ca0540835de 100644 --- a/pkg/logql/expr.y.go +++ b/pkg/logql/expr.y.go @@ -1,14 +1,18 @@ // Code generated by goyacc -p expr -o pkg/logql/expr.y.go pkg/logql/expr.y. DO NOT EDIT. +//line pkg/logql/expr.y:2 package logql -import ( - __yyfmt__ "fmt" - "time" +import __yyfmt__ "fmt" +//line pkg/logql/expr.y:2 + +import ( "github.com/prometheus/prometheus/pkg/labels" + "time" ) +//line pkg/logql/expr.y:10 type exprSymType struct { yys int Expr Expr @@ -23,6 +27,7 @@ type exprSymType struct { RangeOp string Selector []*labels.Matcher VectorAggregationExpr SampleExpr + MetricExpr SampleExpr VectorOp string BinOpExpr SampleExpr binOp string @@ -127,6 +132,9 @@ const exprEofCode = 1 const exprErrCode = 2 const exprInitialStackSize = 16 +//line pkg/logql/expr.y:183 + +//line yacctab:1 var exprExca = [...]int{ -1, 1, 1, -1, @@ -144,7 +152,7 @@ var exprExca = [...]int{ 44, 2, 45, 2, -2, 0, - -1, 43, + -1, 44, 37, 2, 38, 2, 39, 2, @@ -159,105 +167,100 @@ var exprExca = [...]int{ const exprPrivate = 57344 -const exprLast = 220 +const exprLast = 199 var exprAct = [...]int{ - 46, 5, 4, 36, 53, 96, 12, 3, 68, 32, - 33, 34, 35, 35, 15, 45, 43, 47, 48, 47, - 48, 117, 8, 93, 116, 112, 16, 17, 18, 19, - 21, 22, 20, 23, 24, 25, 26, 113, 113, 66, - 13, 14, 115, 114, 111, 92, 91, 72, 71, 76, - 75, 74, 69, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 44, 85, 80, 50, 15, 95, 94, 89, 90, - 49, 103, 98, 70, 99, 30, 31, 32, 33, 34, - 35, 102, 107, 108, 85, 109, 110, 28, 29, 30, - 31, 32, 33, 34, 35, 73, 16, 17, 18, 19, - 21, 22, 20, 23, 24, 25, 26, 119, 120, 81, - 82, 83, 84, 101, 100, 16, 17, 18, 19, 21, - 22, 20, 23, 24, 25, 26, 2, 37, 78, 7, - 105, 86, 88, 104, 65, 42, 41, 64, 40, 118, - 41, 77, 40, 54, 79, 38, 39, 97, 67, 38, - 39, 52, 106, 54, 55, 56, 57, 58, 59, 60, - 61, 62, 63, 86, 6, 11, 9, 37, 10, 51, - 1, 0, 41, 0, 40, 0, 41, 0, 40, 0, - 0, 38, 39, 0, 87, 38, 39, 37, 67, 0, - 37, 0, 88, 0, 0, 0, 41, 0, 40, 41, - 0, 40, 0, 0, 0, 38, 39, 0, 38, 39, + 52, 4, 37, 100, 48, 3, 78, 14, 43, 36, + 112, 51, 44, 53, 54, 11, 31, 32, 33, 34, + 35, 36, 108, 6, 53, 54, 97, 17, 18, 19, + 20, 22, 23, 21, 24, 25, 26, 27, 82, 109, + 109, 15, 16, 11, 111, 110, 11, 33, 34, 35, + 36, 80, 85, 81, 6, 84, 79, 68, 17, 18, + 19, 20, 22, 23, 21, 24, 25, 26, 27, 83, + 50, 98, 15, 16, 73, 104, 67, 86, 103, 66, + 90, 91, 56, 55, 89, 99, 95, 96, 88, 102, + 29, 30, 31, 32, 33, 34, 35, 36, 106, 91, + 107, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 45, 2, 38, 114, 87, 113, 92, 94, 47, 101, + 49, 42, 49, 41, 10, 42, 9, 41, 13, 8, + 39, 40, 5, 69, 39, 40, 12, 105, 71, 57, + 58, 59, 60, 61, 62, 63, 64, 65, 92, 7, + 46, 70, 38, 1, 72, 0, 0, 42, 0, 41, + 0, 42, 0, 41, 0, 0, 39, 40, 0, 93, + 39, 40, 38, 69, 0, 38, 0, 94, 0, 0, + 0, 42, 0, 41, 42, 0, 41, 0, 0, 0, + 39, 40, 0, 39, 40, 74, 75, 76, 77, } var exprPact = [...]int{ - 0, -1000, 25, 198, -1000, -1000, -1000, -1000, 0, -1000, - 49, -7, -1000, 74, 68, 159, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 142, -1000, -1000, -1000, - -1000, -1000, 16, 175, 61, 99, 29, 28, 27, -1000, - -1000, 136, 58, -1000, 109, 59, 45, 45, -33, -33, - -32, -32, -32, -32, -1000, -1000, -1000, -1000, 171, 195, - 61, 23, 22, 5, 80, 153, 153, -1000, -1000, 149, - -1000, 119, 118, 86, 76, 138, -1000, -1000, -1000, 135, - 139, -5, -5, 80, 21, 2, 20, -1000, 19, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 1, - -2, -1000, -1000, 145, -1000, -1000, -5, -5, -1000, -1000, - -1000, + 1, -1000, 64, 173, -1000, -1000, 1, -1000, -1000, -1000, + -1000, 116, 48, -11, -1000, 77, 76, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 74, -1000, -1000, + -1000, -1000, -1000, 34, 150, 64, 136, 59, -1000, 185, + 29, 32, 47, 33, 30, -1000, -1000, 52, -24, -24, + 5, 5, -36, -36, -36, -36, -1000, -1000, -1000, -1000, + -1000, -1000, 118, -1000, 109, 83, 79, 75, 146, 170, + 29, 3, 53, 1, 115, 115, -1000, -1000, -1000, -1000, + -1000, 73, -1000, -1000, -1000, 110, 114, 0, 1, -1, + 22, -1000, 21, -1000, -1000, -1000, -1000, -13, -1000, 111, + -1000, -1000, 0, -1000, -1000, } var exprPgo = [...]int{ - 0, 180, 136, 3, 0, 5, 7, 8, 4, 179, - 2, 178, 176, 1, 175, 174, 139, + 0, 153, 110, 2, 0, 3, 5, 1, 6, 4, + 150, 149, 136, 132, 129, 128, 126, 124, } var exprR1 = [...]int{ - 0, 1, 2, 2, 2, 2, 2, 2, 6, 6, - 6, 6, 6, 7, 7, 7, 7, 7, 10, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 3, - 3, 3, 3, 12, 12, 12, 9, 9, 8, 8, - 8, 8, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 16, 16, 16, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 11, 11, 5, 5, 4, 4, + 0, 1, 2, 2, 7, 7, 7, 7, 7, 6, + 6, 6, 6, 6, 8, 8, 8, 8, 8, 11, + 14, 14, 14, 14, 14, 3, 3, 3, 3, 13, + 13, 13, 10, 10, 9, 9, 9, 9, 16, 16, + 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 12, + 12, 5, 5, 4, 4, } var exprR2 = [...]int{ - 0, 1, 1, 1, 1, 1, 1, 3, 1, 3, - 3, 3, 2, 2, 3, 3, 3, 2, 4, 4, - 4, 5, 5, 5, 5, 6, 7, 6, 7, 1, - 1, 1, 1, 3, 3, 3, 1, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 1, 2, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 3, 4, 4, + 0, 1, 1, 1, 1, 1, 1, 1, 3, 1, + 3, 3, 3, 2, 2, 3, 3, 3, 2, 4, + 4, 5, 5, 6, 7, 1, 1, 1, 1, 3, + 3, 3, 1, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 1, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 3, 4, 4, } var exprChk = [...]int{ - -1000, -1, -2, -6, -10, -13, -15, -16, 22, -12, - -11, -14, 6, 40, 41, 14, 26, 27, 28, 29, - 32, 30, 31, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, -3, 2, 20, 21, - 13, 11, -2, -6, 22, 22, -4, 24, 25, 6, - 6, -9, 2, -8, 4, -2, -2, -2, -2, -2, - -2, -2, -2, -2, 5, 2, 23, 23, -7, -6, - 22, -10, -13, 6, 22, 22, 22, 15, 2, 18, - 15, 10, 11, 12, 13, -3, 2, 23, 7, -6, - -7, 23, 23, 18, -10, -13, -5, 4, -5, -8, - 5, 5, 5, 5, 5, 2, 23, -4, -4, -13, - -10, 23, 23, 18, 23, 23, 23, 23, 4, -4, - -4, + -1000, -1, -2, -6, -7, -13, 22, -11, -14, -16, + -17, 14, -12, -15, 6, 40, 41, 26, 27, 28, + 29, 32, 30, 31, 33, 34, 35, 36, 37, 38, + 39, 40, 41, 42, 43, 44, 45, -3, 2, 20, + 21, 13, 11, -7, -6, -2, -10, 2, -9, 4, + 22, 22, -4, 24, 25, 6, 6, -2, -2, -2, + -2, -2, -2, -2, -2, -2, 5, 2, 23, 23, + 15, 2, 18, 15, 10, 11, 12, 13, -8, -6, + 22, -7, 6, 22, 22, 22, -9, 5, 5, 5, + 5, -3, 2, 23, 7, -6, -8, 23, 18, -7, + -5, 4, -5, 5, 2, 23, -4, -7, 23, 18, + 23, 23, 23, 4, -4, } var exprDef = [...]int{ - 0, -2, 1, -2, 3, 4, 5, 6, 0, 8, - 0, 0, 51, 0, 0, 0, 63, 64, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 12, 29, 30, - 31, 32, 0, -2, 0, 0, 0, 0, 0, 52, - 53, 0, 0, 36, 0, 42, 43, 44, 45, 46, - 47, 48, 49, 50, 9, 11, 7, 10, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 33, 34, 0, - 35, 0, 0, 0, 0, 0, 17, 18, 13, 0, - 0, 19, 20, 0, 0, 0, 0, 65, 0, 37, - 38, 39, 40, 41, 14, 16, 15, 23, 24, 0, - 0, 21, 22, 0, 67, 68, 25, 27, 66, 26, - 28, + 0, -2, 1, -2, 3, 9, 0, 4, 5, 6, + 7, 0, 0, 0, 47, 0, 0, 59, 60, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 13, 25, + 26, 27, 28, 3, -2, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 48, 49, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 10, 12, 8, 11, + 29, 30, 0, 31, 0, 0, 0, 0, 0, 0, + 0, 3, 47, 0, 0, 0, 33, 34, 35, 36, + 37, 0, 18, 19, 14, 0, 0, 20, 0, 3, + 0, 61, 0, 15, 17, 16, 22, 3, 21, 0, + 63, 64, 23, 62, 24, } var exprTok1 = [...]int{ @@ -281,6 +284,8 @@ var exprErrorMessages = [...]struct { msg string }{} +//line yaccpar:1 + /* parser for yacc output */ var ( @@ -612,320 +617,360 @@ exprdefault: case 1: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:65 { exprlex.(*lexer).expr = exprDollar[1].Expr } case 2: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:68 { exprVAL.Expr = exprDollar[1].LogExpr } case 3: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:69 { - exprVAL.Expr = exprDollar[1].RangeAggregationExpr + exprVAL.Expr = exprDollar[1].MetricExpr } case 4: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:73 { - exprVAL.Expr = exprDollar[1].VectorAggregationExpr + exprVAL.MetricExpr = exprDollar[1].RangeAggregationExpr } case 5: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:74 { - exprVAL.Expr = exprDollar[1].BinOpExpr + exprVAL.MetricExpr = exprDollar[1].VectorAggregationExpr } case 6: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:75 { - exprVAL.Expr = exprDollar[1].LiteralExpr + exprVAL.MetricExpr = exprDollar[1].BinOpExpr } case 7: - exprDollar = exprS[exprpt-3 : exprpt+1] + exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:76 { - exprVAL.Expr = exprDollar[2].Expr + exprVAL.MetricExpr = exprDollar[1].LiteralExpr } case 8: + exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:77 + { + exprVAL.MetricExpr = exprDollar[2].MetricExpr + } + case 9: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:81 { exprVAL.LogExpr = newMatcherExpr(exprDollar[1].Selector) } - case 9: + case 10: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:82 { exprVAL.LogExpr = NewFilterExpr(exprDollar[1].LogExpr, exprDollar[2].Filter, exprDollar[3].str) } - case 10: + case 11: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:83 { exprVAL.LogExpr = exprDollar[2].LogExpr } - case 13: + case 14: exprDollar = exprS[exprpt-2 : exprpt+1] +//line pkg/logql/expr.y:89 { exprVAL.LogRangeExpr = newLogRange(exprDollar[1].LogExpr, exprDollar[2].duration) } - case 14: + case 15: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:90 { exprVAL.LogRangeExpr = addFilterToLogRangeExpr(exprDollar[1].LogRangeExpr, exprDollar[2].Filter, exprDollar[3].str) } - case 15: + case 16: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:91 { exprVAL.LogRangeExpr = exprDollar[2].LogRangeExpr } - case 18: - exprDollar = exprS[exprpt-4 : exprpt+1] - { - exprVAL.RangeAggregationExpr = newRangeAggregationExpr(exprDollar[3].LogRangeExpr, exprDollar[1].RangeOp) - } case 19: exprDollar = exprS[exprpt-4 : exprpt+1] +//line pkg/logql/expr.y:96 { - exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[3].RangeAggregationExpr, exprDollar[1].VectorOp, nil, nil) + exprVAL.RangeAggregationExpr = newRangeAggregationExpr(exprDollar[3].LogRangeExpr, exprDollar[1].RangeOp) } case 20: exprDollar = exprS[exprpt-4 : exprpt+1] +//line pkg/logql/expr.y:100 { - exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[3].VectorAggregationExpr, exprDollar[1].VectorOp, nil, nil) + exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[3].MetricExpr, exprDollar[1].VectorOp, nil, nil) } case 21: exprDollar = exprS[exprpt-5 : exprpt+1] +//line pkg/logql/expr.y:101 { - exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[4].RangeAggregationExpr, exprDollar[1].VectorOp, exprDollar[2].Grouping, nil) + exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[4].MetricExpr, exprDollar[1].VectorOp, exprDollar[2].Grouping, nil) } case 22: exprDollar = exprS[exprpt-5 : exprpt+1] +//line pkg/logql/expr.y:102 { - exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[4].VectorAggregationExpr, exprDollar[1].VectorOp, exprDollar[2].Grouping, nil) + exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[3].MetricExpr, exprDollar[1].VectorOp, exprDollar[5].Grouping, nil) } case 23: - exprDollar = exprS[exprpt-5 : exprpt+1] - { - exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[3].RangeAggregationExpr, exprDollar[1].VectorOp, exprDollar[5].Grouping, nil) - } - case 24: - exprDollar = exprS[exprpt-5 : exprpt+1] - { - exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[3].VectorAggregationExpr, exprDollar[1].VectorOp, exprDollar[5].Grouping, nil) - } - case 25: exprDollar = exprS[exprpt-6 : exprpt+1] +//line pkg/logql/expr.y:104 { - exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[5].VectorAggregationExpr, exprDollar[1].VectorOp, nil, &exprDollar[3].str) - } - case 26: - exprDollar = exprS[exprpt-7 : exprpt+1] - { - exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[5].VectorAggregationExpr, exprDollar[1].VectorOp, exprDollar[7].Grouping, &exprDollar[3].str) + exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[5].MetricExpr, exprDollar[1].VectorOp, nil, &exprDollar[3].str) } - case 27: - exprDollar = exprS[exprpt-6 : exprpt+1] - { - exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[5].RangeAggregationExpr, exprDollar[1].VectorOp, nil, &exprDollar[3].str) - } - case 28: + case 24: exprDollar = exprS[exprpt-7 : exprpt+1] +//line pkg/logql/expr.y:105 { - exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[5].RangeAggregationExpr, exprDollar[1].VectorOp, exprDollar[7].Grouping, &exprDollar[3].str) + exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[5].MetricExpr, exprDollar[1].VectorOp, exprDollar[7].Grouping, &exprDollar[3].str) } - case 29: + case 25: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:109 { exprVAL.Filter = labels.MatchRegexp } - case 30: + case 26: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:110 { exprVAL.Filter = labels.MatchEqual } - case 31: + case 27: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:111 { exprVAL.Filter = labels.MatchNotRegexp } - case 32: + case 28: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:112 { exprVAL.Filter = labels.MatchNotEqual } - case 33: + case 29: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:116 { exprVAL.Selector = exprDollar[2].Matchers } - case 34: + case 30: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:117 { exprVAL.Selector = exprDollar[2].Matchers } - case 35: + case 31: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:118 { } - case 36: + case 32: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:122 { exprVAL.Matchers = []*labels.Matcher{exprDollar[1].Matcher} } - case 37: + case 33: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:123 { exprVAL.Matchers = append(exprDollar[1].Matchers, exprDollar[3].Matcher) } - case 38: + case 34: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:127 { exprVAL.Matcher = mustNewMatcher(labels.MatchEqual, exprDollar[1].str, exprDollar[3].str) } - case 39: + case 35: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:128 { exprVAL.Matcher = mustNewMatcher(labels.MatchNotEqual, exprDollar[1].str, exprDollar[3].str) } - case 40: + case 36: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:129 { exprVAL.Matcher = mustNewMatcher(labels.MatchRegexp, exprDollar[1].str, exprDollar[3].str) } - case 41: + case 37: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:130 { exprVAL.Matcher = mustNewMatcher(labels.MatchNotRegexp, exprDollar[1].str, exprDollar[3].str) } - case 42: + case 38: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:139 { exprVAL.BinOpExpr = mustNewBinOpExpr("or", exprDollar[1].Expr, exprDollar[3].Expr) } - case 43: + case 39: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:140 { exprVAL.BinOpExpr = mustNewBinOpExpr("and", exprDollar[1].Expr, exprDollar[3].Expr) } - case 44: + case 40: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:141 { exprVAL.BinOpExpr = mustNewBinOpExpr("unless", exprDollar[1].Expr, exprDollar[3].Expr) } - case 45: + case 41: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:142 { exprVAL.BinOpExpr = mustNewBinOpExpr("+", exprDollar[1].Expr, exprDollar[3].Expr) } - case 46: + case 42: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:143 { exprVAL.BinOpExpr = mustNewBinOpExpr("-", exprDollar[1].Expr, exprDollar[3].Expr) } - case 47: + case 43: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:144 { exprVAL.BinOpExpr = mustNewBinOpExpr("*", exprDollar[1].Expr, exprDollar[3].Expr) } - case 48: + case 44: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:145 { exprVAL.BinOpExpr = mustNewBinOpExpr("/", exprDollar[1].Expr, exprDollar[3].Expr) } - case 49: + case 45: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:146 { exprVAL.BinOpExpr = mustNewBinOpExpr("%", exprDollar[1].Expr, exprDollar[3].Expr) } - case 50: + case 46: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:147 { exprVAL.BinOpExpr = mustNewBinOpExpr("^", exprDollar[1].Expr, exprDollar[3].Expr) } - case 51: + case 47: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:151 { exprVAL.LiteralExpr = mustNewLiteralExpr(exprDollar[1].str, false) } - case 52: + case 48: exprDollar = exprS[exprpt-2 : exprpt+1] +//line pkg/logql/expr.y:152 { exprVAL.LiteralExpr = mustNewLiteralExpr(exprDollar[2].str, false) } - case 53: + case 49: exprDollar = exprS[exprpt-2 : exprpt+1] +//line pkg/logql/expr.y:153 { exprVAL.LiteralExpr = mustNewLiteralExpr(exprDollar[2].str, true) } - case 54: + case 50: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:157 { exprVAL.VectorOp = OpTypeSum } - case 55: + case 51: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:158 { exprVAL.VectorOp = OpTypeAvg } - case 56: + case 52: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:159 { exprVAL.VectorOp = OpTypeCount } - case 57: + case 53: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:160 { exprVAL.VectorOp = OpTypeMax } - case 58: + case 54: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:161 { exprVAL.VectorOp = OpTypeMin } - case 59: + case 55: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:162 { exprVAL.VectorOp = OpTypeStddev } - case 60: + case 56: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:163 { exprVAL.VectorOp = OpTypeStdvar } - case 61: + case 57: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:164 { exprVAL.VectorOp = OpTypeBottomK } - case 62: + case 58: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:165 { exprVAL.VectorOp = OpTypeTopK } - case 63: + case 59: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:169 { exprVAL.RangeOp = OpTypeCountOverTime } - case 64: + case 60: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:170 { exprVAL.RangeOp = OpTypeRate } - case 65: + case 61: exprDollar = exprS[exprpt-1 : exprpt+1] +//line pkg/logql/expr.y:175 { exprVAL.Labels = []string{exprDollar[1].str} } - case 66: + case 62: exprDollar = exprS[exprpt-3 : exprpt+1] +//line pkg/logql/expr.y:176 { exprVAL.Labels = append(exprDollar[1].Labels, exprDollar[3].str) } - case 67: + case 63: exprDollar = exprS[exprpt-4 : exprpt+1] +//line pkg/logql/expr.y:180 { exprVAL.Grouping = &grouping{without: false, groups: exprDollar[3].Labels} } - case 68: + case 64: exprDollar = exprS[exprpt-4 : exprpt+1] +//line pkg/logql/expr.y:181 { exprVAL.Grouping = &grouping{without: true, groups: exprDollar[3].Labels} } diff --git a/pkg/logql/parser_test.go b/pkg/logql/parser_test.go index 2687249513c2..283a608ef3ab 100644 --- a/pkg/logql/parser_test.go +++ b/pkg/logql/parser_test.go @@ -234,9 +234,9 @@ func TestParse(t *testing.T) { { in: `min({ foo !~ "bar" }[5m])`, err: ParseError{ - msg: "syntax error: unexpected {", - line: 1, - col: 5, + msg: "syntax error: unexpected DURATION", + line: 0, + col: 21, }, }, { @@ -274,9 +274,9 @@ func TestParse(t *testing.T) { { in: `stddev({ foo !~ "bar" })`, err: ParseError{ - msg: "syntax error: unexpected {", + msg: "syntax error: unexpected )", line: 1, - col: 8, + col: 24, }, }, { @@ -779,6 +779,70 @@ func TestParse(t *testing.T) { ), ), }, + { + in: `sum by (job) ( + count_over_time({namespace="tns"} |= "level=error"[5m]) + / + count_over_time({namespace="tns"}[5m]) + )`, + exp: mustNewVectorAggregationExpr( + mustNewBinOpExpr(OpTypeDiv, + newRangeAggregationExpr( + &logRange{ + left: &filterExpr{ + left: &matchersExpr{ + matchers: []*labels.Matcher{ + mustNewMatcher(labels.MatchEqual, "namespace", "tns"), + }, + }, + match: "level=error", + ty: labels.MatchEqual, + }, + interval: 5 * time.Minute, + }, OpTypeCountOverTime), + newRangeAggregationExpr( + &logRange{ + left: &matchersExpr{ + matchers: []*labels.Matcher{ + mustNewMatcher(labels.MatchEqual, "namespace", "tns"), + }, + }, + interval: 5 * time.Minute, + }, OpTypeCountOverTime)), OpTypeSum, &grouping{groups: []string{"job"}}, nil), + }, + { + in: `sum by (job) ( + count_over_time({namespace="tns"} |= "level=error"[5m]) + / + count_over_time({namespace="tns"}[5m]) + ) * 100`, + exp: mustNewBinOpExpr(OpTypeMul, mustNewVectorAggregationExpr( + mustNewBinOpExpr(OpTypeDiv, + newRangeAggregationExpr( + &logRange{ + left: &filterExpr{ + left: &matchersExpr{ + matchers: []*labels.Matcher{ + mustNewMatcher(labels.MatchEqual, "namespace", "tns"), + }, + }, + match: "level=error", + ty: labels.MatchEqual, + }, + interval: 5 * time.Minute, + }, OpTypeCountOverTime), + newRangeAggregationExpr( + &logRange{ + left: &matchersExpr{ + matchers: []*labels.Matcher{ + mustNewMatcher(labels.MatchEqual, "namespace", "tns"), + }, + }, + interval: 5 * time.Minute, + }, OpTypeCountOverTime)), OpTypeSum, &grouping{groups: []string{"job"}}, nil), + mustNewLiteralExpr("100", false), + ), + }, { // reduces binop with two literalExprs in: `sum(count_over_time({foo="bar"}[5m])) by (foo) + 1 / 2`,