root
/
prometheus
mirror of https://github.com/prometheus/prometheus.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity

change parser logic about smoothed/anchored expression
CI / Go tests (push) Has been cancelled Details
CI / More Go tests (push) Has been cancelled Details
CI / Go tests with previous Go version (push) Has been cancelled Details
CI / UI tests (push) Has been cancelled Details
CI / Go tests on Windows (push) Has been cancelled Details
CI / Mixins tests (push) Has been cancelled Details
CI / Build Prometheus for common architectures (0) (push) Has been cancelled Details
CI / Build Prometheus for common architectures (1) (push) Has been cancelled Details
CI / Build Prometheus for common architectures (2) (push) Has been cancelled Details
CI / Build Prometheus for all architectures (0) (push) Has been cancelled Details
CI / Build Prometheus for all architectures (1) (push) Has been cancelled Details
CI / Build Prometheus for all architectures (10) (push) Has been cancelled Details
CI / Build Prometheus for all architectures (11) (push) Has been cancelled Details
CI / Build Prometheus for all architectures (2) (push) Has been cancelled Details
CI / Build Prometheus for all architectures (3) (push) Has been cancelled Details
CI / Build Prometheus for all architectures (4) (push) Has been cancelled Details
CI / Build Prometheus for all architectures (5) (push) Has been cancelled Details
CI / Build Prometheus for all architectures (6) (push) Has been cancelled Details
CI / Build Prometheus for all architectures (7) (push) Has been cancelled Details
CI / Build Prometheus for all architectures (8) (push) Has been cancelled Details
CI / Build Prometheus for all architectures (9) (push) Has been cancelled Details
CI / Check generated parser (push) Has been cancelled Details
CI / golangci-lint (push) Has been cancelled Details
CI / fuzzing (push) Has been cancelled Details
CI / codeql (push) Has been cancelled Details
CI / Report status of build Prometheus for all architectures (push) Has been cancelled Details
CI / Publish main branch artifacts (push) Has been cancelled Details
CI / Publish release artefacts (push) Has been cancelled Details
CI / Publish UI on npm Registry (push) Has been cancelled Details 

Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
This commit is contained in:
Augustin Husson 2025-09-30 10:29:39 +02:00
parent 6076987106
commit cb3d9be6d2
1 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
web/ui/module/codemirror-promql/src/parser/parser.ts
View File

@ -131,11 +131,11 @@ export class Parser {
break;
}
case SmoothedExpr: {
this.checkSmoothedExpr(node);
this.checkAnchoredSmoothedExpr(node, [Rate, Increase, Delta]);
break;
}
case AnchoredExpr: {
this.checkAnchoredExpr(node);
this.checkAnchoredSmoothedExpr(node, [Resets, Changes, Rate, Increase, Delta]);
break;
}
case SubqueryExpr: {
@ -315,13 +315,19 @@ export class Parser {
}
}
private checkSmoothedExpr(node: SyntaxNode): void {
// A smoothed expression is supposed to be used in the following functions only:
// rate, increase and delta.
// So we need to check that the parent is a FunctionCall and that the function name is one of the above.
private checkAnchoredSmoothedExpr(node: SyntaxNode, allowedFunctions: number[]): void {
// A smoothed/anchored expression is supposed to work with range vectors or instant vectors.
// So first thing to do is to check the type of the child.
// Then, if this is used inside a function call, we need to check that the function is one of the given allowedFunctions.
const nodeType = getType(node);
if (nodeType !== ValueType.vector && nodeType !== ValueType.matrix) {
this.addDiagnostic(node, `smoothed/anchored expression only allowed on instant vector or range vector selector, got ${nodeType} instead`);
return;
}
const parent = node.parent?.parent;
if (!parent || parent.type.id !== FunctionCall) {
this.addDiagnostic(node, 'smoothed expression must be used inside a function call');
// Since the anchored/smoothed expression is not inside a function call, we cannot check the function name.
// This is an acceptable case as the anchored/smoothed expression can be used on any vector expression.
return;
}
const funcID = parent.firstChild?.firstChild;
@ -329,29 +335,8 @@ export class Parser {
this.addDiagnostic(node, 'function not defined');
return;
}
const allowedFunctions = [Rate, Increase, Delta];
if (!allowedFunctions.includes(funcID.type.id)) {
this.addDiagnostic(node, 'smoothed expression can only be used in the following functions: rate, increase and delta');
}
}
private checkAnchoredExpr(node: SyntaxNode): void {
// An anchored expression is supposed to be used in the following functions only:
// resets, changes, rate, increase and delta.
// So we need to check that the parent is a FunctionCall and that the function name is one of the above.
const parent = node.parent?.parent;
if (!parent || parent.type.id !== FunctionCall) {
this.addDiagnostic(node, 'anchored expression must be used inside a function call');
return;
}
const funcID = parent.firstChild?.firstChild;
if (!funcID) {
this.addDiagnostic(node, 'function not defined');
return;
}
const allowedFunctions = [Resets, Changes, Rate, Increase, Delta];
if (!allowedFunctions.includes(funcID.type.id)) {
this.addDiagnostic(node, 'anchored expression can only be used in the following functions: resets, changes, rate, increase and delta');
this.addDiagnostic(node, 'smoothed/anchored expression can only be used in specific functions');
}
}