2019-12-05 08:16:12 -08:00
|
|
|
// Copyright 2019 The Prometheus Authors
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
%{
|
2020-02-03 08:23:44 -08:00
|
|
|
package parser
|
2019-12-05 08:16:12 -08:00
|
|
|
|
2019-12-21 00:44:12 -08:00
|
|
|
import (
|
|
|
|
"math"
|
|
|
|
"strconv"
|
2020-01-08 03:04:47 -08:00
|
|
|
"time"
|
2019-12-16 08:38:18 -08:00
|
|
|
|
2021-11-08 06:23:17 -08:00
|
|
|
"github.com/prometheus/prometheus/model/labels"
|
|
|
|
"github.com/prometheus/prometheus/model/value"
|
2023-08-25 14:35:42 -07:00
|
|
|
"github.com/prometheus/prometheus/model/histogram"
|
2023-11-07 14:37:37 -08:00
|
|
|
"github.com/prometheus/prometheus/promql/parser/posrange"
|
2024-08-01 07:07:08 -07:00
|
|
|
|
|
|
|
"github.com/prometheus/common/model"
|
2019-12-21 00:44:12 -08:00
|
|
|
)
|
2022-03-09 14:14:58 -08:00
|
|
|
|
2019-12-05 08:16:12 -08:00
|
|
|
%}
|
|
|
|
|
|
|
|
%union {
|
2023-08-25 14:35:42 -07:00
|
|
|
node Node
|
|
|
|
item Item
|
|
|
|
matchers []*labels.Matcher
|
|
|
|
matcher *labels.Matcher
|
|
|
|
label labels.Label
|
|
|
|
labels labels.Labels
|
|
|
|
lblList []labels.Label
|
|
|
|
strings []string
|
|
|
|
series []SequenceValue
|
|
|
|
histogram *histogram.FloatHistogram
|
|
|
|
descriptors map[string]interface{}
|
|
|
|
bucket_set []float64
|
|
|
|
int int64
|
|
|
|
uint uint64
|
|
|
|
float float64
|
2019-12-05 08:16:12 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-01-17 07:16:58 -08:00
|
|
|
%token <item>
|
2020-09-09 03:10:02 -07:00
|
|
|
EQL
|
2020-01-08 03:04:47 -08:00
|
|
|
BLANK
|
|
|
|
COLON
|
|
|
|
COMMA
|
|
|
|
COMMENT
|
|
|
|
DURATION
|
|
|
|
EOF
|
|
|
|
ERROR
|
|
|
|
IDENTIFIER
|
|
|
|
LEFT_BRACE
|
|
|
|
LEFT_BRACKET
|
|
|
|
LEFT_PAREN
|
2023-08-25 14:35:42 -07:00
|
|
|
OPEN_HIST
|
|
|
|
CLOSE_HIST
|
2020-01-08 03:04:47 -08:00
|
|
|
METRIC_IDENTIFIER
|
|
|
|
NUMBER
|
|
|
|
RIGHT_BRACE
|
|
|
|
RIGHT_BRACKET
|
|
|
|
RIGHT_PAREN
|
|
|
|
SEMICOLON
|
|
|
|
SPACE
|
|
|
|
STRING
|
|
|
|
TIMES
|
2019-12-05 08:16:12 -08:00
|
|
|
|
2023-08-25 14:35:42 -07:00
|
|
|
// Histogram Descriptors.
|
|
|
|
%token histogramDescStart
|
|
|
|
%token <item>
|
|
|
|
SUM_DESC
|
|
|
|
COUNT_DESC
|
|
|
|
SCHEMA_DESC
|
|
|
|
OFFSET_DESC
|
|
|
|
NEGATIVE_OFFSET_DESC
|
|
|
|
BUCKETS_DESC
|
|
|
|
NEGATIVE_BUCKETS_DESC
|
|
|
|
ZERO_BUCKET_DESC
|
|
|
|
ZERO_BUCKET_WIDTH_DESC
|
2024-05-08 04:58:24 -07:00
|
|
|
CUSTOM_VALUES_DESC
|
2024-07-31 00:53:05 -07:00
|
|
|
COUNTER_RESET_HINT_DESC
|
2023-08-25 14:35:42 -07:00
|
|
|
%token histogramDescEnd
|
|
|
|
|
2019-12-05 08:16:12 -08:00
|
|
|
// Operators.
|
2020-01-08 03:04:47 -08:00
|
|
|
%token operatorsStart
|
|
|
|
%token <item>
|
|
|
|
ADD
|
|
|
|
DIV
|
2020-09-09 03:10:02 -07:00
|
|
|
EQLC
|
2020-01-08 03:04:47 -08:00
|
|
|
EQL_REGEX
|
|
|
|
GTE
|
|
|
|
GTR
|
|
|
|
LAND
|
|
|
|
LOR
|
|
|
|
LSS
|
|
|
|
LTE
|
|
|
|
LUNLESS
|
|
|
|
MOD
|
|
|
|
MUL
|
|
|
|
NEQ
|
|
|
|
NEQ_REGEX
|
|
|
|
POW
|
|
|
|
SUB
|
2021-01-20 02:57:39 -08:00
|
|
|
AT
|
2021-08-24 16:22:14 -07:00
|
|
|
ATAN2
|
2019-12-05 08:16:12 -08:00
|
|
|
%token operatorsEnd
|
|
|
|
|
|
|
|
// Aggregators.
|
2020-01-08 03:04:47 -08:00
|
|
|
%token aggregatorsStart
|
|
|
|
%token <item>
|
|
|
|
AVG
|
|
|
|
BOTTOMK
|
|
|
|
COUNT
|
|
|
|
COUNT_VALUES
|
2020-06-30 07:51:18 -07:00
|
|
|
GROUP
|
2020-01-08 03:04:47 -08:00
|
|
|
MAX
|
|
|
|
MIN
|
|
|
|
QUANTILE
|
|
|
|
STDDEV
|
|
|
|
STDVAR
|
|
|
|
SUM
|
|
|
|
TOPK
|
feat: add limitk() and limit_ratio() operators (#12503)
* rebase 2024-07-01, picks previous renaming to `limitk()` and `limit_ratio()`
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* gofumpt -d -extra
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* more lint fixes
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* more lint fixes+
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* put limitk() and limit_ratio() behind --enable-feature=promql-experimental-functions
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* EnableExperimentalFunctions for TestConcurrentRangeQueries() also
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* use testutil.RequireEqual to fix tests, WIP equivalent thingie for require.Contains
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* lint fix
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* moar linting
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* rebase 2024-06-19
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* re-add limit(2, metric) testing for N=2 common series subset
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move `ratio = param` to default switch case, for better readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* gofumpt -d -extra util/testutil/cmp.go
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* early break when reaching k elems in limitk(), should have always been so (!)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* small typo fix
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change small break-loop rearrange for readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove IsNan(ratio) condition in switch-case, already handled as input validation
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change adding some comments
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change simplify fullMatrix() helper functions used for tests
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add `limitk(-1, metric)` testcase, which is handled as any k < 1 case
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* engine_test.go: no-change create `requireCommonSeries() helper func (moving code into it) for readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* rebase 2024-06-21
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* engine_test.go: HAPPY NOW about its code -> reorg, create and use simpleRangeQuery() function, less lines and more readable ftW \o/
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move limitk(), limit_ratio() testing to promql/promqltest/testdata/limit.test
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove stale leftover after moving tests from engine_test.go to testdata/
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix flaky `limit_ratio(0.5, ...)` test case
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix AddRatioSample() implementation to use a single conditional (instead of switch/case + fallback return)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* docs/querying/operators.md: document r < 0
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add negative limit_ratio() example to docs/querying/examples.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move more extensive docu examples to docs/querying/operators.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* typo
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* small docu fix for poor-mans-normality-check, add it to limit.test ;)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* limit.test: expand "Poor man's normality check" to whole eval range
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* restore mistakenly removed existing small comment
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* expand poors-man-normality-check case(s)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Revert "expand poors-man-normality-check case(s)"
This reverts commit f69e1603b2ebe69c0a100197cfbcf6f81644b564, indeed too
flaky 0:)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove humor from docs/querying/operators.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix signoff
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add web/ui missing changes
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* expand limit_ratio test cases, cross-fingering they'll not be flaky
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove flaky test
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add missing warnings.Merge(ws) in instant-query return shortcut
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add missing LimitK||LimitRatio case to codemirror-promql/src/parser/parser.ts
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix ui-lint
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* actually fix returned warnings :]
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
---------
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
Co-authored-by: Julius Volz <julius.volz@gmail.com>
2024-07-03 13:18:57 -07:00
|
|
|
LIMITK
|
|
|
|
LIMIT_RATIO
|
2019-12-05 08:16:12 -08:00
|
|
|
%token aggregatorsEnd
|
|
|
|
|
|
|
|
// Keywords.
|
2020-01-08 03:04:47 -08:00
|
|
|
%token keywordsStart
|
|
|
|
%token <item>
|
|
|
|
BOOL
|
|
|
|
BY
|
|
|
|
GROUP_LEFT
|
|
|
|
GROUP_RIGHT
|
|
|
|
IGNORING
|
|
|
|
OFFSET
|
|
|
|
ON
|
|
|
|
WITHOUT
|
2019-12-05 08:16:12 -08:00
|
|
|
%token keywordsEnd
|
|
|
|
|
2021-02-09 08:03:16 -08:00
|
|
|
// Preprocessors.
|
|
|
|
%token preprocessorStart
|
|
|
|
%token <item>
|
|
|
|
START
|
|
|
|
END
|
|
|
|
%token preprocessorEnd
|
|
|
|
|
2024-07-31 00:53:05 -07:00
|
|
|
// Counter reset hints.
|
|
|
|
%token counterResetHintsStart
|
|
|
|
%token <item>
|
|
|
|
UNKNOWN_COUNTER_RESET
|
|
|
|
COUNTER_RESET
|
|
|
|
NOT_COUNTER_RESET
|
|
|
|
GAUGE_TYPE
|
|
|
|
%token counterResetHintsEnd
|
2019-12-05 08:16:12 -08:00
|
|
|
|
|
|
|
// Start symbols for the generated parser.
|
2020-01-08 03:04:47 -08:00
|
|
|
%token startSymbolsStart
|
|
|
|
%token
|
|
|
|
START_METRIC
|
|
|
|
START_SERIES_DESCRIPTION
|
|
|
|
START_EXPRESSION
|
|
|
|
START_METRIC_SELECTOR
|
2019-12-05 08:16:12 -08:00
|
|
|
%token startSymbolsEnd
|
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
|
|
|
|
// Type definitions for grammar rules.
|
2020-01-14 08:12:15 -08:00
|
|
|
%type <matchers> label_match_list
|
2019-12-05 08:16:12 -08:00
|
|
|
%type <matcher> label_matcher
|
2024-07-31 00:53:05 -07:00
|
|
|
%type <item> aggregate_op grouping_label match_op maybe_label metric_identifier unary_op at_modifier_preprocessors string_identifier counter_reset_hint
|
2022-03-09 14:14:58 -08:00
|
|
|
%type <labels> label_set metric
|
|
|
|
%type <lblList> label_set_list
|
2020-01-08 03:04:47 -08:00
|
|
|
%type <label> label_set_item
|
|
|
|
%type <strings> grouping_label_list grouping_labels maybe_grouping_labels
|
|
|
|
%type <series> series_item series_values
|
2023-08-25 14:35:42 -07:00
|
|
|
%type <histogram> histogram_series_value
|
|
|
|
%type <descriptors> histogram_desc_map histogram_desc_item
|
|
|
|
%type <bucket_set> bucket_set bucket_set_list
|
|
|
|
%type <int> int
|
2019-12-21 00:44:12 -08:00
|
|
|
%type <uint> uint
|
2021-01-20 02:57:39 -08:00
|
|
|
%type <float> number series_value signed_number signed_or_unsigned_number
|
2024-03-04 05:57:28 -08:00
|
|
|
%type <node> step_invariant_expr aggregate_expr aggregate_modifier bin_modifier binary_expr bool_modifier expr function_call function_call_args function_call_body group_modifiers label_matchers matrix_selector number_duration_literal offset_expr on_or_ignoring paren_expr string_literal subquery_expr unary_expr vector_selector
|
2019-12-16 05:58:47 -08:00
|
|
|
|
2019-12-05 08:16:12 -08:00
|
|
|
%start start
|
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
// Operators are listed with increasing precedence.
|
|
|
|
%left LOR
|
|
|
|
%left LAND LUNLESS
|
2020-09-09 03:10:02 -07:00
|
|
|
%left EQLC GTE GTR LSS LTE NEQ
|
2020-01-08 03:04:47 -08:00
|
|
|
%left ADD SUB
|
2021-08-24 16:22:14 -07:00
|
|
|
%left MUL DIV MOD ATAN2
|
2020-01-08 03:04:47 -08:00
|
|
|
%right POW
|
|
|
|
|
|
|
|
// Offset modifiers do not have associativity.
|
|
|
|
%nonassoc OFFSET
|
|
|
|
|
|
|
|
// This ensures that it is always attempted to parse range or subquery selectors when a left
|
|
|
|
// bracket is encountered.
|
|
|
|
%right LEFT_BRACKET
|
|
|
|
|
2019-12-05 08:16:12 -08:00
|
|
|
%%
|
|
|
|
|
2020-01-17 07:16:58 -08:00
|
|
|
start :
|
2020-01-08 03:04:47 -08:00
|
|
|
START_METRIC metric
|
|
|
|
{ yylex.(*parser).generatedParserResult = $2 }
|
2019-12-21 00:44:12 -08:00
|
|
|
| START_SERIES_DESCRIPTION series_description
|
2020-01-08 03:04:47 -08:00
|
|
|
| START_EXPRESSION /* empty */ EOF
|
2023-09-14 09:57:31 -07:00
|
|
|
{ yylex.(*parser).addParseErrf(posrange.PositionRange{}, "no expression found in input")}
|
2020-01-08 03:04:47 -08:00
|
|
|
| START_EXPRESSION expr
|
|
|
|
{ yylex.(*parser).generatedParserResult = $2 }
|
2020-01-17 07:16:58 -08:00
|
|
|
| START_METRIC_SELECTOR vector_selector
|
2020-01-08 03:04:47 -08:00
|
|
|
{ yylex.(*parser).generatedParserResult = $2 }
|
2019-12-21 00:44:12 -08:00
|
|
|
| start EOF
|
2019-12-16 05:58:47 -08:00
|
|
|
| error /* If none of the more detailed error messages are triggered, we fall back to this. */
|
2019-12-18 09:36:43 -08:00
|
|
|
{ yylex.(*parser).unexpected("","") }
|
2019-12-05 08:16:12 -08:00
|
|
|
;
|
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
expr :
|
|
|
|
aggregate_expr
|
|
|
|
| binary_expr
|
|
|
|
| function_call
|
|
|
|
| matrix_selector
|
2024-03-04 05:57:28 -08:00
|
|
|
| number_duration_literal
|
2020-01-08 03:04:47 -08:00
|
|
|
| offset_expr
|
|
|
|
| paren_expr
|
|
|
|
| string_literal
|
|
|
|
| subquery_expr
|
|
|
|
| unary_expr
|
|
|
|
| vector_selector
|
2021-01-20 02:57:39 -08:00
|
|
|
| step_invariant_expr
|
2020-01-08 03:04:47 -08:00
|
|
|
;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Aggregations.
|
|
|
|
*/
|
|
|
|
|
|
|
|
aggregate_expr : aggregate_op aggregate_modifier function_call_body
|
|
|
|
{ $$ = yylex.(*parser).newAggregateExpr($1, $2, $3) }
|
|
|
|
| aggregate_op function_call_body aggregate_modifier
|
|
|
|
{ $$ = yylex.(*parser).newAggregateExpr($1, $3, $2) }
|
|
|
|
| aggregate_op function_call_body
|
|
|
|
{ $$ = yylex.(*parser).newAggregateExpr($1, &AggregateExpr{}, $2) }
|
|
|
|
| aggregate_op error
|
2021-01-20 02:57:39 -08:00
|
|
|
{
|
|
|
|
yylex.(*parser).unexpected("aggregation","");
|
2020-03-05 00:03:38 -08:00
|
|
|
$$ = yylex.(*parser).newAggregateExpr($1, &AggregateExpr{}, Expressions{})
|
|
|
|
}
|
2020-01-08 03:04:47 -08:00
|
|
|
;
|
|
|
|
|
|
|
|
aggregate_modifier:
|
|
|
|
BY grouping_labels
|
|
|
|
{
|
|
|
|
$$ = &AggregateExpr{
|
|
|
|
Grouping: $2,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
| WITHOUT grouping_labels
|
|
|
|
{
|
|
|
|
$$ = &AggregateExpr{
|
|
|
|
Grouping: $2,
|
|
|
|
Without: true,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Binary expressions.
|
|
|
|
*/
|
|
|
|
|
|
|
|
// Operator precedence only works if each of those is listed separately.
|
|
|
|
binary_expr : expr ADD bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
2021-08-24 16:22:14 -07:00
|
|
|
| expr ATAN2 bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
2020-01-08 03:04:47 -08:00
|
|
|
| expr DIV bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
2020-09-09 03:10:02 -07:00
|
|
|
| expr EQLC bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
2020-01-08 03:04:47 -08:00
|
|
|
| expr GTE bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
|
|
|
| expr GTR bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
|
|
|
| expr LAND bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
|
|
|
| expr LOR bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
|
|
|
| expr LSS bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
|
|
|
| expr LTE bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
|
|
|
| expr LUNLESS bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
|
|
|
| expr MOD bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
|
|
|
| expr MUL bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
|
|
|
| expr NEQ bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
|
|
|
| expr POW bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
|
|
|
| expr SUB bin_modifier expr { $$ = yylex.(*parser).newBinaryExpression($1, $2, $3, $4) }
|
|
|
|
;
|
|
|
|
|
2020-01-17 07:16:58 -08:00
|
|
|
// Using left recursion for the modifier rules, helps to keep the parser stack small and
|
2023-08-25 14:35:42 -07:00
|
|
|
// reduces allocations.
|
2020-01-08 03:04:47 -08:00
|
|
|
bin_modifier : group_modifiers;
|
|
|
|
|
|
|
|
bool_modifier : /* empty */
|
|
|
|
{ $$ = &BinaryExpr{
|
|
|
|
VectorMatching: &VectorMatching{Card: CardOneToOne},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
| BOOL
|
|
|
|
{ $$ = &BinaryExpr{
|
|
|
|
VectorMatching: &VectorMatching{Card: CardOneToOne},
|
|
|
|
ReturnBool: true,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
;
|
|
|
|
|
|
|
|
on_or_ignoring : bool_modifier IGNORING grouping_labels
|
|
|
|
{
|
|
|
|
$$ = $1
|
|
|
|
$$.(*BinaryExpr).VectorMatching.MatchingLabels = $3
|
2020-01-17 07:16:58 -08:00
|
|
|
}
|
2020-01-08 03:04:47 -08:00
|
|
|
| bool_modifier ON grouping_labels
|
|
|
|
{
|
|
|
|
$$ = $1
|
|
|
|
$$.(*BinaryExpr).VectorMatching.MatchingLabels = $3
|
|
|
|
$$.(*BinaryExpr).VectorMatching.On = true
|
2020-01-17 07:16:58 -08:00
|
|
|
}
|
2020-01-08 03:04:47 -08:00
|
|
|
;
|
|
|
|
|
|
|
|
group_modifiers: bool_modifier /* empty */
|
|
|
|
| on_or_ignoring /* empty */
|
|
|
|
| on_or_ignoring GROUP_LEFT maybe_grouping_labels
|
|
|
|
{
|
|
|
|
$$ = $1
|
|
|
|
$$.(*BinaryExpr).VectorMatching.Card = CardManyToOne
|
|
|
|
$$.(*BinaryExpr).VectorMatching.Include = $3
|
|
|
|
}
|
|
|
|
| on_or_ignoring GROUP_RIGHT maybe_grouping_labels
|
|
|
|
{
|
|
|
|
$$ = $1
|
|
|
|
$$.(*BinaryExpr).VectorMatching.Card = CardOneToMany
|
|
|
|
$$.(*BinaryExpr).VectorMatching.Include = $3
|
|
|
|
}
|
|
|
|
;
|
|
|
|
|
2019-12-05 08:16:12 -08:00
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
grouping_labels : LEFT_PAREN grouping_label_list RIGHT_PAREN
|
|
|
|
{ $$ = $2 }
|
|
|
|
| LEFT_PAREN grouping_label_list COMMA RIGHT_PAREN
|
|
|
|
{ $$ = $2 }
|
|
|
|
| LEFT_PAREN RIGHT_PAREN
|
|
|
|
{ $$ = []string{} }
|
|
|
|
| error
|
2020-01-16 07:20:20 -08:00
|
|
|
{ yylex.(*parser).unexpected("grouping opts", "\"(\""); $$ = nil }
|
2020-01-08 03:04:47 -08:00
|
|
|
;
|
|
|
|
|
|
|
|
|
|
|
|
grouping_label_list:
|
|
|
|
grouping_label_list COMMA grouping_label
|
|
|
|
{ $$ = append($1, $3.Val) }
|
|
|
|
| grouping_label
|
|
|
|
{ $$ = []string{$1.Val} }
|
|
|
|
| grouping_label_list error
|
2020-01-16 07:20:20 -08:00
|
|
|
{ yylex.(*parser).unexpected("grouping opts", "\",\" or \")\""); $$ = $1 }
|
2020-01-08 03:04:47 -08:00
|
|
|
;
|
|
|
|
|
|
|
|
grouping_label : maybe_label
|
|
|
|
{
|
2024-08-01 07:07:08 -07:00
|
|
|
if !model.LabelName($1.Val).IsValid() {
|
|
|
|
yylex.(*parser).unexpected("grouping opts", "label")
|
|
|
|
}
|
|
|
|
$$ = $1
|
|
|
|
}
|
|
|
|
| STRING {
|
|
|
|
if !model.LabelName(yylex.(*parser).unquoteString($1.Val)).IsValid() {
|
2020-01-08 03:04:47 -08:00
|
|
|
yylex.(*parser).unexpected("grouping opts", "label")
|
|
|
|
}
|
|
|
|
$$ = $1
|
2024-08-01 07:07:08 -07:00
|
|
|
$$.Pos++
|
|
|
|
$$.Val = yylex.(*parser).unquoteString($$.Val)
|
2020-01-08 03:04:47 -08:00
|
|
|
}
|
|
|
|
| error
|
2020-01-16 07:20:20 -08:00
|
|
|
{ yylex.(*parser).unexpected("grouping opts", "label"); $$ = Item{} }
|
2020-01-08 03:04:47 -08:00
|
|
|
;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Function calls.
|
|
|
|
*/
|
2020-01-17 07:16:58 -08:00
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
function_call : IDENTIFIER function_call_body
|
|
|
|
{
|
2023-03-22 02:02:10 -07:00
|
|
|
fn, exist := getFunction($1.Val, yylex.(*parser).functions)
|
2020-01-08 03:04:47 -08:00
|
|
|
if !exist{
|
2020-01-17 07:16:58 -08:00
|
|
|
yylex.(*parser).addParseErrf($1.PositionRange(),"unknown function with name %q", $1.Val)
|
|
|
|
}
|
2023-11-07 14:37:37 -08:00
|
|
|
if fn != nil && fn.Experimental && !EnableExperimentalFunctions {
|
|
|
|
yylex.(*parser).addParseErrf($1.PositionRange(),"function %q is not enabled", $1.Val)
|
|
|
|
}
|
2020-01-08 03:04:47 -08:00
|
|
|
$$ = &Call{
|
|
|
|
Func: fn,
|
|
|
|
Args: $2.(Expressions),
|
2023-09-14 09:57:31 -07:00
|
|
|
PosRange: posrange.PositionRange{
|
2020-01-14 08:12:15 -08:00
|
|
|
Start: $1.Pos,
|
|
|
|
End: yylex.(*parser).lastClosing,
|
|
|
|
},
|
2020-01-08 03:04:47 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
;
|
|
|
|
|
|
|
|
function_call_body: LEFT_PAREN function_call_args RIGHT_PAREN
|
|
|
|
{ $$ = $2 }
|
|
|
|
| LEFT_PAREN RIGHT_PAREN
|
|
|
|
{$$ = Expressions{}}
|
|
|
|
;
|
|
|
|
|
|
|
|
function_call_args: function_call_args COMMA expr
|
|
|
|
{ $$ = append($1.(Expressions), $3.(Expr)) }
|
2020-01-17 07:16:58 -08:00
|
|
|
| expr
|
2020-01-08 03:04:47 -08:00
|
|
|
{ $$ = Expressions{$1.(Expr)} }
|
2020-01-16 07:20:20 -08:00
|
|
|
| function_call_args COMMA
|
|
|
|
{
|
2020-01-17 07:16:58 -08:00
|
|
|
yylex.(*parser).addParseErrf($2.PositionRange(), "trailing commas not allowed in function call args")
|
2020-01-16 07:20:20 -08:00
|
|
|
$$ = $1
|
|
|
|
}
|
2020-01-08 03:04:47 -08:00
|
|
|
;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Expressions inside parentheses.
|
|
|
|
*/
|
|
|
|
|
|
|
|
paren_expr : LEFT_PAREN expr RIGHT_PAREN
|
2020-01-14 08:12:15 -08:00
|
|
|
{ $$ = &ParenExpr{Expr: $2.(Expr), PosRange: mergeRanges(&$1, &$3)} }
|
2020-01-08 03:04:47 -08:00
|
|
|
;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Offset modifiers.
|
|
|
|
*/
|
|
|
|
|
2024-03-04 05:57:28 -08:00
|
|
|
offset_expr: expr OFFSET number_duration_literal
|
2020-01-08 03:04:47 -08:00
|
|
|
{
|
2024-03-04 05:57:28 -08:00
|
|
|
numLit, _ := $3.(*NumberLiteral)
|
|
|
|
dur := time.Duration(numLit.Val * 1000) * time.Millisecond
|
|
|
|
yylex.(*parser).addOffset($1, dur)
|
|
|
|
$$ = $1
|
2021-02-14 17:53:44 -08:00
|
|
|
}
|
2024-03-04 05:57:28 -08:00
|
|
|
| expr OFFSET SUB number_duration_literal
|
2021-02-14 17:53:44 -08:00
|
|
|
{
|
2024-03-04 05:57:28 -08:00
|
|
|
numLit, _ := $4.(*NumberLiteral)
|
|
|
|
dur := time.Duration(numLit.Val * 1000) * time.Millisecond
|
|
|
|
yylex.(*parser).addOffset($1, -dur)
|
|
|
|
$$ = $1
|
2020-01-08 03:04:47 -08:00
|
|
|
}
|
|
|
|
| expr OFFSET error
|
2024-03-14 11:48:51 -07:00
|
|
|
{ yylex.(*parser).unexpected("offset", "number or duration"); $$ = $1 }
|
2020-01-08 03:04:47 -08:00
|
|
|
;
|
2021-01-20 02:57:39 -08:00
|
|
|
/*
|
|
|
|
* @ modifiers.
|
|
|
|
*/
|
|
|
|
|
|
|
|
step_invariant_expr: expr AT signed_or_unsigned_number
|
|
|
|
{
|
|
|
|
yylex.(*parser).setTimestamp($1, $3)
|
|
|
|
$$ = $1
|
|
|
|
}
|
2021-02-09 08:03:16 -08:00
|
|
|
| expr AT at_modifier_preprocessors LEFT_PAREN RIGHT_PAREN
|
|
|
|
{
|
|
|
|
yylex.(*parser).setAtModifierPreprocessor($1, $3)
|
|
|
|
$$ = $1
|
|
|
|
}
|
2021-01-20 02:57:39 -08:00
|
|
|
| expr AT error
|
|
|
|
{ yylex.(*parser).unexpected("@", "timestamp"); $$ = $1 }
|
|
|
|
;
|
2020-01-08 03:04:47 -08:00
|
|
|
|
2021-02-09 08:03:16 -08:00
|
|
|
at_modifier_preprocessors: START | END;
|
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
/*
|
|
|
|
* Subquery and range selectors.
|
|
|
|
*/
|
|
|
|
|
2024-03-04 05:57:28 -08:00
|
|
|
matrix_selector : expr LEFT_BRACKET number_duration_literal RIGHT_BRACKET
|
2020-01-08 03:04:47 -08:00
|
|
|
{
|
2020-01-15 12:01:49 -08:00
|
|
|
var errMsg string
|
2020-01-08 03:04:47 -08:00
|
|
|
vs, ok := $1.(*VectorSelector)
|
|
|
|
if !ok{
|
2020-01-15 12:01:49 -08:00
|
|
|
errMsg = "ranges only allowed for vector selectors"
|
2021-01-20 02:57:39 -08:00
|
|
|
} else if vs.OriginalOffset != 0{
|
2020-01-15 12:01:49 -08:00
|
|
|
errMsg = "no offset modifiers allowed before range"
|
2021-01-20 02:57:39 -08:00
|
|
|
} else if vs.Timestamp != nil {
|
|
|
|
errMsg = "no @ modifiers allowed before range"
|
2020-01-08 03:04:47 -08:00
|
|
|
}
|
2020-01-15 12:01:49 -08:00
|
|
|
|
|
|
|
if errMsg != ""{
|
|
|
|
errRange := mergeRanges(&$2, &$4)
|
2020-01-17 07:16:58 -08:00
|
|
|
yylex.(*parser).addParseErrf(errRange, errMsg)
|
2020-01-08 03:04:47 -08:00
|
|
|
}
|
2020-01-15 12:01:49 -08:00
|
|
|
|
2024-03-04 05:57:28 -08:00
|
|
|
numLit, _ := $3.(*NumberLiteral)
|
2020-01-08 03:04:47 -08:00
|
|
|
$$ = &MatrixSelector{
|
2020-01-17 07:16:58 -08:00
|
|
|
VectorSelector: $1.(Expr),
|
2024-03-04 05:57:28 -08:00
|
|
|
Range: time.Duration(numLit.Val * 1000) * time.Millisecond,
|
2020-01-14 08:12:15 -08:00
|
|
|
EndPos: yylex.(*parser).lastClosing,
|
2020-01-08 03:04:47 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
;
|
|
|
|
|
2024-03-04 05:57:28 -08:00
|
|
|
subquery_expr : expr LEFT_BRACKET number_duration_literal COLON number_duration_literal RIGHT_BRACKET
|
2020-01-08 03:04:47 -08:00
|
|
|
{
|
2024-03-04 05:57:28 -08:00
|
|
|
numLitRange, _ := $3.(*NumberLiteral)
|
|
|
|
numLitStep, _ := $5.(*NumberLiteral)
|
2020-01-08 03:04:47 -08:00
|
|
|
$$ = &SubqueryExpr{
|
|
|
|
Expr: $1.(Expr),
|
2024-03-04 05:57:28 -08:00
|
|
|
Range: time.Duration(numLitRange.Val * 1000) * time.Millisecond,
|
|
|
|
Step: time.Duration(numLitStep.Val * 1000) * time.Millisecond,
|
2020-01-14 08:12:15 -08:00
|
|
|
EndPos: $6.Pos + 1,
|
2020-01-08 03:04:47 -08:00
|
|
|
}
|
|
|
|
}
|
2024-03-04 05:57:28 -08:00
|
|
|
| expr LEFT_BRACKET number_duration_literal COLON RIGHT_BRACKET
|
|
|
|
{
|
|
|
|
numLitRange, _ := $3.(*NumberLiteral)
|
|
|
|
$$ = &SubqueryExpr{
|
|
|
|
Expr: $1.(Expr),
|
|
|
|
Range: time.Duration(numLitRange.Val * 1000) * time.Millisecond,
|
|
|
|
Step: 0,
|
|
|
|
EndPos: $5.Pos + 1,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
| expr LEFT_BRACKET number_duration_literal COLON number_duration_literal error
|
2020-01-16 07:20:20 -08:00
|
|
|
{ yylex.(*parser).unexpected("subquery selector", "\"]\""); $$ = $1 }
|
2024-03-04 05:57:28 -08:00
|
|
|
| expr LEFT_BRACKET number_duration_literal COLON error
|
2024-03-14 11:48:51 -07:00
|
|
|
{ yylex.(*parser).unexpected("subquery selector", "number or duration or \"]\""); $$ = $1 }
|
2024-03-04 05:57:28 -08:00
|
|
|
| expr LEFT_BRACKET number_duration_literal error
|
2020-01-16 07:20:20 -08:00
|
|
|
{ yylex.(*parser).unexpected("subquery or range", "\":\" or \"]\""); $$ = $1 }
|
2020-01-08 03:04:47 -08:00
|
|
|
| expr LEFT_BRACKET error
|
2024-03-14 11:48:51 -07:00
|
|
|
{ yylex.(*parser).unexpected("subquery selector", "number or duration"); $$ = $1 }
|
2020-01-08 03:04:47 -08:00
|
|
|
;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Unary expressions.
|
|
|
|
*/
|
|
|
|
|
|
|
|
unary_expr :
|
2023-08-25 14:35:42 -07:00
|
|
|
/* Gives the rule the same precedence as MUL. This aligns with mathematical conventions. */
|
2020-01-17 07:16:58 -08:00
|
|
|
unary_op expr %prec MUL
|
2020-01-08 03:04:47 -08:00
|
|
|
{
|
|
|
|
if nl, ok := $2.(*NumberLiteral); ok {
|
|
|
|
if $1.Typ == SUB {
|
|
|
|
nl.Val *= -1
|
|
|
|
}
|
2020-01-14 08:12:15 -08:00
|
|
|
nl.PosRange.Start = $1.Pos
|
2020-01-08 03:04:47 -08:00
|
|
|
$$ = nl
|
|
|
|
} else {
|
2020-01-14 08:12:15 -08:00
|
|
|
$$ = &UnaryExpr{Op: $1.Typ, Expr: $2.(Expr), StartPos: $1.Pos}
|
2020-01-08 03:04:47 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Vector selectors.
|
|
|
|
*/
|
|
|
|
|
|
|
|
vector_selector: metric_identifier label_matchers
|
2020-01-17 07:16:58 -08:00
|
|
|
{
|
2020-01-14 08:12:15 -08:00
|
|
|
vs := $2.(*VectorSelector)
|
2020-01-17 07:16:58 -08:00
|
|
|
vs.PosRange = mergeRanges(&$1, vs)
|
2020-01-14 08:12:15 -08:00
|
|
|
vs.Name = $1.Val
|
|
|
|
yylex.(*parser).assembleVectorSelector(vs)
|
|
|
|
$$ = vs
|
|
|
|
}
|
2020-01-17 07:16:58 -08:00
|
|
|
| metric_identifier
|
|
|
|
{
|
2020-01-14 08:12:15 -08:00
|
|
|
vs := &VectorSelector{
|
|
|
|
Name: $1.Val,
|
|
|
|
LabelMatchers: []*labels.Matcher{},
|
|
|
|
PosRange: $1.PositionRange(),
|
|
|
|
}
|
|
|
|
yylex.(*parser).assembleVectorSelector(vs)
|
|
|
|
$$ = vs
|
|
|
|
}
|
2020-01-08 03:04:47 -08:00
|
|
|
| label_matchers
|
2020-01-17 07:16:58 -08:00
|
|
|
{
|
2020-01-14 08:12:15 -08:00
|
|
|
vs := $1.(*VectorSelector)
|
|
|
|
yylex.(*parser).assembleVectorSelector(vs)
|
|
|
|
$$ = vs
|
|
|
|
}
|
2020-01-08 03:04:47 -08:00
|
|
|
;
|
|
|
|
|
|
|
|
label_matchers : LEFT_BRACE label_match_list RIGHT_BRACE
|
2020-01-14 08:12:15 -08:00
|
|
|
{
|
|
|
|
$$ = &VectorSelector{
|
|
|
|
LabelMatchers: $2,
|
|
|
|
PosRange: mergeRanges(&$1, &$3),
|
|
|
|
}
|
|
|
|
}
|
2019-12-16 05:58:47 -08:00
|
|
|
| LEFT_BRACE label_match_list COMMA RIGHT_BRACE
|
2020-01-14 08:12:15 -08:00
|
|
|
{
|
|
|
|
$$ = &VectorSelector{
|
|
|
|
LabelMatchers: $2,
|
|
|
|
PosRange: mergeRanges(&$1, &$4),
|
|
|
|
}
|
|
|
|
}
|
2019-12-05 08:16:12 -08:00
|
|
|
| LEFT_BRACE RIGHT_BRACE
|
2020-01-14 08:12:15 -08:00
|
|
|
{
|
|
|
|
$$ = &VectorSelector{
|
|
|
|
LabelMatchers: []*labels.Matcher{},
|
|
|
|
PosRange: mergeRanges(&$1, &$2),
|
|
|
|
}
|
|
|
|
}
|
2019-12-05 08:16:12 -08:00
|
|
|
;
|
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
label_match_list: label_match_list COMMA label_matcher
|
2020-01-17 07:16:58 -08:00
|
|
|
{
|
2020-01-16 07:20:20 -08:00
|
|
|
if $1 != nil{
|
|
|
|
$$ = append($1, $3)
|
|
|
|
} else {
|
|
|
|
$$ = $1
|
|
|
|
}
|
|
|
|
}
|
2019-12-16 05:58:47 -08:00
|
|
|
| label_matcher
|
|
|
|
{ $$ = []*labels.Matcher{$1}}
|
|
|
|
| label_match_list error
|
2020-01-16 07:20:20 -08:00
|
|
|
{ yylex.(*parser).unexpected("label matching", "\",\" or \"}\""); $$ = $1 }
|
2019-12-16 05:58:47 -08:00
|
|
|
;
|
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
label_matcher : IDENTIFIER match_op STRING
|
2024-02-15 11:25:12 -08:00
|
|
|
{ $$ = yylex.(*parser).newLabelMatcher($1, $2, $3); }
|
|
|
|
| string_identifier match_op STRING
|
|
|
|
{ $$ = yylex.(*parser).newLabelMatcher($1, $2, $3); }
|
|
|
|
| string_identifier
|
|
|
|
{ $$ = yylex.(*parser).newMetricNameMatcher($1); }
|
|
|
|
| string_identifier match_op error
|
|
|
|
{ yylex.(*parser).unexpected("label matching", "string"); $$ = nil}
|
2019-12-05 08:16:12 -08:00
|
|
|
| IDENTIFIER match_op error
|
2020-01-16 07:20:20 -08:00
|
|
|
{ yylex.(*parser).unexpected("label matching", "string"); $$ = nil}
|
2020-01-17 07:16:58 -08:00
|
|
|
| IDENTIFIER error
|
|
|
|
{ yylex.(*parser).unexpected("label matching", "label matching operator"); $$ = nil }
|
2019-12-16 05:58:47 -08:00
|
|
|
| error
|
2020-01-16 07:20:20 -08:00
|
|
|
{ yylex.(*parser).unexpected("label matching", "identifier or \"}\""); $$ = nil}
|
2019-12-05 08:16:12 -08:00
|
|
|
;
|
2020-01-17 07:16:58 -08:00
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
/*
|
|
|
|
* Metric descriptions.
|
|
|
|
*/
|
2019-12-05 08:16:12 -08:00
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
metric : metric_identifier label_set
|
2023-03-22 08:46:02 -07:00
|
|
|
{ b := labels.NewBuilder($2); b.Set(labels.MetricName, $1.Val); $$ = b.Labels() }
|
2020-01-17 07:16:58 -08:00
|
|
|
| label_set
|
2019-12-16 08:38:18 -08:00
|
|
|
{$$ = $1}
|
|
|
|
;
|
|
|
|
|
|
|
|
|
feat: add limitk() and limit_ratio() operators (#12503)
* rebase 2024-07-01, picks previous renaming to `limitk()` and `limit_ratio()`
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* gofumpt -d -extra
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* more lint fixes
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* more lint fixes+
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* put limitk() and limit_ratio() behind --enable-feature=promql-experimental-functions
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* EnableExperimentalFunctions for TestConcurrentRangeQueries() also
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* use testutil.RequireEqual to fix tests, WIP equivalent thingie for require.Contains
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* lint fix
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* moar linting
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* rebase 2024-06-19
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* re-add limit(2, metric) testing for N=2 common series subset
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move `ratio = param` to default switch case, for better readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* gofumpt -d -extra util/testutil/cmp.go
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* early break when reaching k elems in limitk(), should have always been so (!)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* small typo fix
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change small break-loop rearrange for readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove IsNan(ratio) condition in switch-case, already handled as input validation
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change adding some comments
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change simplify fullMatrix() helper functions used for tests
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add `limitk(-1, metric)` testcase, which is handled as any k < 1 case
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* engine_test.go: no-change create `requireCommonSeries() helper func (moving code into it) for readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* rebase 2024-06-21
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* engine_test.go: HAPPY NOW about its code -> reorg, create and use simpleRangeQuery() function, less lines and more readable ftW \o/
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move limitk(), limit_ratio() testing to promql/promqltest/testdata/limit.test
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove stale leftover after moving tests from engine_test.go to testdata/
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix flaky `limit_ratio(0.5, ...)` test case
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix AddRatioSample() implementation to use a single conditional (instead of switch/case + fallback return)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* docs/querying/operators.md: document r < 0
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add negative limit_ratio() example to docs/querying/examples.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move more extensive docu examples to docs/querying/operators.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* typo
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* small docu fix for poor-mans-normality-check, add it to limit.test ;)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* limit.test: expand "Poor man's normality check" to whole eval range
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* restore mistakenly removed existing small comment
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* expand poors-man-normality-check case(s)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Revert "expand poors-man-normality-check case(s)"
This reverts commit f69e1603b2ebe69c0a100197cfbcf6f81644b564, indeed too
flaky 0:)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove humor from docs/querying/operators.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix signoff
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add web/ui missing changes
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* expand limit_ratio test cases, cross-fingering they'll not be flaky
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove flaky test
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add missing warnings.Merge(ws) in instant-query return shortcut
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add missing LimitK||LimitRatio case to codemirror-promql/src/parser/parser.ts
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix ui-lint
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* actually fix returned warnings :]
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
---------
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
Co-authored-by: Julius Volz <julius.volz@gmail.com>
2024-07-03 13:18:57 -07:00
|
|
|
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 | LIMITK | LIMIT_RATIO;
|
2020-01-08 03:04:47 -08:00
|
|
|
|
|
|
|
label_set : LEFT_BRACE label_set_list RIGHT_BRACE
|
2019-12-16 05:58:47 -08:00
|
|
|
{ $$ = labels.New($2...) }
|
|
|
|
| LEFT_BRACE label_set_list COMMA RIGHT_BRACE
|
|
|
|
{ $$ = labels.New($2...) }
|
|
|
|
| LEFT_BRACE RIGHT_BRACE
|
|
|
|
{ $$ = labels.New() }
|
2019-12-16 08:38:18 -08:00
|
|
|
| /* empty */
|
|
|
|
{ $$ = labels.New() }
|
2019-12-16 05:58:47 -08:00
|
|
|
;
|
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
label_set_list : label_set_list COMMA label_set_item
|
2019-12-16 05:58:47 -08:00
|
|
|
{ $$ = append($1, $3) }
|
|
|
|
| label_set_item
|
|
|
|
{ $$ = []labels.Label{$1} }
|
|
|
|
| label_set_list error
|
2020-01-16 07:20:20 -08:00
|
|
|
{ yylex.(*parser).unexpected("label set", "\",\" or \"}\"", ); $$ = $1 }
|
2020-01-17 07:16:58 -08:00
|
|
|
|
2019-12-16 05:58:47 -08:00
|
|
|
;
|
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
label_set_item : IDENTIFIER EQL STRING
|
2020-01-17 07:16:58 -08:00
|
|
|
{ $$ = labels.Label{Name: $1.Val, Value: yylex.(*parser).unquoteString($3.Val) } }
|
2019-12-16 05:58:47 -08:00
|
|
|
| IDENTIFIER EQL error
|
2020-01-16 07:20:20 -08:00
|
|
|
{ yylex.(*parser).unexpected("label set", "string"); $$ = labels.Label{}}
|
2019-12-16 05:58:47 -08:00
|
|
|
| IDENTIFIER error
|
2020-01-16 07:20:20 -08:00
|
|
|
{ yylex.(*parser).unexpected("label set", "\"=\""); $$ = labels.Label{}}
|
2019-12-16 05:58:47 -08:00
|
|
|
| error
|
2020-01-16 07:20:20 -08:00
|
|
|
{ yylex.(*parser).unexpected("label set", "identifier or \"}\""); $$ = labels.Label{} }
|
2019-12-16 05:58:47 -08:00
|
|
|
;
|
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
/*
|
2023-08-25 14:35:42 -07:00
|
|
|
* Series descriptions:
|
|
|
|
* A separate language that is used to generate series values promtool.
|
|
|
|
* It is included in the promQL parser, because it shares common functionality, such as parsing a metric.
|
|
|
|
* The syntax is described in https://prometheus.io/docs/prometheus/latest/configuration/unit_testing_rules/#series
|
2020-01-08 03:04:47 -08:00
|
|
|
*/
|
2019-12-18 06:18:52 -08:00
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
series_description: metric series_values
|
2019-12-21 00:44:12 -08:00
|
|
|
{
|
|
|
|
yylex.(*parser).generatedParserResult = &seriesDescription{
|
|
|
|
labels: $1,
|
|
|
|
values: $2,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
;
|
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
series_values : /*empty*/
|
2020-02-03 09:48:27 -08:00
|
|
|
{ $$ = []SequenceValue{} }
|
2019-12-21 00:44:12 -08:00
|
|
|
| series_values SPACE series_item
|
|
|
|
{ $$ = append($1, $3...) }
|
|
|
|
| series_values SPACE
|
|
|
|
{ $$ = $1 }
|
|
|
|
| error
|
2020-01-16 07:20:20 -08:00
|
|
|
{ yylex.(*parser).unexpected("series values", ""); $$ = nil }
|
2019-12-21 00:44:12 -08:00
|
|
|
;
|
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
series_item : BLANK
|
2020-02-03 09:48:27 -08:00
|
|
|
{ $$ = []SequenceValue{{Omitted: true}}}
|
2019-12-21 00:44:12 -08:00
|
|
|
| BLANK TIMES uint
|
|
|
|
{
|
2020-02-03 09:48:27 -08:00
|
|
|
$$ = []SequenceValue{}
|
2019-12-21 00:44:12 -08:00
|
|
|
for i:=uint64(0); i < $3; i++{
|
2020-02-03 09:48:27 -08:00
|
|
|
$$ = append($$, SequenceValue{Omitted: true})
|
2019-12-21 00:44:12 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
| series_value
|
2020-02-03 09:48:27 -08:00
|
|
|
{ $$ = []SequenceValue{{Value: $1}}}
|
2019-12-21 00:44:12 -08:00
|
|
|
| series_value TIMES uint
|
|
|
|
{
|
2020-02-03 09:48:27 -08:00
|
|
|
$$ = []SequenceValue{}
|
2023-08-25 14:35:42 -07:00
|
|
|
// Add an additional value for time 0, which we ignore in tests.
|
2019-12-21 00:44:12 -08:00
|
|
|
for i:=uint64(0); i <= $3; i++{
|
2020-02-03 09:48:27 -08:00
|
|
|
$$ = append($$, SequenceValue{Value: $1})
|
2019-12-21 00:44:12 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
| series_value signed_number TIMES uint
|
|
|
|
{
|
2020-02-03 09:48:27 -08:00
|
|
|
$$ = []SequenceValue{}
|
2023-08-25 14:35:42 -07:00
|
|
|
// Add an additional value for time 0, which we ignore in tests.
|
2019-12-21 00:44:12 -08:00
|
|
|
for i:=uint64(0); i <= $4; i++{
|
2020-02-03 09:48:27 -08:00
|
|
|
$$ = append($$, SequenceValue{Value: $1})
|
2019-12-21 00:44:12 -08:00
|
|
|
$1 += $2
|
|
|
|
}
|
|
|
|
}
|
2023-08-25 14:35:42 -07:00
|
|
|
// Histogram descriptions (part of unit testing).
|
|
|
|
| histogram_series_value
|
|
|
|
{
|
|
|
|
$$ = []SequenceValue{{Histogram:$1}}
|
|
|
|
}
|
|
|
|
| histogram_series_value TIMES uint
|
|
|
|
{
|
|
|
|
$$ = []SequenceValue{}
|
|
|
|
// Add an additional value for time 0, which we ignore in tests.
|
|
|
|
for i:=uint64(0); i <= $3; i++{
|
|
|
|
$$ = append($$, SequenceValue{Histogram:$1})
|
|
|
|
//$1 += $2
|
|
|
|
}
|
|
|
|
}
|
|
|
|
| histogram_series_value ADD histogram_series_value TIMES uint
|
|
|
|
{
|
|
|
|
val, err := yylex.(*parser).histogramsIncreaseSeries($1,$3,$5)
|
|
|
|
if err != nil {
|
|
|
|
yylex.(*parser).addSemanticError(err)
|
|
|
|
}
|
|
|
|
$$ = val
|
|
|
|
}
|
|
|
|
| histogram_series_value SUB histogram_series_value TIMES uint
|
|
|
|
{
|
|
|
|
val, err := yylex.(*parser).histogramsDecreaseSeries($1,$3,$5)
|
|
|
|
if err != nil {
|
|
|
|
yylex.(*parser).addSemanticError(err)
|
|
|
|
}
|
|
|
|
$$ = val
|
|
|
|
}
|
2020-01-08 03:04:47 -08:00
|
|
|
;
|
|
|
|
|
|
|
|
series_value : IDENTIFIER
|
|
|
|
{
|
|
|
|
if $1.Val != "stale" {
|
|
|
|
yylex.(*parser).unexpected("series values", "number or \"stale\"")
|
|
|
|
}
|
|
|
|
$$ = math.Float64frombits(value.StaleNaN)
|
|
|
|
}
|
|
|
|
| number
|
|
|
|
| signed_number
|
|
|
|
;
|
|
|
|
|
2023-08-25 14:35:42 -07:00
|
|
|
histogram_series_value
|
|
|
|
: OPEN_HIST histogram_desc_map SPACE CLOSE_HIST
|
|
|
|
{
|
|
|
|
$$ = yylex.(*parser).buildHistogramFromMap(&$2)
|
|
|
|
}
|
|
|
|
| OPEN_HIST histogram_desc_map CLOSE_HIST
|
|
|
|
{
|
|
|
|
$$ = yylex.(*parser).buildHistogramFromMap(&$2)
|
|
|
|
}
|
|
|
|
| OPEN_HIST SPACE CLOSE_HIST
|
|
|
|
{
|
|
|
|
m := yylex.(*parser).newMap()
|
|
|
|
$$ = yylex.(*parser).buildHistogramFromMap(&m)
|
|
|
|
}
|
|
|
|
| OPEN_HIST CLOSE_HIST
|
|
|
|
{
|
|
|
|
m := yylex.(*parser).newMap()
|
|
|
|
$$ = yylex.(*parser).buildHistogramFromMap(&m)
|
|
|
|
}
|
|
|
|
;
|
|
|
|
|
|
|
|
histogram_desc_map
|
|
|
|
: histogram_desc_map SPACE histogram_desc_item
|
|
|
|
{
|
|
|
|
$$ = *(yylex.(*parser).mergeMaps(&$1,&$3))
|
|
|
|
}
|
|
|
|
| histogram_desc_item
|
|
|
|
{
|
|
|
|
$$ = $1
|
|
|
|
}
|
|
|
|
| histogram_desc_map error {
|
|
|
|
yylex.(*parser).unexpected("histogram description", "histogram description key, e.g. buckets:[5 10 7]")
|
|
|
|
}
|
|
|
|
;
|
|
|
|
|
|
|
|
histogram_desc_item
|
|
|
|
: SCHEMA_DESC COLON int
|
|
|
|
{
|
|
|
|
$$ = yylex.(*parser).newMap()
|
|
|
|
$$["schema"] = $3
|
|
|
|
}
|
|
|
|
| SUM_DESC COLON signed_or_unsigned_number
|
|
|
|
{
|
|
|
|
$$ = yylex.(*parser).newMap()
|
|
|
|
$$["sum"] = $3
|
|
|
|
}
|
2024-09-10 06:23:00 -07:00
|
|
|
| COUNT_DESC COLON signed_or_unsigned_number
|
2023-08-25 14:35:42 -07:00
|
|
|
{
|
|
|
|
$$ = yylex.(*parser).newMap()
|
|
|
|
$$["count"] = $3
|
|
|
|
}
|
2024-09-10 06:23:00 -07:00
|
|
|
| ZERO_BUCKET_DESC COLON signed_or_unsigned_number
|
2023-08-25 14:35:42 -07:00
|
|
|
{
|
|
|
|
$$ = yylex.(*parser).newMap()
|
|
|
|
$$["z_bucket"] = $3
|
|
|
|
}
|
|
|
|
| ZERO_BUCKET_WIDTH_DESC COLON number
|
|
|
|
{
|
|
|
|
$$ = yylex.(*parser).newMap()
|
|
|
|
$$["z_bucket_w"] = $3
|
|
|
|
}
|
2024-05-08 04:58:24 -07:00
|
|
|
| CUSTOM_VALUES_DESC COLON bucket_set
|
|
|
|
{
|
|
|
|
$$ = yylex.(*parser).newMap()
|
|
|
|
$$["custom_values"] = $3
|
|
|
|
}
|
2023-08-25 14:35:42 -07:00
|
|
|
| BUCKETS_DESC COLON bucket_set
|
|
|
|
{
|
|
|
|
$$ = yylex.(*parser).newMap()
|
|
|
|
$$["buckets"] = $3
|
|
|
|
}
|
|
|
|
| OFFSET_DESC COLON int
|
|
|
|
{
|
|
|
|
$$ = yylex.(*parser).newMap()
|
|
|
|
$$["offset"] = $3
|
|
|
|
}
|
|
|
|
| NEGATIVE_BUCKETS_DESC COLON bucket_set
|
|
|
|
{
|
|
|
|
$$ = yylex.(*parser).newMap()
|
|
|
|
$$["n_buckets"] = $3
|
|
|
|
}
|
|
|
|
| NEGATIVE_OFFSET_DESC COLON int
|
|
|
|
{
|
|
|
|
$$ = yylex.(*parser).newMap()
|
|
|
|
$$["n_offset"] = $3
|
|
|
|
}
|
2024-07-31 00:53:05 -07:00
|
|
|
| COUNTER_RESET_HINT_DESC COLON counter_reset_hint
|
|
|
|
{
|
|
|
|
$$ = yylex.(*parser).newMap()
|
|
|
|
$$["counter_reset_hint"] = $3
|
|
|
|
}
|
2023-08-25 14:35:42 -07:00
|
|
|
;
|
|
|
|
|
|
|
|
bucket_set : LEFT_BRACKET bucket_set_list SPACE RIGHT_BRACKET
|
|
|
|
{
|
|
|
|
$$ = $2
|
|
|
|
}
|
|
|
|
| LEFT_BRACKET bucket_set_list RIGHT_BRACKET
|
|
|
|
{
|
|
|
|
$$ = $2
|
|
|
|
}
|
|
|
|
;
|
|
|
|
|
2024-09-10 06:23:00 -07:00
|
|
|
bucket_set_list : bucket_set_list SPACE signed_or_unsigned_number
|
2023-08-25 14:35:42 -07:00
|
|
|
{
|
|
|
|
$$ = append($1, $3)
|
|
|
|
}
|
2024-09-10 06:23:00 -07:00
|
|
|
| signed_or_unsigned_number
|
2023-08-25 14:35:42 -07:00
|
|
|
{
|
|
|
|
$$ = []float64{$1}
|
|
|
|
}
|
|
|
|
| bucket_set_list error
|
|
|
|
;
|
2020-01-08 03:04:47 -08:00
|
|
|
|
2024-07-31 00:53:05 -07:00
|
|
|
counter_reset_hint : UNKNOWN_COUNTER_RESET | COUNTER_RESET | NOT_COUNTER_RESET | GAUGE_TYPE;
|
2020-01-08 03:04:47 -08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Keyword lists.
|
|
|
|
*/
|
|
|
|
|
feat: add limitk() and limit_ratio() operators (#12503)
* rebase 2024-07-01, picks previous renaming to `limitk()` and `limit_ratio()`
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* gofumpt -d -extra
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* more lint fixes
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* more lint fixes+
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* put limitk() and limit_ratio() behind --enable-feature=promql-experimental-functions
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* EnableExperimentalFunctions for TestConcurrentRangeQueries() also
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* use testutil.RequireEqual to fix tests, WIP equivalent thingie for require.Contains
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* lint fix
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* moar linting
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* rebase 2024-06-19
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* re-add limit(2, metric) testing for N=2 common series subset
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move `ratio = param` to default switch case, for better readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* gofumpt -d -extra util/testutil/cmp.go
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* early break when reaching k elems in limitk(), should have always been so (!)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* small typo fix
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change small break-loop rearrange for readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove IsNan(ratio) condition in switch-case, already handled as input validation
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change adding some comments
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change simplify fullMatrix() helper functions used for tests
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add `limitk(-1, metric)` testcase, which is handled as any k < 1 case
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* engine_test.go: no-change create `requireCommonSeries() helper func (moving code into it) for readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* rebase 2024-06-21
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* engine_test.go: HAPPY NOW about its code -> reorg, create and use simpleRangeQuery() function, less lines and more readable ftW \o/
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move limitk(), limit_ratio() testing to promql/promqltest/testdata/limit.test
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove stale leftover after moving tests from engine_test.go to testdata/
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix flaky `limit_ratio(0.5, ...)` test case
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix AddRatioSample() implementation to use a single conditional (instead of switch/case + fallback return)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* docs/querying/operators.md: document r < 0
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add negative limit_ratio() example to docs/querying/examples.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move more extensive docu examples to docs/querying/operators.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* typo
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* small docu fix for poor-mans-normality-check, add it to limit.test ;)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* limit.test: expand "Poor man's normality check" to whole eval range
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* restore mistakenly removed existing small comment
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* expand poors-man-normality-check case(s)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Revert "expand poors-man-normality-check case(s)"
This reverts commit f69e1603b2ebe69c0a100197cfbcf6f81644b564, indeed too
flaky 0:)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove humor from docs/querying/operators.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix signoff
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add web/ui missing changes
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* expand limit_ratio test cases, cross-fingering they'll not be flaky
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove flaky test
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add missing warnings.Merge(ws) in instant-query return shortcut
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add missing LimitK||LimitRatio case to codemirror-promql/src/parser/parser.ts
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix ui-lint
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* actually fix returned warnings :]
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
---------
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
Co-authored-by: Julius Volz <julius.volz@gmail.com>
2024-07-03 13:18:57 -07:00
|
|
|
aggregate_op : AVG | BOTTOMK | COUNT | COUNT_VALUES | GROUP | MAX | MIN | QUANTILE | STDDEV | STDVAR | SUM | TOPK | LIMITK | LIMIT_RATIO;
|
2020-01-08 03:04:47 -08:00
|
|
|
|
2023-08-25 14:35:42 -07:00
|
|
|
// Inside of grouping options label names can be recognized as keywords by the lexer. This is a list of keywords that could also be a label name.
|
feat: add limitk() and limit_ratio() operators (#12503)
* rebase 2024-07-01, picks previous renaming to `limitk()` and `limit_ratio()`
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* gofumpt -d -extra
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* more lint fixes
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* more lint fixes+
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* put limitk() and limit_ratio() behind --enable-feature=promql-experimental-functions
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* EnableExperimentalFunctions for TestConcurrentRangeQueries() also
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* use testutil.RequireEqual to fix tests, WIP equivalent thingie for require.Contains
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* lint fix
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* moar linting
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* rebase 2024-06-19
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* re-add limit(2, metric) testing for N=2 common series subset
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move `ratio = param` to default switch case, for better readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* gofumpt -d -extra util/testutil/cmp.go
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* early break when reaching k elems in limitk(), should have always been so (!)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* small typo fix
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change small break-loop rearrange for readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove IsNan(ratio) condition in switch-case, already handled as input validation
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change adding some comments
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change simplify fullMatrix() helper functions used for tests
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add `limitk(-1, metric)` testcase, which is handled as any k < 1 case
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* engine_test.go: no-change create `requireCommonSeries() helper func (moving code into it) for readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* rebase 2024-06-21
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* engine_test.go: HAPPY NOW about its code -> reorg, create and use simpleRangeQuery() function, less lines and more readable ftW \o/
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move limitk(), limit_ratio() testing to promql/promqltest/testdata/limit.test
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove stale leftover after moving tests from engine_test.go to testdata/
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix flaky `limit_ratio(0.5, ...)` test case
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix AddRatioSample() implementation to use a single conditional (instead of switch/case + fallback return)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* docs/querying/operators.md: document r < 0
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add negative limit_ratio() example to docs/querying/examples.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move more extensive docu examples to docs/querying/operators.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* typo
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* small docu fix for poor-mans-normality-check, add it to limit.test ;)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* limit.test: expand "Poor man's normality check" to whole eval range
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* restore mistakenly removed existing small comment
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* expand poors-man-normality-check case(s)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Revert "expand poors-man-normality-check case(s)"
This reverts commit f69e1603b2ebe69c0a100197cfbcf6f81644b564, indeed too
flaky 0:)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove humor from docs/querying/operators.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix signoff
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add web/ui missing changes
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* expand limit_ratio test cases, cross-fingering they'll not be flaky
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove flaky test
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add missing warnings.Merge(ws) in instant-query return shortcut
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add missing LimitK||LimitRatio case to codemirror-promql/src/parser/parser.ts
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix ui-lint
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* actually fix returned warnings :]
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
---------
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
Co-authored-by: Julius Volz <julius.volz@gmail.com>
2024-07-03 13:18:57 -07:00
|
|
|
maybe_label : AVG | BOOL | BOTTOMK | BY | COUNT | COUNT_VALUES | GROUP | GROUP_LEFT | GROUP_RIGHT | IDENTIFIER | IGNORING | LAND | LOR | LUNLESS | MAX | METRIC_IDENTIFIER | MIN | OFFSET | ON | QUANTILE | STDDEV | STDVAR | SUM | TOPK | START | END | ATAN2 | LIMITK | LIMIT_RATIO;
|
2020-01-08 03:04:47 -08:00
|
|
|
|
|
|
|
unary_op : ADD | SUB;
|
|
|
|
|
|
|
|
match_op : EQL | NEQ | EQL_REGEX | NEQ_REGEX ;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Literals.
|
|
|
|
*/
|
|
|
|
|
2024-03-04 05:57:28 -08:00
|
|
|
number_duration_literal : NUMBER
|
2020-01-14 08:12:15 -08:00
|
|
|
{
|
2024-03-04 05:57:28 -08:00
|
|
|
$$ = &NumberLiteral{
|
2020-01-14 08:12:15 -08:00
|
|
|
Val: yylex.(*parser).number($1.Val),
|
|
|
|
PosRange: $1.PositionRange(),
|
2024-03-04 05:57:28 -08:00
|
|
|
}
|
2020-01-14 08:12:15 -08:00
|
|
|
}
|
2024-03-04 05:57:28 -08:00
|
|
|
| DURATION
|
|
|
|
{
|
|
|
|
var err error
|
|
|
|
var dur time.Duration
|
|
|
|
dur, err = parseDuration($1.Val)
|
|
|
|
if err != nil {
|
|
|
|
yylex.(*parser).addParseErr($1.PositionRange(), err)
|
|
|
|
}
|
|
|
|
$$ = &NumberLiteral{
|
|
|
|
Val: dur.Seconds(),
|
|
|
|
PosRange: $1.PositionRange(),
|
|
|
|
}
|
2020-01-14 08:12:15 -08:00
|
|
|
}
|
|
|
|
;
|
2020-01-08 03:04:47 -08:00
|
|
|
|
2024-03-14 11:48:51 -07:00
|
|
|
number : NUMBER
|
|
|
|
{
|
|
|
|
$$ = yylex.(*parser).number($1.Val)
|
|
|
|
}
|
|
|
|
| DURATION
|
|
|
|
{
|
|
|
|
var err error
|
|
|
|
var dur time.Duration
|
|
|
|
dur, err = parseDuration($1.Val)
|
|
|
|
if err != nil {
|
|
|
|
yylex.(*parser).addParseErr($1.PositionRange(), err)
|
|
|
|
}
|
|
|
|
$$ = dur.Seconds()
|
|
|
|
}
|
|
|
|
;
|
2020-01-08 03:04:47 -08:00
|
|
|
|
|
|
|
signed_number : ADD number { $$ = $2 }
|
|
|
|
| SUB number { $$ = -$2 }
|
|
|
|
;
|
|
|
|
|
2021-01-20 02:57:39 -08:00
|
|
|
signed_or_unsigned_number: number | signed_number ;
|
|
|
|
|
2020-01-08 03:04:47 -08:00
|
|
|
uint : NUMBER
|
2019-12-21 00:44:12 -08:00
|
|
|
{
|
|
|
|
var err error
|
|
|
|
$$, err = strconv.ParseUint($1.Val, 10, 64)
|
|
|
|
if err != nil {
|
2020-01-17 07:16:58 -08:00
|
|
|
yylex.(*parser).addParseErrf($1.PositionRange(), "invalid repetition in series values: %s", err)
|
2019-12-21 00:44:12 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
;
|
|
|
|
|
2023-08-25 14:35:42 -07:00
|
|
|
int : SUB uint { $$ = -int64($2) }
|
|
|
|
| uint { $$ = int64($1) }
|
|
|
|
;
|
|
|
|
|
2020-01-14 08:12:15 -08:00
|
|
|
string_literal : STRING
|
|
|
|
{
|
|
|
|
$$ = &StringLiteral{
|
|
|
|
Val: yylex.(*parser).unquoteString($1.Val),
|
|
|
|
PosRange: $1.PositionRange(),
|
|
|
|
}
|
|
|
|
}
|
2024-02-15 11:25:12 -08:00
|
|
|
;
|
|
|
|
|
|
|
|
string_identifier : STRING
|
|
|
|
{
|
|
|
|
$$ = Item{
|
|
|
|
Typ: METRIC_IDENTIFIER,
|
|
|
|
Pos: $1.PositionRange().Start,
|
|
|
|
Val: yylex.(*parser).unquoteString($1.Val),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
;
|
2020-01-08 03:04:47 -08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Wrappers for optional arguments.
|
|
|
|
*/
|
|
|
|
|
|
|
|
maybe_grouping_labels: /* empty */ { $$ = nil }
|
|
|
|
| grouping_labels
|
2019-12-21 00:44:12 -08:00
|
|
|
;
|
|
|
|
|
2019-12-09 11:03:31 -08:00
|
|
|
%%
|