Apply my own review comments

fionaliao · fionaliao · commit 7cd13e2061cd · 2025-02-21T16:30:45.000Z
Signed-off-by: Fiona Liao &lt;fiona.liao@grafana.com&gt;
diff --git a/promql/engine.go b/promql/engine.go
@@ -552,21 +552,22 @@ type timeExprVisitor struct {
 }
 
 func (tev timeExprVisitor) Visit(node parser.Node, path []parser.Node) (parser.Visitor, error) {
-	checkTimeExpr := func(expr parser.Expr) (float64, error) {
+	evaluateTimeExpr := func(expr parser.Expr) (float64, error) {
 		if expr == nil {
 			return 0, nil
 		}
 
+		if nl, ok := expr.(*parser.NumberLiteral); ok {
+			return nl.Val, nil
+		}
+
 		hasStorageDependency, hasEvalTimeDependency := inspectTimeExpr(expr)
 		if hasStorageDependency {
 			return 0, ErrTimeExprUsesStorage
 		}
 		if tev.inSubquery && hasEvalTimeDependency {
 			return 0, ErrTimeExprDependsOnEvalTime
 		}
-		if nl, ok := expr.(*parser.NumberLiteral); ok {
-			return nl.Val, nil
-		}
 		val, err := tev.ev.scalarValueOf(expr)
 		if err != nil {
 			return 0, err
@@ -577,15 +578,15 @@ func (tev timeExprVisitor) Visit(node parser.Node, path []parser.Node) (parser.V
 
 	switch e := node.(type) {
 	case *parser.VectorSelector:
-		v, err := checkTimeExpr(e.OriginalOffsetExpr)
+		v, err := evaluateTimeExpr(e.OriginalOffsetExpr)
 		if err != nil {
 			*tev.err = err
 			return tev, err
 		}
 		e.OriginalOffset = secondsValueToDuration(v)
 		return tev, nil
 	case *parser.SubqueryExpr:
-		v, err := checkTimeExpr(e.OriginalOffsetExpr)
+		v, err := evaluateTimeExpr(e.OriginalOffsetExpr)
 		if err != nil {
 			*tev.err = err
 			return tev, err
