proxystorage: fix avg bug

jacksontj · Mar 4, 2020 · c39aef6 · c39aef6
1 parent dc00705
commit c39aef6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/proxystorage/proxy.go b/pkg/proxystorage/proxy.go
@@ -299,15 +299,15 @@ func (p *ProxyStorage) NodeReplacer(ctx context.Context, s *promql.EvalStmt, nod
 				Op: promql.ItemDIV,
 				LHS: &promql.AggregateExpr{
 					Op:       promql.ItemSum,
-					Expr:     n.Expr,
+					Expr:     CloneExpr(n.Expr),
 					Param:    n.Param,
 					Grouping: n.Grouping,
 					Without:  n.Without,
 				},
 
 				RHS: &promql.AggregateExpr{
 					Op:       promql.ItemCount,
-					Expr:     n.Expr,
+					Expr:     CloneExpr(n.Expr),
 					Param:    n.Param,
 					Grouping: n.Grouping,
 					Without:  n.Without,

diff --git a/pkg/proxystorage/util.go b/pkg/proxystorage/util.go
@@ -110,3 +110,8 @@ func (f *BooleanFinder) Visit(node promql.Node, _ []promql.Node) (promql.Visitor
 	}
 	return f, nil
 }
+
+func CloneExpr(expr promql.Expr) (newExpr promql.Expr) {
+	newExpr, _ = promql.ParseExpr(expr.String())
+	return
+}