diff --git a/pkg/logql/syntax/ast_test.go b/pkg/logql/syntax/ast_test.go index ec45884933..9090fc98b7 100644 --- a/pkg/logql/syntax/ast_test.go +++ b/pkg/logql/syntax/ast_test.go @@ -49,6 +49,7 @@ func Test_logSelectorExpr_String(t *testing.T) { {`{foo="bar"} |= "baz" |~ "blip" != "flip" !~ "flap" | logfmt | b=ip("127.0.0.1") | level="error" | c=ip("::1")`, true}, // chain inside label filters. {`{foo="bar"} |= "baz" |~ "blip" != "flip" !~ "flap" | regexp "(?Pfoo|bar)"`, true}, {`{foo="bar"} |= "baz" |~ "blip" != "flip" !~ "flap" | regexp "(?Pfoo|bar)" | ( ( foo<5.01 , bar>20ms ) or foo="bar" ) | line_format "blip{{.boop}}bap" | label_format foo=bar,bar="blip{{.blop}}"`, true}, + {`{foo="bar"} | logfmt | counter>-1 | counter>=-1 | counter<-1 | counter<=-1 | counter!=-1 | counter==-1`, true}, } for _, tt := range tests { @@ -76,6 +77,7 @@ func Test_logSelectorExpr_String(t *testing.T) { func Test_SampleExpr_String(t *testing.T) { t.Parallel() for _, tc := range []string{ + `rate( ( {job="mysql"} |="error" !="timeout" ) [10s] )>-1`, `rate( ( {job="mysql"} |="error" !="timeout" ) [10s] )`, `absent_over_time( ( {job="mysql"} |="error" !="timeout" ) [10s] )`, `absent_over_time( ( {job="mysql"} |="error" !="timeout" ) [10s] offset 10d )`, @@ -556,6 +558,27 @@ func Test_FilterMatcher(t *testing.T) { }, []linecheck{{"foo", false}, {"bar", false}, {"none", true}}, }, + { + `{app="foo"} | logfmt | duration > -1s`, + []*labels.Matcher{ + mustNewMatcher(labels.MatchEqual, "app", "foo"), + }, + []linecheck{{"duration=5m", true}, {"duration=1s", true}, {"duration=0s", true}, {"duration=-5m", false}}, + }, + { + `{app="foo"} | logfmt | count > -1`, + []*labels.Matcher{ + mustNewMatcher(labels.MatchEqual, "app", "foo"), + }, + []linecheck{{"count=5", true}, {"count=1", true}, {"count=0", true}, {"count=-5", false}}, + }, + { + `{app="foo"} | logfmt | counter <= -1`, + []*labels.Matcher{ + mustNewMatcher(labels.MatchEqual, "app", "foo"), + }, + []linecheck{{"counter=1", false}, {"counter=0", false}, {"counter=-1", true}, {"counter=-2", true}}, + }, } { tt := tt t.Run(tt.q, func(t *testing.T) { diff --git a/pkg/logql/syntax/expr.y b/pkg/logql/syntax/expr.y index 7f44383115..fb6aa7f344 100644 --- a/pkg/logql/syntax/expr.y +++ b/pkg/logql/syntax/expr.y @@ -400,13 +400,13 @@ bytesFilter: ; numberFilter: - IDENTIFIER GT NUMBER { $$ = log.NewNumericLabelFilter(log.LabelFilterGreaterThan, $1, mustNewFloat($3))} - | IDENTIFIER GTE NUMBER { $$ = log.NewNumericLabelFilter(log.LabelFilterGreaterThanOrEqual, $1, mustNewFloat($3))} - | IDENTIFIER LT NUMBER { $$ = log.NewNumericLabelFilter(log.LabelFilterLesserThan, $1, mustNewFloat($3))} - | IDENTIFIER LTE NUMBER { $$ = log.NewNumericLabelFilter(log.LabelFilterLesserThanOrEqual, $1, mustNewFloat($3))} - | IDENTIFIER NEQ NUMBER { $$ = log.NewNumericLabelFilter(log.LabelFilterNotEqual, $1, mustNewFloat($3))} - | IDENTIFIER EQ NUMBER { $$ = log.NewNumericLabelFilter(log.LabelFilterEqual, $1, mustNewFloat($3))} - | IDENTIFIER CMP_EQ NUMBER { $$ = log.NewNumericLabelFilter(log.LabelFilterEqual, $1, mustNewFloat($3))} + IDENTIFIER GT literalExpr { $$ = log.NewNumericLabelFilter(log.LabelFilterGreaterThan, $1, $3.Val)} + | IDENTIFIER GTE literalExpr { $$ = log.NewNumericLabelFilter(log.LabelFilterGreaterThanOrEqual, $1,$3.Val)} + | IDENTIFIER LT literalExpr { $$ = log.NewNumericLabelFilter(log.LabelFilterLesserThan, $1, $3.Val)} + | IDENTIFIER LTE literalExpr { $$ = log.NewNumericLabelFilter(log.LabelFilterLesserThanOrEqual, $1, $3.Val)} + | IDENTIFIER NEQ literalExpr { $$ = log.NewNumericLabelFilter(log.LabelFilterNotEqual, $1, $3.Val)} + | IDENTIFIER EQ literalExpr { $$ = log.NewNumericLabelFilter(log.LabelFilterEqual, $1, $3.Val)} + | IDENTIFIER CMP_EQ literalExpr { $$ = log.NewNumericLabelFilter(log.LabelFilterEqual, $1, $3.Val)} ; dropLabel: diff --git a/pkg/logql/syntax/expr.y.go b/pkg/logql/syntax/expr.y.go index 2d322514a7..4918cf5cdc 100644 --- a/pkg/logql/syntax/expr.y.go +++ b/pkg/logql/syntax/expr.y.go @@ -1,15 +1,19 @@ -// Code generated by goyacc -p expr -o pkg/logql/syntax/expr.y.go pkg/logql/syntax/expr.y. DO NOT EDIT. +// Code generated by goyacc -p expr -o expr.y.go expr.y. DO NOT EDIT. +//line expr.y:2 package syntax import __yyfmt__ "fmt" +//line expr.y:2 + import ( "github.com/grafana/loki/v3/pkg/logql/log" "github.com/prometheus/prometheus/model/labels" "time" ) +//line expr.y:12 type exprSymType struct { yys int Expr Expr @@ -263,13 +267,17 @@ var exprToknames = [...]string{ "MOD", "POW", } + var exprStatenames = [...]string{} const exprEofCode = 1 const exprErrCode = 2 const exprInitialStackSize = 16 -var exprExca = [...]int{ +//line expr.y:582 + +//line yacctab:1 +var exprExca = [...]int8{ -1, 1, 1, -1, -2, 0, @@ -277,125 +285,127 @@ var exprExca = [...]int{ const exprPrivate = 57344 -const exprLast = 608 - -var exprAct = [...]int{ +const exprLast = 639 +var exprAct = [...]int16{ 289, 228, 84, 4, 214, 64, 182, 126, 204, 189, 75, 200, 197, 63, 237, 5, 152, 187, 77, 2, 56, 80, 48, 49, 50, 57, 58, 61, 62, 59, - 60, 51, 52, 53, 54, 55, 56, 49, 50, 57, - 58, 61, 62, 59, 60, 51, 52, 53, 54, 55, - 56, 57, 58, 61, 62, 59, 60, 51, 52, 53, - 54, 55, 56, 51, 52, 53, 54, 55, 56, 109, - 148, 150, 151, 115, 53, 54, 55, 56, 207, 150, - 151, 283, 217, 139, 166, 167, 292, 156, 215, 295, - 216, 72, 74, 161, 72, 74, 164, 165, 154, 69, - 70, 71, 69, 70, 71, 297, 347, 140, 67, 294, - 163, 366, 136, 366, 168, 169, 170, 171, 172, 173, - 174, 175, 176, 177, 178, 179, 180, 181, 184, 230, - 339, 292, 94, 130, 255, 136, 339, 194, 85, 86, - 191, 149, 202, 206, 293, 136, 386, 369, 213, 208, - 211, 212, 209, 210, 142, 219, 130, 363, 306, 141, - 73, 184, 235, 73, 356, 381, 130, 239, 229, 374, - 294, 231, 232, 142, 110, 240, 294, 122, 123, 121, - 227, 131, 133, 297, 294, 72, 74, 185, 183, 316, - 248, 249, 250, 69, 70, 71, 373, 298, 371, 124, - 295, 125, 136, 359, 252, 72, 74, 132, 134, 135, - 293, 349, 239, 69, 70, 71, 72, 74, 184, 224, - 230, 183, 285, 130, 69, 70, 71, 346, 287, 290, - 330, 296, 136, 299, 314, 109, 302, 115, 303, 304, - 230, 291, 154, 288, 331, 300, 306, 72, 74, 243, - 294, 230, 355, 130, 73, 69, 70, 71, 306, 310, - 312, 315, 317, 318, 354, 233, 202, 206, 325, 320, - 324, 292, 340, 83, 73, 85, 86, 185, 183, 136, - 144, 266, 230, 221, 267, 73, 265, 262, 328, 220, - 263, 332, 261, 334, 336, 184, 338, 109, 239, 306, - 130, 337, 348, 333, 239, 353, 109, 224, 227, 350, - 327, 306, 306, 72, 74, 239, 73, 308, 307, 239, - 313, 69, 70, 71, 13, 224, 311, 143, 342, 343, - 344, 379, 301, 155, 360, 361, 384, 241, 326, 109, - 362, 238, 284, 153, 247, 246, 364, 365, 230, 264, - 225, 245, 370, 13, 244, 260, 218, 160, 159, 158, - 16, 90, 155, 89, 72, 74, 376, 82, 377, 378, - 13, 380, 69, 70, 71, 352, 253, 305, 259, 6, + 60, 51, 52, 53, 54, 55, 56, 283, 10, 49, + 50, 57, 58, 61, 62, 59, 60, 51, 52, 53, + 54, 55, 56, 57, 58, 61, 62, 59, 60, 51, + 52, 53, 54, 55, 56, 53, 54, 55, 56, 109, + 217, 139, 215, 115, 51, 52, 53, 54, 55, 56, + 266, 140, 221, 16, 216, 265, 292, 156, 136, 166, + 167, 297, 262, 161, 220, 16, 294, 261, 154, 148, + 150, 151, 366, 281, 184, 339, 16, 67, 280, 130, + 163, 207, 150, 151, 168, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 180, 181, 278, 164, + 165, 16, 366, 277, 239, 94, 293, 194, 142, 386, + 191, 275, 202, 206, 16, 294, 274, 142, 264, 340, + 85, 86, 292, 141, 272, 219, 316, 16, 381, 271, + 260, 306, 235, 185, 183, 17, 18, 356, 229, 224, + 149, 231, 232, 110, 306, 240, 294, 17, 18, 136, + 355, 213, 208, 211, 212, 209, 210, 374, 17, 18, + 248, 249, 250, 269, 331, 184, 16, 306, 268, 373, + 130, 255, 306, 354, 252, 342, 343, 344, 353, 136, + 239, 72, 74, 17, 18, 371, 363, 339, 306, 69, + 70, 71, 285, 384, 308, 184, 17, 18, 287, 290, + 130, 296, 314, 299, 369, 109, 302, 115, 303, 17, + 18, 291, 154, 288, 359, 300, 263, 267, 270, 273, + 276, 279, 282, 349, 185, 183, 330, 294, 293, 310, + 312, 315, 317, 318, 72, 74, 202, 206, 325, 320, + 324, 295, 69, 70, 71, 346, 72, 74, 17, 18, + 73, 306, 239, 239, 69, 70, 71, 307, 328, 136, + 239, 332, 304, 334, 336, 224, 338, 109, 294, 230, + 243, 337, 348, 333, 313, 311, 109, 239, 295, 350, + 130, 230, 241, 72, 74, 83, 224, 85, 86, 292, + 301, 69, 70, 71, 233, 347, 144, 13, 136, 238, + 143, 327, 153, 73, 360, 361, 155, 326, 284, 109, + 362, 225, 13, 247, 184, 73, 364, 365, 230, 130, + 246, 155, 370, 245, 244, 218, 160, 159, 158, 227, + 16, 90, 89, 82, 72, 74, 376, 380, 377, 378, + 13, 352, 69, 70, 71, 253, 298, 305, 259, 6, 382, 258, 73, 21, 22, 23, 36, 45, 46, 37, - 39, 40, 38, 41, 42, 43, 44, 24, 25, 66, - 256, 242, 234, 226, 257, 254, 368, 26, 27, 28, - 29, 30, 31, 32, 81, 146, 367, 33, 34, 35, - 47, 19, 236, 281, 345, 335, 282, 79, 280, 322, - 323, 145, 13, 73, 147, 278, 162, 88, 279, 87, - 277, 6, 17, 18, 385, 21, 22, 23, 36, 45, + 39, 40, 38, 41, 42, 43, 44, 24, 25, 230, + 256, 242, 234, 226, 183, 257, 254, 26, 27, 28, + 29, 30, 31, 32, 81, 379, 368, 33, 34, 35, + 47, 19, 236, 227, 367, 162, 345, 79, 72, 74, + 335, 190, 13, 73, 251, 88, 69, 70, 71, 322, + 323, 6, 17, 18, 87, 21, 22, 23, 36, 45, 46, 37, 39, 40, 38, 41, 42, 43, 44, 24, - 25, 275, 272, 127, 276, 273, 274, 271, 383, 26, - 27, 28, 29, 30, 31, 32, 372, 358, 357, 33, - 34, 35, 47, 19, 157, 269, 329, 375, 270, 190, - 268, 3, 251, 190, 13, 319, 188, 321, 76, 309, - 198, 128, 286, 6, 17, 18, 136, 21, 22, 23, + 25, 190, 375, 230, 188, 385, 383, 372, 358, 26, + 27, 28, 29, 30, 31, 32, 146, 357, 3, 33, + 34, 35, 47, 19, 157, 76, 329, 319, 309, 286, + 72, 74, 145, 321, 13, 147, 198, 73, 69, 70, + 71, 223, 222, 6, 17, 18, 136, 21, 22, 23, 36, 45, 46, 37, 39, 40, 38, 41, 42, 43, - 44, 24, 25, 223, 222, 221, 220, 130, 195, 193, - 192, 26, 27, 28, 29, 30, 31, 32, 91, 351, - 205, 33, 34, 35, 47, 19, 201, 190, 122, 123, - 121, 81, 131, 133, 198, 113, 114, 196, 118, 203, - 120, 199, 119, 117, 116, 186, 17, 18, 65, 137, - 124, 129, 125, 138, 111, 112, 93, 92, 132, 134, - 135, 11, 10, 9, 20, 12, 15, 8, 95, 96, - 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 108, 341, 14, 7, 78, 68, 1, + 44, 24, 25, 221, 220, 230, 195, 130, 193, 192, + 351, 26, 27, 28, 29, 30, 31, 32, 205, 136, + 201, 33, 34, 35, 47, 19, 190, 81, 122, 123, + 121, 198, 131, 133, 297, 72, 74, 127, 128, 73, + 130, 113, 114, 69, 70, 71, 17, 18, 196, 118, + 124, 203, 125, 120, 199, 91, 119, 117, 132, 134, + 135, 122, 123, 121, 116, 131, 133, 186, 65, 137, + 66, 129, 138, 111, 112, 93, 92, 11, 9, 20, + 12, 15, 8, 124, 341, 125, 14, 7, 78, 68, + 1, 132, 134, 135, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 73, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, 105, 106, 107, 108, } -var exprPact = [...]int{ - 353, -1000, -58, -1000, -1000, 349, 353, -1000, -1000, -1000, - -1000, -1000, -1000, 409, 341, 247, -1000, 432, 430, 337, +var exprPact = [...]int16{ + 353, -1000, -58, -1000, -1000, 540, 353, -1000, -1000, -1000, + -1000, -1000, -1000, 409, 337, 289, -1000, 437, 428, 336, 335, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 86, 86, - 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 349, -1000, 76, 501, 3, 101, -1000, - -1000, -1000, -1000, -1000, -1000, 300, 253, -58, 413, -1000, - -1000, 57, 336, 477, 333, 332, 331, -1000, -1000, 353, - 429, 353, 23, 9, -1000, 353, 353, 353, 353, 353, + -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 89, 89, + 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, + 89, 89, 89, 540, -1000, 196, 534, -9, 75, -1000, + -1000, -1000, -1000, -1000, -1000, 303, 299, -58, 474, -1000, + -1000, 86, 325, 477, 332, 331, 330, -1000, -1000, 353, + 418, 353, 56, 14, -1000, 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, -1000, - -1000, -1000, -1000, -1000, -1000, 197, -1000, -1000, -1000, -1000, - -1000, 488, 542, 524, -1000, 523, -1000, -1000, -1000, -1000, - 227, 522, -1000, 549, 541, 535, 65, -1000, -1000, 82, - 2, 330, -1000, -1000, -1000, -1000, -1000, 546, 520, 519, - 518, 517, 323, 382, 298, 307, 238, 381, 415, 314, - 310, 380, 222, -44, 328, 325, 319, 318, -32, -32, - -17, -17, -74, -74, -74, -74, -26, -26, -26, -26, - -26, -26, 197, 227, 227, 227, 484, 355, -1000, -1000, - 392, 355, -1000, -1000, 107, -1000, 379, -1000, 391, 360, - -1000, 57, -1000, 357, -1000, 57, -1000, 283, 277, 481, - 458, 457, 431, 419, -1000, 1, 316, 82, 496, -1000, - -1000, -1000, -1000, -1000, -1000, 110, 307, 201, 134, 190, - 130, 170, 305, 110, 353, 212, 356, 291, -1000, -1000, - 290, -1000, 493, -1000, 299, 293, 207, 162, 274, 197, - 140, -1000, 355, 542, 489, -1000, 495, 424, 541, 535, - 312, -1000, -1000, -1000, 284, -1000, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, 83, -1000, -1000, -1000, -1000, + -1000, 456, 541, 523, -1000, 522, -1000, -1000, -1000, -1000, + 284, 520, -1000, 546, 535, 533, 98, -1000, -1000, 66, + -10, 329, -1000, -1000, -1000, -1000, -1000, 542, 518, 517, + 496, 495, 314, 382, 413, 310, 297, 381, 415, 302, + 285, 380, 273, -42, 328, 327, 324, 317, -30, -30, + -26, -26, -74, -74, -74, -74, -15, -15, -15, -15, + -15, -15, 83, 284, 284, 284, 426, 354, -1000, -1000, + 393, 354, -1000, -1000, 174, -1000, 379, -1000, 392, 360, + -1000, 86, -1000, 357, -1000, 86, -1000, 88, 76, 189, + 150, 137, 124, 99, -1000, -43, 312, 66, 483, -1000, + -1000, -1000, -1000, -1000, -1000, 122, 310, 249, 126, 261, + 501, 349, 293, 122, 353, 265, 356, 260, -1000, -1000, + 197, -1000, 482, -1000, 278, 277, 205, 129, 204, 83, + 323, -1000, 354, 541, 481, -1000, 491, 434, 535, 533, + 311, -1000, -1000, -1000, 305, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, - -1000, -1000, -1000, 82, 480, -1000, 203, -1000, 217, 232, - 59, 232, 416, 16, 227, 16, 126, 267, 414, 200, - 79, -1000, -1000, 184, -1000, 353, 534, -1000, -1000, 354, - 278, -1000, 237, -1000, -1000, 225, -1000, 137, -1000, -1000, - -1000, -1000, -1000, -1000, -1000, -1000, 472, 471, -1000, 176, - -1000, 110, 59, 232, 59, -1000, -1000, 197, -1000, 16, - -1000, 131, -1000, -1000, -1000, 61, 406, 396, 120, 110, - 171, -1000, 470, -1000, -1000, -1000, -1000, 169, 142, -1000, - -1000, 59, -1000, 482, 63, 59, 52, 16, 16, 321, - -1000, -1000, 350, -1000, -1000, 138, 59, -1000, -1000, 16, - 462, -1000, -1000, 315, 438, 119, -1000, + -1000, -1000, -1000, 66, 480, -1000, 229, -1000, 167, 475, + 46, 475, 421, 16, 284, 16, 95, 144, 416, 248, + 298, -1000, -1000, 226, -1000, 353, 525, -1000, -1000, 350, + 181, -1000, 176, -1000, -1000, 153, -1000, 140, -1000, -1000, + -1000, -1000, -1000, -1000, -1000, -1000, 471, 462, -1000, 217, + -1000, 122, 46, 475, 46, -1000, -1000, 83, -1000, 16, + -1000, 190, -1000, -1000, -1000, 82, 414, 406, 207, 122, + 188, -1000, 461, -1000, -1000, -1000, -1000, 172, 160, -1000, + -1000, 46, -1000, 457, 52, 46, 38, 16, 16, 405, + -1000, -1000, 346, -1000, -1000, 131, 46, -1000, -1000, 16, + 460, -1000, -1000, 202, 459, 112, -1000, } -var exprPgo = [...]int{ - - 0, 607, 18, 606, 2, 14, 491, 3, 16, 7, - 605, 604, 603, 602, 15, 587, 586, 585, 584, 90, - 583, 582, 581, 538, 577, 576, 575, 574, 13, 5, - 573, 571, 569, 6, 568, 108, 4, 565, 564, 563, - 562, 561, 11, 560, 559, 8, 558, 12, 557, 9, - 17, 556, 555, 1, 501, 463, 0, + +var exprPgo = [...]int16{ + 0, 610, 18, 609, 2, 14, 478, 3, 16, 7, + 608, 607, 606, 604, 15, 602, 601, 600, 599, 84, + 598, 38, 597, 575, 596, 595, 594, 593, 13, 5, + 592, 591, 589, 6, 588, 107, 4, 587, 584, 577, + 576, 574, 11, 573, 571, 8, 569, 12, 568, 9, + 17, 562, 561, 1, 558, 557, 0, } -var exprR1 = [...]int{ +var exprR1 = [...]int8{ 0, 1, 2, 2, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, @@ -420,8 +430,8 @@ var exprR1 = [...]int{ 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 56, 5, 5, 4, 4, 4, 4, } -var exprR2 = [...]int{ +var exprR2 = [...]int8{ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 2, 3, 2, 3, 4, 5, 3, 4, 5, 6, 3, 4, 5, 6, 3, 4, 5, 6, @@ -446,8 +456,8 @@ var exprR2 = [...]int{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 3, 4, 4, 3, 3, } -var exprChk = [...]int{ +var exprChk = [...]int16{ -1000, -1, -2, -6, -7, -14, 26, -11, -15, -20, -21, -22, -17, 17, -12, -16, 7, 89, 90, 68, -18, 30, 31, 32, 44, 45, 54, 55, 56, 57, @@ -474,9 +484,9 @@ var exprChk = [...]int{ 50, -14, -8, 27, 21, -7, 7, -5, 27, 5, -5, 27, 21, 27, 26, 26, 26, 26, -33, -33, -33, 8, -50, 21, 13, 27, 21, 13, 21, 21, - 72, 9, 4, 7, 72, 9, 4, 7, 9, 4, - 7, 9, 4, 7, 9, 4, 7, 9, 4, 7, - 9, 4, 7, 80, 26, -36, 6, -4, -8, -56, + 72, 9, 4, -21, 72, 9, 4, -21, 9, 4, + -21, 9, 4, -21, 9, 4, -21, 9, 4, -21, + 9, 4, -21, 80, 26, -36, 6, -4, -8, -56, -53, -28, 70, 10, 50, 10, -53, 53, 27, -53, -28, 27, -4, -7, 27, 21, 21, 27, 27, 6, -5, 27, -5, 27, 27, -5, 27, -5, -49, 6, @@ -488,8 +498,8 @@ var exprChk = [...]int{ -4, 27, 6, 27, 27, 5, -53, -56, -56, 10, 21, 27, -56, 6, 21, 6, 27, } -var exprDef = [...]int{ +var exprDef = [...]int16{ 0, -2, 1, 2, 3, 11, 0, 4, 5, 6, 7, 8, 9, 0, 0, 0, 191, 0, 0, 0, 0, 207, 208, 209, 210, 211, 212, 213, 214, 215, @@ -530,12 +540,12 @@ var exprDef = [...]int{ 54, 55, 0, 127, 128, 0, 21, 25, 29, 32, 0, 41, 33, 0, 0, 0, 56, } -var exprTok1 = [...]int{ +var exprTok1 = [...]int8{ 1, } -var exprTok2 = [...]int{ +var exprTok2 = [...]int8{ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, @@ -547,7 +557,8 @@ var exprTok2 = [...]int{ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, } -var exprTok3 = [...]int{ + +var exprTok3 = [...]int8{ 0, } @@ -557,6 +568,8 @@ var exprErrorMessages = [...]struct { msg string }{} +//line yaccpar:1 + /* parser for yacc output */ var ( @@ -627,9 +640,9 @@ func exprErrorMessage(state, lookAhead int) string { expected := make([]int, 0, 4) // Look for shiftable tokens. - base := exprPact[state] + base := int(exprPact[state]) for tok := TOKSTART; tok-1 < len(exprToknames); tok++ { - if n := base + tok; n >= 0 && n < exprLast && exprChk[exprAct[n]] == tok { + if n := base + tok; n >= 0 && n < exprLast && int(exprChk[int(exprAct[n])]) == tok { if len(expected) == cap(expected) { return res } @@ -639,13 +652,13 @@ func exprErrorMessage(state, lookAhead int) string { if exprDef[state] == -2 { i := 0 - for exprExca[i] != -1 || exprExca[i+1] != state { + for exprExca[i] != -1 || int(exprExca[i+1]) != state { i += 2 } // Look for tokens that we accept or reduce. for i += 2; exprExca[i] >= 0; i += 2 { - tok := exprExca[i] + tok := int(exprExca[i]) if tok < TOKSTART || exprExca[i+1] == 0 { continue } @@ -676,30 +689,30 @@ func exprlex1(lex exprLexer, lval *exprSymType) (char, token int) { token = 0 char = lex.Lex(lval) if char <= 0 { - token = exprTok1[0] + token = int(exprTok1[0]) goto out } if char < len(exprTok1) { - token = exprTok1[char] + token = int(exprTok1[char]) goto out } if char >= exprPrivate { if char < exprPrivate+len(exprTok2) { - token = exprTok2[char-exprPrivate] + token = int(exprTok2[char-exprPrivate]) goto out } } for i := 0; i < len(exprTok3); i += 2 { - token = exprTok3[i+0] + token = int(exprTok3[i+0]) if token == char { - token = exprTok3[i+1] + token = int(exprTok3[i+1]) goto out } } out: if token == 0 { - token = exprTok2[1] /* unknown char */ + token = int(exprTok2[1]) /* unknown char */ } if exprDebug >= 3 { __yyfmt__.Printf("lex %s(%d)\n", exprTokname(token), uint(char)) @@ -754,7 +767,7 @@ exprstack: exprS[exprp].yys = exprstate exprnewstate: - exprn = exprPact[exprstate] + exprn = int(exprPact[exprstate]) if exprn <= exprFlag { goto exprdefault /* simple state */ } @@ -765,8 +778,8 @@ exprnewstate: if exprn < 0 || exprn >= exprLast { goto exprdefault } - exprn = exprAct[exprn] - if exprChk[exprn] == exprtoken { /* valid shift */ + exprn = int(exprAct[exprn]) + if int(exprChk[exprn]) == exprtoken { /* valid shift */ exprrcvr.char = -1 exprtoken = -1 exprVAL = exprrcvr.lval @@ -779,7 +792,7 @@ exprnewstate: exprdefault: /* default state action */ - exprn = exprDef[exprstate] + exprn = int(exprDef[exprstate]) if exprn == -2 { if exprrcvr.char < 0 { exprrcvr.char, exprtoken = exprlex1(exprlex, &exprrcvr.lval) @@ -788,18 +801,18 @@ exprdefault: /* look through exception table */ xi := 0 for { - if exprExca[xi+0] == -1 && exprExca[xi+1] == exprstate { + if exprExca[xi+0] == -1 && int(exprExca[xi+1]) == exprstate { break } xi += 2 } for xi += 2; ; xi += 2 { - exprn = exprExca[xi+0] + exprn = int(exprExca[xi+0]) if exprn < 0 || exprn == exprtoken { break } } - exprn = exprExca[xi+1] + exprn = int(exprExca[xi+1]) if exprn < 0 { goto ret0 } @@ -821,10 +834,10 @@ exprdefault: /* find a state where "error" is a legal shift action */ for exprp >= 0 { - exprn = exprPact[exprS[exprp].yys] + exprErrCode + exprn = int(exprPact[exprS[exprp].yys]) + exprErrCode if exprn >= 0 && exprn < exprLast { - exprstate = exprAct[exprn] /* simulate a shift of "error" */ - if exprChk[exprstate] == exprErrCode { + exprstate = int(exprAct[exprn]) /* simulate a shift of "error" */ + if int(exprChk[exprstate]) == exprErrCode { goto exprstack } } @@ -860,7 +873,7 @@ exprdefault: exprpt := exprp _ = exprpt // guard against "declared and not used" - exprp -= exprR2[exprn] + exprp -= int(exprR2[exprn]) // exprp is now the index of $0. Perform the default action. Iff the // reduced production is ε, $1 is possibly out of range. if exprp+1 >= len(exprS) { @@ -871,16 +884,16 @@ exprdefault: exprVAL = exprS[exprp+1] /* consult goto table to find next state */ - exprn = exprR1[exprn] - exprg := exprPgo[exprn] + exprn = int(exprR1[exprn]) + exprg := int(exprPgo[exprn]) exprj := exprg + exprS[exprp].yys + 1 if exprj >= exprLast { - exprstate = exprAct[exprg] + exprstate = int(exprAct[exprg]) } else { - exprstate = exprAct[exprj] - if exprChk[exprstate] != -exprn { - exprstate = exprAct[exprg] + exprstate = int(exprAct[exprj]) + if int(exprChk[exprstate]) != -exprn { + exprstate = int(exprAct[exprg]) } } // dummy call; replaced with literal code @@ -888,885 +901,1062 @@ exprdefault: case 1: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:154 { exprlex.(*parser).expr = exprDollar[1].Expr } case 2: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:157 { exprVAL.Expr = exprDollar[1].LogExpr } case 3: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:158 { exprVAL.Expr = exprDollar[1].MetricExpr } case 4: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:162 { exprVAL.MetricExpr = exprDollar[1].RangeAggregationExpr } case 5: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:163 { exprVAL.MetricExpr = exprDollar[1].VectorAggregationExpr } case 6: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:164 { exprVAL.MetricExpr = exprDollar[1].BinOpExpr } case 7: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:165 { exprVAL.MetricExpr = exprDollar[1].LiteralExpr } case 8: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:166 { exprVAL.MetricExpr = exprDollar[1].LabelReplaceExpr } case 9: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:167 { exprVAL.MetricExpr = exprDollar[1].VectorExpr } case 10: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:168 { exprVAL.MetricExpr = exprDollar[2].MetricExpr } case 11: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:172 { exprVAL.LogExpr = newMatcherExpr(exprDollar[1].Selector) } case 12: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:173 { exprVAL.LogExpr = newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].PipelineExpr) } case 13: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:174 { exprVAL.LogExpr = exprDollar[2].LogExpr } case 14: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:178 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].duration, nil, nil) } case 15: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:179 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].duration, nil, exprDollar[3].OffsetExpr) } case 16: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:180 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[2].Selector), exprDollar[4].duration, nil, nil) } case 17: exprDollar = exprS[exprpt-5 : exprpt+1] +//line expr.y:181 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[2].Selector), exprDollar[4].duration, nil, exprDollar[5].OffsetExpr) } case 18: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:182 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].duration, exprDollar[3].UnwrapExpr, nil) } case 19: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:183 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].duration, exprDollar[4].UnwrapExpr, exprDollar[3].OffsetExpr) } case 20: exprDollar = exprS[exprpt-5 : exprpt+1] +//line expr.y:184 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[2].Selector), exprDollar[4].duration, exprDollar[5].UnwrapExpr, nil) } case 21: exprDollar = exprS[exprpt-6 : exprpt+1] +//line expr.y:185 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[2].Selector), exprDollar[4].duration, exprDollar[6].UnwrapExpr, exprDollar[5].OffsetExpr) } case 22: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:186 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[1].Selector), exprDollar[3].duration, exprDollar[2].UnwrapExpr, nil) } case 23: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:187 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[1].Selector), exprDollar[3].duration, exprDollar[2].UnwrapExpr, exprDollar[4].OffsetExpr) } case 24: exprDollar = exprS[exprpt-5 : exprpt+1] +//line expr.y:188 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[2].Selector), exprDollar[5].duration, exprDollar[3].UnwrapExpr, nil) } case 25: exprDollar = exprS[exprpt-6 : exprpt+1] +//line expr.y:189 { exprVAL.LogRangeExpr = newLogRange(newMatcherExpr(exprDollar[2].Selector), exprDollar[5].duration, exprDollar[3].UnwrapExpr, exprDollar[6].OffsetExpr) } case 26: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:190 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].PipelineExpr), exprDollar[3].duration, nil, nil) } case 27: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:191 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].PipelineExpr), exprDollar[3].duration, nil, exprDollar[4].OffsetExpr) } case 28: exprDollar = exprS[exprpt-5 : exprpt+1] +//line expr.y:192 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[2].Selector), exprDollar[3].PipelineExpr), exprDollar[5].duration, nil, nil) } case 29: exprDollar = exprS[exprpt-6 : exprpt+1] +//line expr.y:193 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[2].Selector), exprDollar[3].PipelineExpr), exprDollar[5].duration, nil, exprDollar[6].OffsetExpr) } case 30: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:194 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].PipelineExpr), exprDollar[4].duration, exprDollar[3].UnwrapExpr, nil) } case 31: exprDollar = exprS[exprpt-5 : exprpt+1] +//line expr.y:195 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[2].PipelineExpr), exprDollar[4].duration, exprDollar[3].UnwrapExpr, exprDollar[5].OffsetExpr) } case 32: exprDollar = exprS[exprpt-6 : exprpt+1] +//line expr.y:196 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[2].Selector), exprDollar[3].PipelineExpr), exprDollar[6].duration, exprDollar[4].UnwrapExpr, nil) } case 33: exprDollar = exprS[exprpt-7 : exprpt+1] +//line expr.y:197 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[2].Selector), exprDollar[3].PipelineExpr), exprDollar[6].duration, exprDollar[4].UnwrapExpr, exprDollar[7].OffsetExpr) } case 34: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:198 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[3].PipelineExpr), exprDollar[2].duration, nil, nil) } case 35: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:199 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[4].PipelineExpr), exprDollar[2].duration, nil, exprDollar[3].OffsetExpr) } case 36: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:200 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[3].PipelineExpr), exprDollar[2].duration, exprDollar[4].UnwrapExpr, nil) } case 37: exprDollar = exprS[exprpt-5 : exprpt+1] +//line expr.y:201 { exprVAL.LogRangeExpr = newLogRange(newPipelineExpr(newMatcherExpr(exprDollar[1].Selector), exprDollar[4].PipelineExpr), exprDollar[2].duration, exprDollar[5].UnwrapExpr, exprDollar[3].OffsetExpr) } case 38: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:202 { exprVAL.LogRangeExpr = exprDollar[2].LogRangeExpr } case 40: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:207 { exprVAL.UnwrapExpr = newUnwrapExpr(exprDollar[3].str, "") } case 41: exprDollar = exprS[exprpt-6 : exprpt+1] +//line expr.y:208 { exprVAL.UnwrapExpr = newUnwrapExpr(exprDollar[5].str, exprDollar[3].ConvOp) } case 42: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:209 { exprVAL.UnwrapExpr = exprDollar[1].UnwrapExpr.addPostFilter(exprDollar[3].LabelFilter) } case 43: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:213 { exprVAL.ConvOp = OpConvBytes } case 44: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:214 { exprVAL.ConvOp = OpConvDuration } case 45: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:215 { exprVAL.ConvOp = OpConvDurationSeconds } case 46: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:219 { exprVAL.RangeAggregationExpr = newRangeAggregationExpr(exprDollar[3].LogRangeExpr, exprDollar[1].RangeOp, nil, nil) } case 47: exprDollar = exprS[exprpt-6 : exprpt+1] +//line expr.y:220 { exprVAL.RangeAggregationExpr = newRangeAggregationExpr(exprDollar[5].LogRangeExpr, exprDollar[1].RangeOp, nil, &exprDollar[3].str) } case 48: exprDollar = exprS[exprpt-5 : exprpt+1] +//line expr.y:221 { exprVAL.RangeAggregationExpr = newRangeAggregationExpr(exprDollar[3].LogRangeExpr, exprDollar[1].RangeOp, exprDollar[5].Grouping, nil) } case 49: exprDollar = exprS[exprpt-7 : exprpt+1] +//line expr.y:222 { exprVAL.RangeAggregationExpr = newRangeAggregationExpr(exprDollar[5].LogRangeExpr, exprDollar[1].RangeOp, exprDollar[7].Grouping, &exprDollar[3].str) } case 50: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:227 { exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[3].MetricExpr, exprDollar[1].VectorOp, nil, nil) } case 51: exprDollar = exprS[exprpt-5 : exprpt+1] +//line expr.y:228 { exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[4].MetricExpr, exprDollar[1].VectorOp, exprDollar[2].Grouping, nil) } case 52: exprDollar = exprS[exprpt-5 : exprpt+1] +//line expr.y:229 { exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[3].MetricExpr, exprDollar[1].VectorOp, exprDollar[5].Grouping, nil) } case 53: exprDollar = exprS[exprpt-6 : exprpt+1] +//line expr.y:231 { exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[5].MetricExpr, exprDollar[1].VectorOp, nil, &exprDollar[3].str) } case 54: exprDollar = exprS[exprpt-7 : exprpt+1] +//line expr.y:232 { exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[5].MetricExpr, exprDollar[1].VectorOp, exprDollar[7].Grouping, &exprDollar[3].str) } case 55: exprDollar = exprS[exprpt-7 : exprpt+1] +//line expr.y:233 { exprVAL.VectorAggregationExpr = mustNewVectorAggregationExpr(exprDollar[6].MetricExpr, exprDollar[1].VectorOp, exprDollar[2].Grouping, &exprDollar[4].str) } case 56: exprDollar = exprS[exprpt-12 : exprpt+1] +//line expr.y:238 { exprVAL.LabelReplaceExpr = mustNewLabelReplaceExpr(exprDollar[3].MetricExpr, exprDollar[5].str, exprDollar[7].str, exprDollar[9].str, exprDollar[11].str) } case 57: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:242 { exprVAL.Filter = log.LineMatchRegexp } case 58: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:243 { exprVAL.Filter = log.LineMatchEqual } case 59: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:244 { exprVAL.Filter = log.LineMatchPattern } case 60: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:245 { exprVAL.Filter = log.LineMatchNotRegexp } case 61: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:246 { exprVAL.Filter = log.LineMatchNotEqual } case 62: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:247 { exprVAL.Filter = log.LineMatchNotPattern } case 63: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:251 { exprVAL.Selector = exprDollar[2].Matchers } case 64: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:252 { exprVAL.Selector = exprDollar[2].Matchers } case 65: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:253 { } case 66: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:257 { exprVAL.Matchers = []*labels.Matcher{exprDollar[1].Matcher} } case 67: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:258 { exprVAL.Matchers = append(exprDollar[1].Matchers, exprDollar[3].Matcher) } case 68: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:262 { exprVAL.Matcher = mustNewMatcher(labels.MatchEqual, exprDollar[1].str, exprDollar[3].str) } case 69: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:263 { exprVAL.Matcher = mustNewMatcher(labels.MatchNotEqual, exprDollar[1].str, exprDollar[3].str) } case 70: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:264 { exprVAL.Matcher = mustNewMatcher(labels.MatchRegexp, exprDollar[1].str, exprDollar[3].str) } case 71: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:265 { exprVAL.Matcher = mustNewMatcher(labels.MatchNotRegexp, exprDollar[1].str, exprDollar[3].str) } case 72: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:269 { exprVAL.PipelineExpr = MultiStageExpr{exprDollar[1].PipelineStage} } case 73: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:270 { exprVAL.PipelineExpr = append(exprDollar[1].PipelineExpr, exprDollar[2].PipelineStage) } case 74: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:274 { exprVAL.PipelineStage = exprDollar[1].LineFilters } case 75: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:275 { exprVAL.PipelineStage = exprDollar[2].LogfmtParser } case 76: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:276 { exprVAL.PipelineStage = exprDollar[2].LabelParser } case 77: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:277 { exprVAL.PipelineStage = exprDollar[2].JSONExpressionParser } case 78: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:278 { exprVAL.PipelineStage = exprDollar[2].LogfmtExpressionParser } case 79: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:279 { exprVAL.PipelineStage = &LabelFilterExpr{LabelFilterer: exprDollar[2].LabelFilter} } case 80: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:280 { exprVAL.PipelineStage = exprDollar[2].LineFormatExpr } case 81: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:281 { exprVAL.PipelineStage = exprDollar[2].DecolorizeExpr } case 82: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:282 { exprVAL.PipelineStage = exprDollar[2].LabelFormatExpr } case 83: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:283 { exprVAL.PipelineStage = exprDollar[2].DropLabelsExpr } case 84: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:284 { exprVAL.PipelineStage = exprDollar[2].KeepLabelsExpr } case 85: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:288 { exprVAL.FilterOp = OpFilterIP } case 86: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:292 { exprVAL.OrFilter = newLineFilterExpr(log.LineMatchEqual, "", exprDollar[1].str) } case 87: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:293 { exprVAL.OrFilter = newLineFilterExpr(log.LineMatchEqual, exprDollar[1].FilterOp, exprDollar[3].str) } case 88: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:294 { exprVAL.OrFilter = newOrLineFilter(newLineFilterExpr(log.LineMatchEqual, "", exprDollar[1].str), exprDollar[3].OrFilter) } case 89: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:298 { exprVAL.LineFilter = newLineFilterExpr(exprDollar[1].Filter, "", exprDollar[2].str) } case 90: exprDollar = exprS[exprpt-5 : exprpt+1] +//line expr.y:299 { exprVAL.LineFilter = newLineFilterExpr(exprDollar[1].Filter, exprDollar[2].FilterOp, exprDollar[4].str) } case 91: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:300 { exprVAL.LineFilter = newOrLineFilter(newLineFilterExpr(exprDollar[1].Filter, "", exprDollar[2].str), exprDollar[4].OrFilter) } case 92: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:304 { exprVAL.LineFilters = exprDollar[1].LineFilter } case 93: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:305 { exprVAL.LineFilters = newOrLineFilter(exprDollar[1].LineFilter, exprDollar[3].OrFilter) } case 94: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:306 { exprVAL.LineFilters = newNestedLineFilterExpr(exprDollar[1].LineFilters, exprDollar[2].LineFilter) } case 95: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:310 { exprVAL.ParserFlags = []string{exprDollar[1].str} } case 96: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:311 { exprVAL.ParserFlags = append(exprDollar[1].ParserFlags, exprDollar[2].str) } case 97: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:315 { exprVAL.LogfmtParser = newLogfmtParserExpr(nil) } case 98: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:316 { exprVAL.LogfmtParser = newLogfmtParserExpr(exprDollar[2].ParserFlags) } case 99: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:320 { exprVAL.LabelParser = newLabelParserExpr(OpParserTypeJSON, "") } case 100: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:321 { exprVAL.LabelParser = newLabelParserExpr(OpParserTypeRegexp, exprDollar[2].str) } case 101: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:322 { exprVAL.LabelParser = newLabelParserExpr(OpParserTypeUnpack, "") } case 102: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:323 { exprVAL.LabelParser = newLabelParserExpr(OpParserTypePattern, exprDollar[2].str) } case 103: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:327 { exprVAL.JSONExpressionParser = newJSONExpressionParser(exprDollar[2].LabelExtractionExpressionList) } case 104: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:330 { exprVAL.LogfmtExpressionParser = newLogfmtExpressionParser(exprDollar[3].LabelExtractionExpressionList, exprDollar[2].ParserFlags) } case 105: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:331 { exprVAL.LogfmtExpressionParser = newLogfmtExpressionParser(exprDollar[2].LabelExtractionExpressionList, nil) } case 106: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:334 { exprVAL.LineFormatExpr = newLineFmtExpr(exprDollar[2].str) } case 107: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:336 { exprVAL.DecolorizeExpr = newDecolorizeExpr() } case 108: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:339 { exprVAL.LabelFormat = log.NewRenameLabelFmt(exprDollar[1].str, exprDollar[3].str) } case 109: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:340 { exprVAL.LabelFormat = log.NewTemplateLabelFmt(exprDollar[1].str, exprDollar[3].str) } case 110: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:344 { exprVAL.LabelsFormat = []log.LabelFmt{exprDollar[1].LabelFormat} } case 111: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:345 { exprVAL.LabelsFormat = append(exprDollar[1].LabelsFormat, exprDollar[3].LabelFormat) } case 113: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:350 { exprVAL.LabelFormatExpr = newLabelFmtExpr(exprDollar[2].LabelsFormat) } case 114: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:353 { exprVAL.LabelFilter = log.NewStringLabelFilter(exprDollar[1].Matcher) } case 115: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:354 { exprVAL.LabelFilter = exprDollar[1].IPLabelFilter } case 116: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:355 { exprVAL.LabelFilter = exprDollar[1].UnitFilter } case 117: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:356 { exprVAL.LabelFilter = exprDollar[1].NumberFilter } case 118: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:357 { exprVAL.LabelFilter = exprDollar[2].LabelFilter } case 119: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:358 { exprVAL.LabelFilter = log.NewAndLabelFilter(exprDollar[1].LabelFilter, exprDollar[2].LabelFilter) } case 120: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:359 { exprVAL.LabelFilter = log.NewAndLabelFilter(exprDollar[1].LabelFilter, exprDollar[3].LabelFilter) } case 121: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:360 { exprVAL.LabelFilter = log.NewAndLabelFilter(exprDollar[1].LabelFilter, exprDollar[3].LabelFilter) } case 122: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:361 { exprVAL.LabelFilter = log.NewOrLabelFilter(exprDollar[1].LabelFilter, exprDollar[3].LabelFilter) } case 123: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:365 { exprVAL.LabelExtractionExpression = log.NewLabelExtractionExpr(exprDollar[1].str, exprDollar[3].str) } case 124: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:366 { exprVAL.LabelExtractionExpression = log.NewLabelExtractionExpr(exprDollar[1].str, exprDollar[1].str) } case 125: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:369 { exprVAL.LabelExtractionExpressionList = []log.LabelExtractionExpr{exprDollar[1].LabelExtractionExpression} } case 126: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:370 { exprVAL.LabelExtractionExpressionList = append(exprDollar[1].LabelExtractionExpressionList, exprDollar[3].LabelExtractionExpression) } case 127: exprDollar = exprS[exprpt-6 : exprpt+1] +//line expr.y:374 { exprVAL.IPLabelFilter = log.NewIPLabelFilter(exprDollar[5].str, exprDollar[1].str, log.LabelFilterEqual) } case 128: exprDollar = exprS[exprpt-6 : exprpt+1] +//line expr.y:375 { exprVAL.IPLabelFilter = log.NewIPLabelFilter(exprDollar[5].str, exprDollar[1].str, log.LabelFilterNotEqual) } case 129: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:379 { exprVAL.UnitFilter = exprDollar[1].DurationFilter } case 130: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:380 { exprVAL.UnitFilter = exprDollar[1].BytesFilter } case 131: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:383 { exprVAL.DurationFilter = log.NewDurationLabelFilter(log.LabelFilterGreaterThan, exprDollar[1].str, exprDollar[3].duration) } case 132: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:384 { exprVAL.DurationFilter = log.NewDurationLabelFilter(log.LabelFilterGreaterThanOrEqual, exprDollar[1].str, exprDollar[3].duration) } case 133: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:385 { exprVAL.DurationFilter = log.NewDurationLabelFilter(log.LabelFilterLesserThan, exprDollar[1].str, exprDollar[3].duration) } case 134: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:386 { exprVAL.DurationFilter = log.NewDurationLabelFilter(log.LabelFilterLesserThanOrEqual, exprDollar[1].str, exprDollar[3].duration) } case 135: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:387 { exprVAL.DurationFilter = log.NewDurationLabelFilter(log.LabelFilterNotEqual, exprDollar[1].str, exprDollar[3].duration) } case 136: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:388 { exprVAL.DurationFilter = log.NewDurationLabelFilter(log.LabelFilterEqual, exprDollar[1].str, exprDollar[3].duration) } case 137: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:389 { exprVAL.DurationFilter = log.NewDurationLabelFilter(log.LabelFilterEqual, exprDollar[1].str, exprDollar[3].duration) } case 138: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:393 { exprVAL.BytesFilter = log.NewBytesLabelFilter(log.LabelFilterGreaterThan, exprDollar[1].str, exprDollar[3].bytes) } case 139: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:394 { exprVAL.BytesFilter = log.NewBytesLabelFilter(log.LabelFilterGreaterThanOrEqual, exprDollar[1].str, exprDollar[3].bytes) } case 140: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:395 { exprVAL.BytesFilter = log.NewBytesLabelFilter(log.LabelFilterLesserThan, exprDollar[1].str, exprDollar[3].bytes) } case 141: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:396 { exprVAL.BytesFilter = log.NewBytesLabelFilter(log.LabelFilterLesserThanOrEqual, exprDollar[1].str, exprDollar[3].bytes) } case 142: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:397 { exprVAL.BytesFilter = log.NewBytesLabelFilter(log.LabelFilterNotEqual, exprDollar[1].str, exprDollar[3].bytes) } case 143: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:398 { exprVAL.BytesFilter = log.NewBytesLabelFilter(log.LabelFilterEqual, exprDollar[1].str, exprDollar[3].bytes) } case 144: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:399 { exprVAL.BytesFilter = log.NewBytesLabelFilter(log.LabelFilterEqual, exprDollar[1].str, exprDollar[3].bytes) } case 145: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:403 { - exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterGreaterThan, exprDollar[1].str, mustNewFloat(exprDollar[3].str)) + exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterGreaterThan, exprDollar[1].str, exprDollar[3].LiteralExpr.Val) } case 146: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:404 { - exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterGreaterThanOrEqual, exprDollar[1].str, mustNewFloat(exprDollar[3].str)) + exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterGreaterThanOrEqual, exprDollar[1].str, exprDollar[3].LiteralExpr.Val) } case 147: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:405 { - exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterLesserThan, exprDollar[1].str, mustNewFloat(exprDollar[3].str)) + exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterLesserThan, exprDollar[1].str, exprDollar[3].LiteralExpr.Val) } case 148: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:406 { - exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterLesserThanOrEqual, exprDollar[1].str, mustNewFloat(exprDollar[3].str)) + exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterLesserThanOrEqual, exprDollar[1].str, exprDollar[3].LiteralExpr.Val) } case 149: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:407 { - exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterNotEqual, exprDollar[1].str, mustNewFloat(exprDollar[3].str)) + exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterNotEqual, exprDollar[1].str, exprDollar[3].LiteralExpr.Val) } case 150: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:408 { - exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterEqual, exprDollar[1].str, mustNewFloat(exprDollar[3].str)) + exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterEqual, exprDollar[1].str, exprDollar[3].LiteralExpr.Val) } case 151: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:409 { - exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterEqual, exprDollar[1].str, mustNewFloat(exprDollar[3].str)) + exprVAL.NumberFilter = log.NewNumericLabelFilter(log.LabelFilterEqual, exprDollar[1].str, exprDollar[3].LiteralExpr.Val) } case 152: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:413 { exprVAL.DropLabel = log.NewDropLabel(nil, exprDollar[1].str) } case 153: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:414 { exprVAL.DropLabel = log.NewDropLabel(exprDollar[1].Matcher, "") } case 154: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:417 { exprVAL.DropLabels = []log.DropLabel{exprDollar[1].DropLabel} } case 155: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:418 { exprVAL.DropLabels = append(exprDollar[1].DropLabels, exprDollar[3].DropLabel) } case 156: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:421 { exprVAL.DropLabelsExpr = newDropLabelsExpr(exprDollar[2].DropLabels) } case 157: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:424 { exprVAL.KeepLabel = log.NewKeepLabel(nil, exprDollar[1].str) } case 158: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:425 { exprVAL.KeepLabel = log.NewKeepLabel(exprDollar[1].Matcher, "") } case 159: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:428 { exprVAL.KeepLabels = []log.KeepLabel{exprDollar[1].KeepLabel} } case 160: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:429 { exprVAL.KeepLabels = append(exprDollar[1].KeepLabels, exprDollar[3].KeepLabel) } case 161: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:432 { exprVAL.KeepLabelsExpr = newKeepLabelsExpr(exprDollar[2].KeepLabels) } case 162: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:436 { exprVAL.BinOpExpr = mustNewBinOpExpr("or", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 163: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:437 { exprVAL.BinOpExpr = mustNewBinOpExpr("and", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 164: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:438 { exprVAL.BinOpExpr = mustNewBinOpExpr("unless", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 165: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:439 { exprVAL.BinOpExpr = mustNewBinOpExpr("+", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 166: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:440 { exprVAL.BinOpExpr = mustNewBinOpExpr("-", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 167: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:441 { exprVAL.BinOpExpr = mustNewBinOpExpr("*", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 168: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:442 { exprVAL.BinOpExpr = mustNewBinOpExpr("/", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 169: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:443 { exprVAL.BinOpExpr = mustNewBinOpExpr("%", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 170: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:444 { exprVAL.BinOpExpr = mustNewBinOpExpr("^", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 171: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:445 { exprVAL.BinOpExpr = mustNewBinOpExpr("==", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 172: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:446 { exprVAL.BinOpExpr = mustNewBinOpExpr("!=", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 173: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:447 { exprVAL.BinOpExpr = mustNewBinOpExpr(">", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 174: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:448 { exprVAL.BinOpExpr = mustNewBinOpExpr(">=", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 175: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:449 { exprVAL.BinOpExpr = mustNewBinOpExpr("<", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 176: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:450 { exprVAL.BinOpExpr = mustNewBinOpExpr("<=", exprDollar[3].BinOpModifier, exprDollar[1].Expr, exprDollar[4].Expr) } case 177: exprDollar = exprS[exprpt-0 : exprpt+1] +//line expr.y:454 { exprVAL.BoolModifier = &BinOpOptions{VectorMatching: &VectorMatching{Card: CardOneToOne}} } case 178: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:458 { exprVAL.BoolModifier = &BinOpOptions{VectorMatching: &VectorMatching{Card: CardOneToOne}, ReturnBool: true} } case 179: exprDollar = exprS[exprpt-5 : exprpt+1] +//line expr.y:465 { exprVAL.OnOrIgnoringModifier = exprDollar[1].BoolModifier exprVAL.OnOrIgnoringModifier.VectorMatching.On = true @@ -1774,45 +1964,53 @@ exprdefault: } case 180: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:471 { exprVAL.OnOrIgnoringModifier = exprDollar[1].BoolModifier exprVAL.OnOrIgnoringModifier.VectorMatching.On = true } case 181: exprDollar = exprS[exprpt-5 : exprpt+1] +//line expr.y:476 { exprVAL.OnOrIgnoringModifier = exprDollar[1].BoolModifier exprVAL.OnOrIgnoringModifier.VectorMatching.MatchingLabels = exprDollar[4].Labels } case 182: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:481 { exprVAL.OnOrIgnoringModifier = exprDollar[1].BoolModifier } case 183: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:487 { exprVAL.BinOpModifier = exprDollar[1].BoolModifier } case 184: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:488 { exprVAL.BinOpModifier = exprDollar[1].OnOrIgnoringModifier } case 185: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:490 { exprVAL.BinOpModifier = exprDollar[1].OnOrIgnoringModifier exprVAL.BinOpModifier.VectorMatching.Card = CardManyToOne } case 186: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:495 { exprVAL.BinOpModifier = exprDollar[1].OnOrIgnoringModifier exprVAL.BinOpModifier.VectorMatching.Card = CardManyToOne } case 187: exprDollar = exprS[exprpt-5 : exprpt+1] +//line expr.y:500 { exprVAL.BinOpModifier = exprDollar[1].OnOrIgnoringModifier exprVAL.BinOpModifier.VectorMatching.Card = CardManyToOne @@ -1820,18 +2018,21 @@ exprdefault: } case 188: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:506 { exprVAL.BinOpModifier = exprDollar[1].OnOrIgnoringModifier exprVAL.BinOpModifier.VectorMatching.Card = CardOneToMany } case 189: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:511 { exprVAL.BinOpModifier = exprDollar[1].OnOrIgnoringModifier exprVAL.BinOpModifier.VectorMatching.Card = CardOneToMany } case 190: exprDollar = exprS[exprpt-5 : exprpt+1] +//line expr.y:516 { exprVAL.BinOpModifier = exprDollar[1].OnOrIgnoringModifier exprVAL.BinOpModifier.VectorMatching.Card = CardOneToMany @@ -1839,191 +2040,229 @@ exprdefault: } case 191: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:524 { exprVAL.LiteralExpr = mustNewLiteralExpr(exprDollar[1].str, false) } case 192: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:525 { exprVAL.LiteralExpr = mustNewLiteralExpr(exprDollar[2].str, false) } case 193: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:526 { exprVAL.LiteralExpr = mustNewLiteralExpr(exprDollar[2].str, true) } case 194: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:530 { exprVAL.VectorExpr = NewVectorExpr(exprDollar[3].str) } case 195: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:533 { exprVAL.Vector = OpTypeVector } case 196: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:537 { exprVAL.VectorOp = OpTypeSum } case 197: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:538 { exprVAL.VectorOp = OpTypeAvg } case 198: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:539 { exprVAL.VectorOp = OpTypeCount } case 199: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:540 { exprVAL.VectorOp = OpTypeMax } case 200: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:541 { exprVAL.VectorOp = OpTypeMin } case 201: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:542 { exprVAL.VectorOp = OpTypeStddev } case 202: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:543 { exprVAL.VectorOp = OpTypeStdvar } case 203: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:544 { exprVAL.VectorOp = OpTypeBottomK } case 204: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:545 { exprVAL.VectorOp = OpTypeTopK } case 205: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:546 { exprVAL.VectorOp = OpTypeSort } case 206: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:547 { exprVAL.VectorOp = OpTypeSortDesc } case 207: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:551 { exprVAL.RangeOp = OpRangeTypeCount } case 208: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:552 { exprVAL.RangeOp = OpRangeTypeRate } case 209: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:553 { exprVAL.RangeOp = OpRangeTypeRateCounter } case 210: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:554 { exprVAL.RangeOp = OpRangeTypeBytes } case 211: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:555 { exprVAL.RangeOp = OpRangeTypeBytesRate } case 212: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:556 { exprVAL.RangeOp = OpRangeTypeAvg } case 213: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:557 { exprVAL.RangeOp = OpRangeTypeSum } case 214: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:558 { exprVAL.RangeOp = OpRangeTypeMin } case 215: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:559 { exprVAL.RangeOp = OpRangeTypeMax } case 216: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:560 { exprVAL.RangeOp = OpRangeTypeStdvar } case 217: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:561 { exprVAL.RangeOp = OpRangeTypeStddev } case 218: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:562 { exprVAL.RangeOp = OpRangeTypeQuantile } case 219: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:563 { exprVAL.RangeOp = OpRangeTypeFirst } case 220: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:564 { exprVAL.RangeOp = OpRangeTypeLast } case 221: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:565 { exprVAL.RangeOp = OpRangeTypeAbsent } case 222: exprDollar = exprS[exprpt-2 : exprpt+1] +//line expr.y:569 { exprVAL.OffsetExpr = newOffsetExpr(exprDollar[2].duration) } case 223: exprDollar = exprS[exprpt-1 : exprpt+1] +//line expr.y:572 { exprVAL.Labels = []string{exprDollar[1].str} } case 224: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:573 { exprVAL.Labels = append(exprDollar[1].Labels, exprDollar[3].str) } case 225: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:577 { exprVAL.Grouping = &Grouping{Without: false, Groups: exprDollar[3].Labels} } case 226: exprDollar = exprS[exprpt-4 : exprpt+1] +//line expr.y:578 { exprVAL.Grouping = &Grouping{Without: true, Groups: exprDollar[3].Labels} } case 227: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:579 { exprVAL.Grouping = &Grouping{Without: false, Groups: nil} } case 228: exprDollar = exprS[exprpt-3 : exprpt+1] +//line expr.y:580 { exprVAL.Grouping = &Grouping{Without: true, Groups: nil} } diff --git a/pkg/logql/syntax/lex_test.go b/pkg/logql/syntax/lex_test.go index 97e6ba22c4..08878186bd 100644 --- a/pkg/logql/syntax/lex_test.go +++ b/pkg/logql/syntax/lex_test.go @@ -95,6 +95,19 @@ func TestLex(t *testing.T) { {`{foo="bar"} | logfmt --strict code"`, []int{OPEN_BRACE, IDENTIFIER, EQ, STRING, CLOSE_BRACE, PIPE, LOGFMT, PARSER_FLAG, IDENTIFIER}}, {`{foo="bar"} | logfmt --keep-empty --strict code="response.code", IPAddress="host"`, []int{OPEN_BRACE, IDENTIFIER, EQ, STRING, CLOSE_BRACE, PIPE, LOGFMT, PARSER_FLAG, PARSER_FLAG, IDENTIFIER, EQ, STRING, COMMA, IDENTIFIER, EQ, STRING}}, {`decolorize`, []int{DECOLORIZE}}, + {`123`, []int{NUMBER}}, + {`-123`, []int{SUB, NUMBER}}, + {`123.45`, []int{NUMBER}}, + {`-123.45`, []int{SUB, NUMBER}}, + {`123KB`, []int{BYTES}}, + // Skip -123KB: Negative bytes are explicitly not supported in the Lexer. + {`123ms`, []int{DURATION}}, + {`-123ms`, []int{DURATION}}, + {`34 + - 123`, []int{NUMBER, ADD, SUB, NUMBER}}, + {`34 + -123`, []int{NUMBER, ADD, SUB, NUMBER}}, + {`34+-123`, []int{NUMBER, ADD, SUB, NUMBER}}, + {`34-123`, []int{NUMBER, SUB, NUMBER}}, + {`sum(rate({foo="bar"}[5m])-1 > 30`, []int{SUM, OPEN_PARENTHESIS, RATE, OPEN_PARENTHESIS, OPEN_BRACE, IDENTIFIER, EQ, STRING, CLOSE_BRACE, RANGE, CLOSE_PARENTHESIS, SUB, NUMBER, GT, NUMBER}}, } { t.Run(tc.input, func(t *testing.T) { actual := []int{} @@ -179,6 +192,7 @@ func Test_parseDuration(t *testing.T) { {"1w", WEEK}, {"1d", DAY}, {"1h15m30.918273645s", time.Hour + 15*time.Minute + 30*time.Second + 918273645*time.Nanosecond}, + {"-1s", -1 * time.Second}, } { actual, err := parseDuration(tc.input) diff --git a/pkg/logql/syntax/parser_test.go b/pkg/logql/syntax/parser_test.go index 3851013f4b..f12309f2b2 100644 --- a/pkg/logql/syntax/parser_test.go +++ b/pkg/logql/syntax/parser_test.go @@ -499,19 +499,19 @@ var ParseTestCases = []struct { // label filter for ip-matcher { in: `{ foo = "bar" }|logfmt|addr>=ip("1.2.3.4")`, - err: logqlmodel.NewParseError("syntax error: unexpected ip, expecting BYTES or NUMBER or DURATION", 1, 30), + err: logqlmodel.NewParseError("syntax error: unexpected ip", 1, 30), }, { in: `{ foo = "bar" }|logfmt|addr>ip("1.2.3.4")`, - err: logqlmodel.NewParseError("syntax error: unexpected ip, expecting BYTES or NUMBER or DURATION", 1, 29), + err: logqlmodel.NewParseError("syntax error: unexpected ip", 1, 29), }, { in: `{ foo = "bar" }|logfmt|addr<=ip("1.2.3.4")`, - err: logqlmodel.NewParseError("syntax error: unexpected ip, expecting BYTES or NUMBER or DURATION", 1, 30), + err: logqlmodel.NewParseError("syntax error: unexpected ip", 1, 30), }, { in: `{ foo = "bar" }|logfmt|addr