apitech
/
loki
mirror of https://github.com/grafana/loki
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removes duplicate logRangeExprExt grammar (#1651)

Browse Source 
* removes duplicate logRangeExprExt grammar

* linting errors
pull/1648/head
Owen Diehl 5 years ago committed by GitHub
parent 9ecdcf5151
commit e0a77656fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 107 additions and 184 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      pkg/ingester/flush_test.go
  2. 4
      pkg/ingester/ingester_test.go
  3. 1
      pkg/logql/ast.go
  4. 15
      pkg/logql/expr.y
  5. 265
      pkg/logql/expr.y.go
  6. 2
      pkg/logql/stats/context.go
  7. 2
      pkg/querier/querier_test.go

2
pkg/ingester/flush_test.go
Unescape View File

@ -148,7 +148,7 @@ func TestFlushMaxAge(t *testing.T) {
// assert stream is now both batches
store.checkData(t, map[string][]*logproto.Stream{
userID: []*logproto.Stream{
userID: {
{Labels: model.LabelSet{"app": "l"}.String(), Entries: append(firstEntries, secondEntries...)},
},
})

4
pkg/ingester/ingester_test.go
Unescape View File

@ -11,8 +11,8 @@ import (
"github.com/weaveworks/common/httpgrpc"
"github.com/weaveworks/common/user"
"golang.org/x/net/context"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc"
"google.golang.org/grpc/metadata"
"github.com/cortexproject/cortex/pkg/chunk"
"github.com/cortexproject/cortex/pkg/util/flagext"
@ -253,7 +253,7 @@ type mockQuerierServer struct {
grpc.ServerStream
}
func (*mockQuerierServer) SetTrailer(metadata.MD){}
func (*mockQuerierServer) SetTrailer(metadata.MD) {}
func (m *mockQuerierServer) Send(resp *logproto.QueryResponse) error {
m.resps = append(m.resps, resp)

1
pkg/logql/ast.go
Unescape View File

@ -371,6 +371,7 @@ func (e *vectorAggregationExpr) String() string {
}
// helper used to impl Stringer for vector and range aggregations
// nolint:interfacer
func formatOperation(op string, grouping *grouping, params ...string) string {
nonEmptyParams := make([]string, 0, len(params))
for _, p := range params {

15
pkg/logql/expr.y
Unescape View File

@ -14,7 +14,6 @@ import (
Labels []string
LogExpr LogSelectorExpr
LogRangeExpr *logRange
LogRangeExprExt *logRange
Matcher *labels.Matcher
Matchers []*labels.Matcher
RangeAggregationExpr SampleExpr
@ -34,7 +33,6 @@ import (
%type <Grouping> grouping
%type <Labels> labels
%type <LogExpr> logExpr
%type <LogRangeExprExt> logRangeExprExt
%type <LogRangeExpr> logRangeExpr
%type <Matcher> matcher
%type <Matchers> matchers
@ -69,15 +67,10 @@ logExpr:
logRangeExpr:
logExpr DURATION { $$ = newLogRange($1, $2) } // <selector> <filters> <range>
| logRangeExprExt { $$ = $1 } // <selector> <range> <filters>
;
logRangeExprExt:
selector DURATION { $$ = newLogRange(newMatcherExpr($1), $2)}
| logRangeExprExt filter STRING { $$ = addFilterToLogRangeExpr( $1, $2, $3 ) }
| OPEN_PARENTHESIS logRangeExprExt CLOSE_PARENTHESIS { $$ = $2 }
| logRangeExprExt filter error
| logRangeExprExt error
| logRangeExpr filter STRING { $$ = addFilterToLogRangeExpr( $1, $2, $3 ) }
| OPEN_PARENTHESIS logRangeExpr CLOSE_PARENTHESIS { $$ = $2 }
| logRangeExpr filter error
| logRangeExpr error
;
rangeAggregationExpr: rangeOp OPEN_PARENTHESIS logRangeExpr CLOSE_PARENTHESIS { $$ = newRangeAggregationExpr($3,$1) };

265
pkg/logql/expr.y.go
Unescape View File

@ -1,18 +1,15 @@
// 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"
//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
@ -21,7 +18,6 @@ type exprSymType struct {
Labels []string
LogExpr LogSelectorExpr
LogRangeExpr *logRange
LogRangeExprExt *logRange
Matcher *labels.Matcher
Matchers []*labels.Matcher
RangeAggregationExpr SampleExpr
@ -110,9 +106,7 @@ const exprEofCode = 1
const exprErrCode = 2
const exprInitialStackSize = 16
//line pkg/logql/expr.y:151
//line yacctab:1
var exprExca = [...]int{
-1, 1,
1, -1,
@ -120,94 +114,91 @@ var exprExca = [...]int{
-1, 3,
1, 2,
-2, 0,
-1, 43,
22, 11,
-2, 0,
}
const exprPrivate = 57344
const exprLast = 145
const exprLast = 149
var exprAct = [...]int{
31, 5, 4, 22, 36, 71, 10, 6, 92, 43,
28, 3, 88, 30, 7, 32, 33, 90, 11, 12,
13, 14, 16, 17, 15, 18, 19, 20, 21, 32,
33, 23, 47, 46, 91, 61, 87, 44, 88, 27,
42, 26, 86, 89, 67, 66, 60, 62, 24, 25,
10, 70, 69, 44, 48, 65, 63, 73, 45, 74,
51, 50, 49, 29, 27, 68, 26, 82, 83, 62,
84, 85, 55, 24, 25, 11, 12, 13, 14, 16,
17, 15, 18, 19, 20, 21, 56, 57, 58, 59,
64, 78, 94, 95, 11, 12, 13, 14, 16, 17,
15, 18, 19, 20, 21, 63, 10, 80, 39, 23,
79, 38, 93, 27, 7, 26, 77, 27, 76, 26,
23, 53, 24, 25, 37, 81, 24, 25, 27, 40,
26, 75, 35, 52, 37, 72, 54, 24, 25, 9,
8, 34, 41, 2, 1,
31, 5, 4, 22, 36, 69, 10, 41, 30, 49,
32, 33, 86, 46, 7, 32, 33, 88, 11, 12,
13, 14, 16, 17, 15, 18, 19, 20, 21, 90,
89, 48, 45, 44, 11, 12, 13, 14, 16, 17,
15, 18, 19, 20, 21, 58, 85, 86, 3, 68,
67, 63, 87, 84, 23, 71, 28, 72, 61, 65,
64, 47, 27, 29, 26, 80, 81, 58, 82, 83,
66, 24, 25, 53, 40, 76, 75, 74, 42, 11,
12, 13, 14, 16, 17, 15, 18, 19, 20, 21,
92, 93, 62, 59, 10, 78, 10, 59, 77, 73,
91, 27, 43, 26, 7, 27, 37, 26, 23, 51,
24, 25, 70, 79, 24, 25, 27, 60, 26, 23,
9, 50, 23, 61, 52, 24, 25, 27, 40, 26,
27, 39, 26, 35, 38, 37, 24, 25, 6, 24,
25, 54, 55, 56, 57, 8, 34, 2, 1,
}
var exprPact = [...]int{
-7, -1000, -1000, 118, -1000, -1000, -1000, 93, 42, -8,
130, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-1000, -1000, 106, -1000, -1000, -1000, -1000, -1000, 107, 37,
50, 41, 40, 39, 119, 58, -1000, 77, -1000, -1000,
-1000, 24, 29, 54, 84, 37, 23, 22, 48, 69,
131, 131, -1000, -1000, 120, -1000, 126, 113, 111, 86,
-1000, -1000, 105, -1000, -1000, 103, 6, 6, 69, 20,
14, 21, -1000, -5, -1000, -1000, -1000, -1000, -1000, -1000,
-1000, -1000, -1000, -1000, 12, -14, -1000, -1000, 108, -1000,
-1000, 6, 6, -1000, -1000, -1000,
-7, -1000, -1000, 120, -1000, -1000, -1000, 83, 42, -13,
131, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-1000, -1000, 129, -1000, -1000, -1000, -1000, -1000, 106, 81,
9, 40, 10, -12, 107, 59, -1000, 132, -1000, -1000,
-1000, 95, 117, 81, 38, 37, 53, 54, 108, 108,
-1000, -1000, 102, -1000, 94, 72, 71, 70, 93, -1000,
-1000, -1000, 52, 91, -8, -8, 54, 31, 24, 30,
-1000, -5, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-1000, -1000, 8, 7, -1000, -1000, 96, -1000, -1000, -8,
-8, -1000, -1000, -1000,
}
var exprPgo = [...]int{
0, 144, 143, 3, 0, 5, 10, 9, 142, 4,
141, 2, 140, 7, 1, 139,
0, 148, 147, 3, 0, 5, 48, 7, 4, 146,
2, 145, 138, 1, 120,
}
var exprR1 = [...]int{
0, 1, 2, 2, 2, 6, 6, 6, 6, 6,
8, 8, 7, 7, 7, 7, 7, 11, 14, 14,
14, 14, 14, 14, 14, 14, 14, 14, 3, 3,
3, 3, 13, 13, 13, 10, 10, 9, 9, 9,
9, 15, 15, 15, 15, 15, 15, 15, 15, 15,
12, 12, 5, 5, 4, 4,
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, 14,
14, 14, 14, 14, 14, 14, 14, 14, 11, 11,
5, 5, 4, 4,
}
var exprR2 = [...]int{
0, 1, 1, 1, 1, 1, 3, 3, 3, 2,
2, 1, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 3, 4, 4,
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, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 3, 4, 4,
}
var exprChk = [...]int{
-1000, -1, -2, -6, -11, -14, -13, 21, -12, -15,
-1000, -1, -2, -6, -10, -13, -12, 21, -11, -14,
13, 25, 26, 27, 28, 31, 29, 30, 32, 33,
34, 35, -3, 2, 19, 20, 12, 10, -6, 21,
21, -4, 23, 24, -10, 2, -9, 4, 5, 2,
22, -8, -6, -7, -13, 21, -11, -14, 4, 21,
21, 21, 14, 2, 17, 14, 9, 10, 11, 12,
22, 6, -3, 2, 6, -7, 22, 22, 17, -11,
-14, -5, 4, -5, -9, 5, 5, 5, 5, 5,
2, 22, -4, -4, -14, -11, 22, 22, 17, 22,
22, 22, 22, 4, -4, -4,
21, -4, 23, 24, -9, 2, -8, 4, 5, 2,
22, -7, -6, 21, -10, -13, 4, 21, 21, 21,
14, 2, 17, 14, 9, 10, 11, 12, -3, 2,
22, 6, -6, -7, 22, 22, 17, -10, -13, -5,
4, -5, -8, 5, 5, 5, 5, 5, 2, 22,
-4, -4, -13, -10, 22, 22, 17, 22, 22, 22,
22, 4, -4, -4,
}
var exprDef = [...]int{
0, -2, 1, -2, 3, 4, 5, 0, 0, 0,
0, 50, 51, 41, 42, 43, 44, 45, 46, 47,
48, 49, 0, 9, 28, 29, 30, 31, 0, 0,
0, 0, 0, 0, 0, 0, 35, 0, 6, 8,
7, 0, 0, -2, 5, 0, 0, 0, 0, 0,
0, 0, 32, 33, 0, 34, 0, 0, 0, 0,
17, 10, 0, 16, 12, 0, 18, 19, 0, 0,
0, 0, 52, 0, 36, 37, 38, 39, 40, 13,
15, 14, 22, 23, 0, 0, 20, 21, 0, 54,
55, 24, 26, 53, 25, 27,
0, 48, 49, 39, 40, 41, 42, 43, 44, 45,
46, 47, 0, 9, 26, 27, 28, 29, 0, 0,
0, 0, 0, 0, 0, 0, 33, 0, 6, 8,
7, 0, 0, 0, 0, 0, 0, 0, 0, 0,
30, 31, 0, 32, 0, 0, 0, 0, 0, 14,
15, 10, 0, 0, 16, 17, 0, 0, 0, 0,
50, 0, 34, 35, 36, 37, 38, 11, 13, 12,
20, 21, 0, 0, 18, 19, 0, 52, 53, 22,
24, 51, 23, 25,
}
var exprTok1 = [...]int{
@ -230,7 +221,6 @@ var exprErrorMessages = [...]struct {
msg string
}{}
//line yaccpar:1
/* parser for yacc output */
@ -563,306 +553,245 @@ exprdefault:
case 1:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:54
{
exprlex.(*lexer).expr = exprDollar[1].Expr
}
case 2:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:57
{
exprVAL.Expr = exprDollar[1].LogExpr
}
case 3:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:58
{
exprVAL.Expr = exprDollar[1].RangeAggregationExpr
}
case 4:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:59
{
exprVAL.Expr = exprDollar[1].VectorAggregationExpr
}
case 5:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:63
{
exprVAL.LogExpr = newMatcherExpr(exprDollar[1].Selector)
}
case 6:
exprDollar = exprS[exprpt-3 : exprpt+1]
//line pkg/logql/expr.y:64
{
exprVAL.LogExpr = NewFilterExpr(exprDollar[1].LogExpr, exprDollar[2].Filter, exprDollar[3].str)
}
case 7:
exprDollar = exprS[exprpt-3 : exprpt+1]
//line pkg/logql/expr.y:65
{
exprVAL.LogExpr = exprDollar[2].LogExpr
}
case 10:
exprDollar = exprS[exprpt-2 : exprpt+1]
//line pkg/logql/expr.y:71
{
exprVAL.LogRangeExpr = newLogRange(exprDollar[1].LogExpr, exprDollar[2].duration)
}
case 11:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:72
{
exprVAL.LogRangeExpr = exprDollar[1].LogRangeExprExt
}
case 12:
exprDollar = exprS[exprpt-2 : exprpt+1]
//line pkg/logql/expr.y:76
{
exprVAL.LogRangeExprExt = newLogRange(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].duration)
}
case 13:
exprDollar = exprS[exprpt-3 : exprpt+1]
//line pkg/logql/expr.y:77
{
exprVAL.LogRangeExprExt = addFilterToLogRangeExpr(exprDollar[1].LogRangeExprExt, exprDollar[2].Filter, exprDollar[3].str)
exprVAL.LogRangeExpr = addFilterToLogRangeExpr(exprDollar[1].LogRangeExpr, exprDollar[2].Filter, exprDollar[3].str)
}
case 14:
case 12:
exprDollar = exprS[exprpt-3 : exprpt+1]
//line pkg/logql/expr.y:78
{
exprVAL.LogRangeExprExt = exprDollar[2].LogRangeExprExt
exprVAL.LogRangeExpr = exprDollar[2].LogRangeExpr
}
case 17:
case 15:
exprDollar = exprS[exprpt-4 : exprpt+1]
//line pkg/logql/expr.y:83
{
exprVAL.RangeAggregationExpr = newRangeAggregationExpr(exprDollar[3].LogRangeExpr, exprDollar[1].RangeOp)
}
case 18:
case 16:
exprDollar = exprS[exprpt-4 : exprpt+1]
//line pkg/logql/expr.y:87
{
exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[3].RangeAggregationExpr, exprDollar[1].VectorOp, nil, nil)
}
case 19:
case 17:
exprDollar = exprS[exprpt-4 : exprpt+1]
//line pkg/logql/expr.y:88
{
exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[3].VectorAggregationExpr, exprDollar[1].VectorOp, nil, nil)
}
case 20:
case 18:
exprDollar = exprS[exprpt-5 : exprpt+1]
//line pkg/logql/expr.y:89
{
exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[4].RangeAggregationExpr, exprDollar[1].VectorOp, exprDollar[2].Grouping, nil)
}
case 21:
case 19:
exprDollar = exprS[exprpt-5 : exprpt+1]
//line pkg/logql/expr.y:90
{
exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[4].VectorAggregationExpr, exprDollar[1].VectorOp, exprDollar[2].Grouping, nil)
}
case 22:
case 20:
exprDollar = exprS[exprpt-5 : exprpt+1]
//line pkg/logql/expr.y:91
{
exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[3].RangeAggregationExpr, exprDollar[1].VectorOp, exprDollar[5].Grouping, nil)
}
case 23:
case 21:
exprDollar = exprS[exprpt-5 : exprpt+1]
//line pkg/logql/expr.y:92
{
exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[3].VectorAggregationExpr, exprDollar[1].VectorOp, exprDollar[5].Grouping, nil)
}
case 24:
case 22:
exprDollar = exprS[exprpt-6 : exprpt+1]
//line pkg/logql/expr.y:94
{
exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[5].VectorAggregationExpr, exprDollar[1].VectorOp, nil, &exprDollar[3].str)
}
case 25:
case 23:
exprDollar = exprS[exprpt-7 : exprpt+1]
//line pkg/logql/expr.y:95
{
exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[5].VectorAggregationExpr, exprDollar[1].VectorOp, exprDollar[7].Grouping, &exprDollar[3].str)
}
case 26:
case 24:
exprDollar = exprS[exprpt-6 : exprpt+1]
//line pkg/logql/expr.y:96
{
exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[5].RangeAggregationExpr, exprDollar[1].VectorOp, nil, &exprDollar[3].str)
}
case 27:
case 25:
exprDollar = exprS[exprpt-7 : exprpt+1]
//line pkg/logql/expr.y:97
{
exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[5].RangeAggregationExpr, exprDollar[1].VectorOp, exprDollar[7].Grouping, &exprDollar[3].str)
}
case 28:
case 26:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:101
{
exprVAL.Filter = labels.MatchRegexp
}
case 29:
case 27:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:102
{
exprVAL.Filter = labels.MatchEqual
}
case 30:
case 28:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:103
{
exprVAL.Filter = labels.MatchNotRegexp
}
case 31:
case 29:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:104
{
exprVAL.Filter = labels.MatchNotEqual
}
case 32:
case 30:
exprDollar = exprS[exprpt-3 : exprpt+1]
//line pkg/logql/expr.y:108
{
exprVAL.Selector = exprDollar[2].Matchers
}
case 33:
case 31:
exprDollar = exprS[exprpt-3 : exprpt+1]
//line pkg/logql/expr.y:109
{
exprVAL.Selector = exprDollar[2].Matchers
}
case 34:
case 32:
exprDollar = exprS[exprpt-3 : exprpt+1]
//line pkg/logql/expr.y:110
{
}
case 35:
case 33:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:114
{
exprVAL.Matchers = []*labels.Matcher{exprDollar[1].Matcher}
}
case 36:
case 34:
exprDollar = exprS[exprpt-3 : exprpt+1]
//line pkg/logql/expr.y:115
{
exprVAL.Matchers = append(exprDollar[1].Matchers, exprDollar[3].Matcher)
}
case 37:
case 35:
exprDollar = exprS[exprpt-3 : exprpt+1]
//line pkg/logql/expr.y:119
{
exprVAL.Matcher = mustNewMatcher(labels.MatchEqual, exprDollar[1].str, exprDollar[3].str)
}
case 38:
case 36:
exprDollar = exprS[exprpt-3 : exprpt+1]
//line pkg/logql/expr.y:120
{
exprVAL.Matcher = mustNewMatcher(labels.MatchNotEqual, exprDollar[1].str, exprDollar[3].str)
}
case 39:
case 37:
exprDollar = exprS[exprpt-3 : exprpt+1]
//line pkg/logql/expr.y:121
{
exprVAL.Matcher = mustNewMatcher(labels.MatchRegexp, exprDollar[1].str, exprDollar[3].str)
}
case 40:
case 38:
exprDollar = exprS[exprpt-3 : exprpt+1]
//line pkg/logql/expr.y:122
{
exprVAL.Matcher = mustNewMatcher(labels.MatchNotRegexp, exprDollar[1].str, exprDollar[3].str)
}
case 41:
case 39:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:126
{
exprVAL.VectorOp = OpTypeSum
}
case 42:
case 40:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:127
{
exprVAL.VectorOp = OpTypeAvg
}
case 43:
case 41:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:128
{
exprVAL.VectorOp = OpTypeCount
}
case 44:
case 42:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:129
{
exprVAL.VectorOp = OpTypeMax
}
case 45:
case 43:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:130
{
exprVAL.VectorOp = OpTypeMin
}
case 46:
case 44:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:131
{
exprVAL.VectorOp = OpTypeStddev
}
case 47:
case 45:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:132
{
exprVAL.VectorOp = OpTypeStdvar
}
case 48:
case 46:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:133
{
exprVAL.VectorOp = OpTypeBottomK
}
case 49:
case 47:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:134
{
exprVAL.VectorOp = OpTypeTopK
}
case 50:
case 48:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:138
{
exprVAL.RangeOp = OpTypeCountOverTime
}
case 51:
case 49:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:139
{
exprVAL.RangeOp = OpTypeRate
}
case 52:
case 50:
exprDollar = exprS[exprpt-1 : exprpt+1]
//line pkg/logql/expr.y:143
{
exprVAL.Labels = []string{exprDollar[1].str}
}
case 53:
case 51:
exprDollar = exprS[exprpt-3 : exprpt+1]
//line pkg/logql/expr.y:144
{
exprVAL.Labels = append(exprDollar[1].Labels, exprDollar[3].str)
}
case 54:
case 52:
exprDollar = exprS[exprpt-4 : exprpt+1]
//line pkg/logql/expr.y:148
{
exprVAL.Grouping = &grouping{without: false, groups: exprDollar[3].Labels}
}
case 55:
case 53:
exprDollar = exprS[exprpt-4 : exprpt+1]
//line pkg/logql/expr.y:149
{
exprVAL.Grouping = &grouping{without: true, groups: exprDollar[3].Labels}
}

2
pkg/logql/stats/context.go
Unescape View File

@ -39,7 +39,7 @@ const (
// Log logs a query statistics result.
func (r Result) Log(log log.Logger) {
log.Log(
_ = log.Log(
"Ingester.TotalReached", r.Ingester.TotalReached,
"Ingester.TotalChunksMatched", r.Ingester.TotalChunksMatched,
"Ingester.TotalBatches", r.Ingester.TotalBatches,

2
pkg/querier/querier_test.go
Unescape View File

@ -584,7 +584,7 @@ func TestQuerier_concurrentTailLimits(t *testing.T) {
ingesterClient := newQuerierClientMock()
ingesterClient.On("Query", mock.Anything, mock.Anything, mock.Anything).Return(queryClient, nil)
ingesterClient.On("Tail", mock.Anything, &request, mock.Anything).Return(tailClient, nil)
ingesterClient.On("TailersCount", mock.Anything, mock.Anything, mock.Anything).Return(&logproto.TailersCountResponse{testData.tailersCount}, nil)
ingesterClient.On("TailersCount", mock.Anything, mock.Anything, mock.Anything).Return(&logproto.TailersCountResponse{Count: testData.tailersCount}, nil)
defaultLimits := defaultLimitsTestConfig()
defaultLimits.MaxConcurrentTailRequests = 5

Write Preview
Loading…
Cancel
Save