Logql: Correct grouping type in pkg/logql/expr.y (#5306)

* Correct grouping type in pkg/logql/expr.y

* Use loki-build-image to build loki instead of golang image

* Include goyacc and other required tools to allow Makefile to run

* Remove dependencies not relevant to yacc in cmd/loki/Dockerfile

* Use go install instead of go get to install goyacc in cmd/loki/Dockerfile

* Add goyacc to logcli and loki-canary Dockerfiles

* Rerun CI

* Rerun CI

* Revert "Add goyacc to logcli and loki-canary Dockerfiles"

This reverts commit 0ee887c57f.

* Remove goyacc from cmd/loki/Dockerfile

* Formatting of cmd/loki/Dockerfile
pull/5306/merge
Sas Swart 3 years ago committed by GitHub
parent d970e737ab
commit 64589d0339
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      pkg/logql/expr.y

@ -12,7 +12,7 @@ import (
%union{
Expr Expr
Filter labels.MatchType
Grouping *grouping
Grouping *Grouping
Labels []string
LogExpr LogSelectorExpr
LogRangeExpr *LogRange
@ -479,9 +479,9 @@ labels:
;
grouping:
BY OPEN_PARENTHESIS labels CLOSE_PARENTHESIS { $$ = &grouping{ without: false , groups: $3 } }
| WITHOUT OPEN_PARENTHESIS labels CLOSE_PARENTHESIS { $$ = &grouping{ without: true , groups: $3 } }
| BY OPEN_PARENTHESIS CLOSE_PARENTHESIS { $$ = &grouping{ without: false , groups: nil } }
| WITHOUT OPEN_PARENTHESIS CLOSE_PARENTHESIS { $$ = &grouping{ without: true , groups: nil } }
BY OPEN_PARENTHESIS labels CLOSE_PARENTHESIS { $$ = &Grouping{ Without: false , Groups: $3 } }
| WITHOUT OPEN_PARENTHESIS labels CLOSE_PARENTHESIS { $$ = &Grouping{ Without: true , Groups: $3 } }
| BY OPEN_PARENTHESIS CLOSE_PARENTHESIS { $$ = &Grouping{ Without: false , Groups: nil } }
| WITHOUT OPEN_PARENTHESIS CLOSE_PARENTHESIS { $$ = &Grouping{ Without: true , Groups: nil } }
;
%%

Loading…
Cancel
Save