mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Code was already working, added working tests

Browse source
This commit is contained in:
Owen Williams 2023-12-08 14:15:32 -05:00
parent 8d1f6ecd77
commit cffe382b6c
3 changed files with 3570 additions and 3568 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
promql/parser/generated_parser.y
View file

@ -586,10 +586,7 @@ label_matcher : IDENTIFIER match_op STRING
| string_identifier match_op STRING | string_identifier match_op STRING
{ $$ = yylex.(*parser).newLabelMatcher($1, $2, $3); } { $$ = yylex.(*parser).newLabelMatcher($1, $2, $3); }
| string_identifier | string_identifier
{ { $$ = yylex.(*parser).newMetricNameMatcher($1); }
// metric name matcher!
$$ = yylex.(*parser).newMetricNameMatcher($1);
}
| IDENTIFIER match_op error | IDENTIFIER match_op error
{ yylex.(*parser).unexpected("label matching", "string"); $$ = nil} { yylex.(*parser).unexpected("label matching", "string"); $$ = nil}
| IDENTIFIER error | IDENTIFIER error
@ -612,10 +609,7 @@ metric : metric_identifier label_set
metric_identifier: AVG | BOTTOMK | BY | COUNT | COUNT_VALUES | GROUP | IDENTIFIER | LAND | LOR | LUNLESS | MAX | METRIC_IDENTIFIER | MIN | OFFSET | QUANTILE | STDDEV | STDVAR | SUM | TOPK | WITHOUT | START | END; metric_identifier: AVG | BOTTOMK | BY | COUNT | COUNT_VALUES | GROUP | IDENTIFIER | LAND | LOR | LUNLESS | MAX | METRIC_IDENTIFIER | MIN | OFFSET | QUANTILE | STDDEV | STDVAR | SUM | TOPK | WITHOUT | START | END;
label_set : LEFT_BRACE label_set_list RIGHT_BRACE label_set : LEFT_BRACE label_set_list RIGHT_BRACE
{ { $$ = labels.New($2...) }
// LEFT_BRACE label_set_list RIGHT_BRACE
$$ = labels.New($2...)
}
| LEFT_BRACE label_set_list COMMA RIGHT_BRACE | LEFT_BRACE label_set_list COMMA RIGHT_BRACE
{ $$ = labels.New($2...) } { $$ = labels.New($2...) }
| LEFT_BRACE RIGHT_BRACE | LEFT_BRACE RIGHT_BRACE
@ -634,17 +628,7 @@ label_set_list : label_set_list COMMA label_set_item
; ;
label_set_item : IDENTIFIER EQL STRING label_set_item : IDENTIFIER EQL STRING
{ { $$ = labels.Label{Name: $1.Val, Value: yylex.(*parser).unquoteString($3.Val) } }
// ident eq string
$$ = labels.Label{Name: $1.Val, Value: yylex.(*parser).unquoteString($3.Val) } }
// | STRING EQL STRING
// {
// // string eq string
// $$ = labels.Label{Name: yylex.(*parser).unquoteString($3.Val), Value: yylex.(*parser).unquoteString($3.Val) } }
// | STRING
// {
// // looks good?
// $$ = labels.Label{Name: labels.MetricName, Value: yylex.(*parser).unquoteString($1.Val) } }
| IDENTIFIER EQL error | IDENTIFIER EQL error
{ yylex.(*parser).unexpected("label set", "string"); $$ = labels.Label{}} { yylex.(*parser).unexpected("label set", "string"); $$ = labels.Label{}}
| IDENTIFIER error | IDENTIFIER error
@ -925,7 +909,6 @@ string_literal : STRING
string_identifier : STRING string_identifier : STRING
{ {
// string_identifier
$$ = Item{ $$ = Item{
Typ: METRIC_IDENTIFIER, Typ: METRIC_IDENTIFIER,
Pos: $1.PositionRange().Start, Pos: $1.PositionRange().Start,

5
promql/parser/generated_parser.y.go
View file

@ -1404,7 +1404,10 @@ yydefault:
case 85: case 85:
yyDollar = yyS[yypt-3 : yypt+1] yyDollar = yyS[yypt-3 : yypt+1]
{ {
// label_matchers
// name := yylex.(*parser).findNameMatcher($2)
yyVAL.node = &VectorSelector{ yyVAL.node = &VectorSelector{
// Name: name,
LabelMatchers: yyDollar[2].matchers, LabelMatchers: yyDollar[2].matchers,
PosRange: mergeRanges(&yyDollar[1].item, &yyDollar[3].item), PosRange: mergeRanges(&yyDollar[1].item, &yyDollar[3].item),
} }
@ -1412,7 +1415,9 @@ yydefault:
case 86: case 86:
yyDollar = yyS[yypt-4 : yypt+1] yyDollar = yyS[yypt-4 : yypt+1]
{ {
// name := yylex.(*parser).findNameMatcher($2)
yyVAL.node = &VectorSelector{ yyVAL.node = &VectorSelector{
// Name: name,
LabelMatchers: yyDollar[2].matchers, LabelMatchers: yyDollar[2].matchers,
PosRange: mergeRanges(&yyDollar[1].item, &yyDollar[4].item), PosRange: mergeRanges(&yyDollar[1].item, &yyDollar[4].item),
} }

7110
promql/parser/parse_test.go
View file

File diff suppressed because it is too large Load diff