RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-24 07:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

aggregate booleans for ease of reading

Browse Source 
Signed-off-by: schou <pschou@users.noreply.github.com>
This commit is contained in:
schou 2021-02-23 02:39:22 -05:00
parent 71712183ac
commit 22bfc11738
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
promql/engine.go
View File

@ -400,43 +400,47 @@ func (ng *Engine) validateOpts(expr parser.Expr) error {
return nil return nil
} }
atModifierUsed := false
negativeOffsetUsed := false
var validationErr error var validationErr error
parser.Inspect(expr, func(node parser.Node, path []parser.Node) error { parser.Inspect(expr, func(node parser.Node, path []parser.Node) error {
switch n := node.(type) { switch n := node.(type) {
case *parser.VectorSelector: case *parser.VectorSelector:
if !ng.enableAtModifier && if n.Timestamp != nil || n.StartOrEnd == parser.START || n.StartOrEnd == parser.END {
(n.Timestamp != nil || n.StartOrEnd == parser.START || n.StartOrEnd == parser.END) { atModifierUsed = true
validationErr = ErrValidationAtModifierDisabled
return validationErr
} }
if !ng.enableNegativeOffset && n.OriginalOffset < 0 { if n.OriginalOffset < 0 {
validationErr = ErrValidationNegativeOffsetDisabled negativeOffsetUsed = true
return validationErr
} }
case *parser.MatrixSelector: case *parser.MatrixSelector:
vs := n.VectorSelector.(*parser.VectorSelector) vs := n.VectorSelector.(*parser.VectorSelector)
if !ng.enableAtModifier && if vs.Timestamp != nil || vs.StartOrEnd == parser.START || vs.StartOrEnd == parser.END {
(vs.Timestamp != nil || vs.StartOrEnd == parser.START || vs.StartOrEnd == parser.END) { atModifierUsed = true
validationErr = ErrValidationAtModifierDisabled
return validationErr
} }
if !ng.enableNegativeOffset && vs.OriginalOffset < 0 { if vs.OriginalOffset < 0 {
validationErr = ErrValidationNegativeOffsetDisabled negativeOffsetUsed = true
return validationErr
} }
case *parser.SubqueryExpr: case *parser.SubqueryExpr:
if !ng.enableAtModifier && if n.Timestamp != nil || n.StartOrEnd == parser.START || n.StartOrEnd == parser.END {
(n.Timestamp != nil || n.StartOrEnd == parser.START || n.StartOrEnd == parser.END) { atModifierUsed = true
validationErr = ErrValidationAtModifierDisabled
return validationErr
} }
if !ng.enableNegativeOffset && n.OriginalOffset < 0 { if n.OriginalOffset < 0 {
validationErr = ErrValidationNegativeOffsetDisabled negativeOffsetUsed = true
return validationErr
} }
} }
if atModifierUsed && !ng.enableAtModifier {
validationErr = ErrValidationAtModifierDisabled
return validationErr
}
if negativeOffsetUsed && !ng.enableNegativeOffset {
validationErr = ErrValidationNegativeOffsetDisabled
return validationErr
}
return nil return nil
}) })