diff --git a/promql/bench_test.go b/promql/bench_test.go index 773ba2acfb..091ac71347 100644 --- a/promql/bench_test.go +++ b/promql/bench_test.go @@ -665,7 +665,7 @@ func BenchmarkParser(b *testing.B) { expr, _ := parser.ParseExpr(c) start, end := time.Now().Add(-time.Hour), time.Now() for i := 0; i < b.N; i++ { - promql.PreprocessExpr(expr, start, end) + promql.PreprocessExpr(expr, start, end, 0) } }) } diff --git a/promql/parser/ast.go b/promql/parser/ast.go index 2e54f3fe67..11b3beb43e 100644 --- a/promql/parser/ast.go +++ b/promql/parser/ast.go @@ -394,13 +394,13 @@ func ChildrenIter(node Node) func(func(Node) bool) { } } case *AggregateExpr: - if n.Param != nil { - if !yield(n.Param) { + if n.Expr != nil { + if !yield(n.Expr) { return } } - if n.Expr != nil { - yield(n.Expr) + if n.Param != nil { + yield(n.Param) } case *BinaryExpr: if !yield(n.LHS) { @@ -426,7 +426,7 @@ func ChildrenIter(node Node) func(func(Node) bool) { case *NumberLiteral, *StringLiteral, *VectorSelector: // nothing to do default: - panic(fmt.Errorf("promql.Children: unhandled node type %T", node)) + panic(fmt.Errorf("promql.ChildrenIter: unhandled node type %T", node)) } } }