upstream promql compatibility changes

Signed-off-by: Owen Diehl <[email protected]>

Author: owen-d

pkg/querier/astmapper/astmapper_test.go

@@ -18,19 +18,19 @@ func TestCloneNode(t *testing.T) {
 		// simple unmodified case
 		{
 			&promql.BinaryExpr{
-				Op:  promql.ItemADD,
+				Op:  promql.ADD,
 				LHS: &promql.NumberLiteral{Val: 1},
 				RHS: &promql.NumberLiteral{Val: 1},
 			},
 			&promql.BinaryExpr{
-				Op:  promql.ItemADD,
+				Op:  promql.ADD,
 				LHS: &promql.NumberLiteral{Val: 1},
 				RHS: &promql.NumberLiteral{Val: 1},
 			},
 		},
 		{
 			&promql.AggregateExpr{
-				Op:      promql.ItemSum,
+				Op:      promql.SUM,
 				Without: true,
 				Expr: &promql.VectorSelector{
 					Name: "some_metric",
@@ -41,7 +41,7 @@ func TestCloneNode(t *testing.T) {
 				Grouping: []string{"foo"},
 			},
 			&promql.AggregateExpr{
-				Op:      promql.ItemSum,
+				Op:      promql.SUM,
 				Without: true,
 				Expr: &promql.VectorSelector{
 					Name: "some_metric",

pkg/querier/astmapper/embedded.go

@@ -89,7 +89,7 @@ func OrSquasher(nodes ...promql.Node) (promql.Expr, error) {
 	combined := nodes[0]
 	for i := 1; i < len(nodes); i++ {
 		combined = &promql.BinaryExpr{
-			Op:  promql.ItemLOR,
+			Op:  promql.LOR,
 			LHS: combined.(promql.Expr),
 			RHS: nodes[i].(promql.Expr),
 		}

pkg/querier/astmapper/parallel.go

@@ -6,12 +6,12 @@ import (
 )
 
 var summableAggregates = map[promql.ItemType]struct{}{
-	promql.ItemSum:     {},
-	promql.ItemMin:     {},
-	promql.ItemMax:     {},
-	promql.ItemTopK:    {},
-	promql.ItemBottomK: {},
-	promql.ItemCount:   {},
+	promql.SUM:     {},
+	promql.MIN:     {},
+	promql.MAX:     {},
+	promql.TOPK:    {},
+	promql.BOTTOMK: {},
+	promql.COUNT:   {},
 }
 
 var nonParallelFuncs = []string{

pkg/querier/astmapper/parallel_test.go

@@ -18,7 +18,7 @@ func TestCanParallel(t *testing.T) {
 		// simple sum
 		{
 			&promql.AggregateExpr{
-				Op:      promql.ItemSum,
+				Op:      promql.SUM,
 				Without: true,
 				Expr: &promql.VectorSelector{
 					Name: "some_metric",
@@ -39,11 +39,11 @@ func TestCanParallel(t *testing.T) {
 		*/
 		{
 			&promql.AggregateExpr{
-				Op: promql.ItemSum,
+				Op: promql.SUM,
 				Expr: &promql.BinaryExpr{
-					Op: promql.ItemDIV,
+					Op: promql.DIV,
 					LHS: &promql.AggregateExpr{
-						Op:       promql.ItemSum,
+						Op:       promql.SUM,
 						Grouping: []string{"foo"},
 						Expr: &promql.VectorSelector{
 							Name: "idk",
@@ -52,7 +52,7 @@ func TestCanParallel(t *testing.T) {
 							}},
 					},
 					RHS: &promql.AggregateExpr{
-						Op:       promql.ItemSum,
+						Op:       promql.SUM,
 						Grouping: []string{"foo"},
 						Expr: &promql.VectorSelector{
 							Name: "idk",
@@ -67,7 +67,7 @@ func TestCanParallel(t *testing.T) {
 		// sum by (foo) bar1{baz=”blip”}[1m]) ---- this is the first leg of the above
 		{
 			&promql.AggregateExpr{
-				Op:       promql.ItemSum,
+				Op:       promql.SUM,
 				Grouping: []string{"foo"},
 				Expr: &promql.VectorSelector{
 					Name: "idk",

pkg/querier/astmapper/shard_summer.go

@@ -59,7 +59,7 @@ func (summer *shardSummer) MapNode(node promql.Node) (promql.Node, bool, error)
 
 	switch n := node.(type) {
 	case *promql.AggregateExpr:
-		if CanParallel(n) && n.Op == promql.ItemSum {
+		if CanParallel(n) && n.Op == promql.SUM {
 			result, err := summer.shardSum(n)
 			return result, true, err
 		}