From 2164e366ea0bcf3c6c44ba81bdba7778868db93a Mon Sep 17 00:00:00 2001 From: Tobias Guggenmos Date: Mon, 3 Feb 2020 18:22:38 +0100 Subject: [PATCH] Fix more identifiers Signed-off-by: Tobias Guggenmos --- promql/engine.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/promql/engine.go b/promql/engine.go index 66ef8e58ec..dd17b7ca87 100644 --- a/promql/engine.go +++ b/promql/engine.go @@ -1238,19 +1238,19 @@ func (ev *evaluator) eval(expr parser.Expr) parser.Value { switch e.Op { case parser.LAND: return ev.rangeEval(func(v []parser.Value, enh *EvalNodeHelper) Vector { - return ev.VectorAnd(v[0].(Vector), v[1].(Vector), e.parser.VectorMatching, enh) + return ev.VectorAnd(v[0].(Vector), v[1].(Vector), e.VectorMatching, enh) }, e.LHS, e.RHS) case parser.LOR: return ev.rangeEval(func(v []parser.Value, enh *EvalNodeHelper) Vector { - return ev.VectorOr(v[0].(Vector), v[1].(Vector), e.parser.VectorMatching, enh) + return ev.VectorOr(v[0].(Vector), v[1].(Vector), e.VectorMatching, enh) }, e.LHS, e.RHS) case parser.LUNLESS: return ev.rangeEval(func(v []parser.Value, enh *EvalNodeHelper) Vector { - return ev.VectorUnless(v[0].(Vector), v[1].(Vector), e.parser.VectorMatching, enh) + return ev.VectorUnless(v[0].(Vector), v[1].(Vector), e.VectorMatching, enh) }, e.LHS, e.RHS) default: return ev.rangeEval(func(v []parser.Value, enh *EvalNodeHelper) Vector { - return ev.VectorBinop(e.Op, v[0].(Vector), v[1].(Vector), e.parser.VectorMatching, e.ReturnBool, enh) + return ev.VectorBinop(e.Op, v[0].(Vector), v[1].(Vector), e.VectorMatching, e.ReturnBool, enh) }, e.LHS, e.RHS) } @@ -1333,7 +1333,7 @@ func (ev *evaluator) eval(expr parser.Expr) parser.Value { newEv.startTimestamp += newEv.interval } - res := newEv.eval(e.parser.Expr) + res := newEv.eval(e.Expr) ev.currentSamples = newEv.currentSamples return res case *StringLiteral: @@ -1423,7 +1423,7 @@ func putPointSlice(p []Point) { func (ev *evaluator) matrixSelector(node *parser.MatrixSelector) Matrix { checkForSeriesSetExpansion(ev.ctx, node) - vs := node.parser.VectorSelector.(*parser.VectorSelector) + vs := node.VectorSelector.(*parser.VectorSelector) var ( offset = durationMilliseconds(vs.Offset)