axiom/query: sync aggregations

Author: lukasmalkmus

axiom/query/aggregation.go

@@ -28,20 +28,24 @@ const (
 	OpMax                 // max
 	OpMaxIf               // maxif
 	OpTopk                // topk
+	OpTopkIf              // topkif
 	OpPercentiles         // percentiles
+	OpPercentilesIf       // percentilesif
 	OpHistogram           // histogram
+	OpHistogramIf         // histogramif
 	OpStandardDeviation   // stdev
 	OpStandardDeviationIf // stdevif
 	OpVariance            // variance
 	OpVarianceIf          // varianceif
 	OpArgMin              // argmin
 	OpArgMax              // argmax
 	OpRate                // rate
-	OpPearson             // pearson_correlation
 	OpMakeSet             // makeset
 	OpMakeSetIf           // makesetif
 	OpMakeList            // makelist
 	OpMakeListIf          // makelistif
+	OpComputed            // computed
+	OpSpotlight           // spotlight
 )
 
 func aggregationOpFromString(s string) (op AggregationOp, err error) {
@@ -72,10 +76,16 @@ func aggregationOpFromString(s string) (op AggregationOp, err error) {
 		op = OpMaxIf
 	case OpTopk.String():
 		op = OpTopk
+	case OpTopkIf.String():
+		op = OpTopkIf
 	case OpPercentiles.String():
 		op = OpPercentiles
+	case OpPercentilesIf.String():
+		op = OpPercentilesIf
 	case OpHistogram.String():
 		op = OpHistogram
+	case OpHistogramIf.String():
+		op = OpHistogramIf
 	case OpStandardDeviation.String():
 		op = OpStandardDeviation
 	case OpStandardDeviationIf.String():
@@ -90,8 +100,6 @@ func aggregationOpFromString(s string) (op AggregationOp, err error) {
 		op = OpArgMax
 	case OpRate.String():
 		op = OpRate
-	case OpPearson.String():
-		op = OpPearson
 	case OpMakeSet.String():
 		op = OpMakeSet
 	case OpMakeSetIf.String():
@@ -100,6 +108,10 @@ func aggregationOpFromString(s string) (op AggregationOp, err error) {
 		op = OpMakeList
 	case OpMakeListIf.String():
 		op = OpMakeListIf
+	case OpComputed.String():
+		op = OpComputed
+	case OpSpotlight.String():
+		op = OpSpotlight
 	default:
 		return OpUnknown, fmt.Errorf("unknown aggregation operation: %s", s)
 	}

axiom/query/aggregation_string.go

@@ -21,17 +21,17 @@ func TestAggregationOp_Unmarshal(t *testing.T) {
 func TestAggregationOp_String(t *testing.T) {
 	// Check outer bounds.
 	assert.Equal(t, OpUnknown, AggregationOp(0))
-	assert.Contains(t, (OpMakeListIf + 1).String(), "AggregationOp(")
+	assert.Contains(t, (OpSpotlight + 1).String(), "AggregationOp(")
 
-	for op := OpUnknown; op <= OpMakeListIf; op++ {
+	for op := OpUnknown; op <= OpSpotlight; op++ {
 		s := op.String()
 		assert.NotEmpty(t, s)
 		assert.NotContains(t, s, "AggregationOp(")
 	}
 }
 
 func TestAggregationOpFromString(t *testing.T) {
-	for op := OpCount; op <= OpMakeListIf; op++ {
+	for op := OpCount; op <= OpSpotlight; op++ {
 		s := op.String()
 
 		parsedOp, err := aggregationOpFromString(s)