[coordinator] Include Type in RollupOp.Equal (#3322)

m3db · Mar 4, 2021 · 1699ee2 · 1699ee2
1 parent 100b867
commit 1699ee2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/src/metrics/pipeline/type.go b/src/metrics/pipeline/type.go
@@ -320,6 +320,9 @@ func (op RollupOp) Equal(other RollupOp) bool {
 	if !op.AggregationID.Equal(other.AggregationID) {
 		return false
 	}
+	if op.Type != other.Type {
+		return false
+	}
 	return op.SameTransform(other)
 }
 

diff --git a/src/metrics/pipeline/type_test.go b/src/metrics/pipeline/type_test.go
@@ -223,6 +223,35 @@ func TestTransformationOpRoundTrip(t *testing.T) {
 	require.Equal(t, testTransformationOp, res)
 }
 
+func TestRollupOpEqual(t *testing.T) {
+	inputs := []struct {
+		a1       RollupOp
+		a2       RollupOp
+		expected bool
+	}{
+		{
+			a1:       RollupOp{Type: GroupByRollupType},
+			a2:       RollupOp{Type: GroupByRollupType},
+			expected: true,
+		},
+		{
+			a1:       RollupOp{Type: ExcludeByRollupType},
+			a2:       RollupOp{Type: ExcludeByRollupType},
+			expected: true,
+		},
+		{
+			a1:       RollupOp{Type: GroupByRollupType},
+			a2:       RollupOp{Type: ExcludeByRollupType},
+			expected: false,
+		},
+	}
+
+	for _, input := range inputs {
+		require.Equal(t, input.expected, input.a1.Equal(input.a2))
+		require.Equal(t, input.expected, input.a2.Equal(input.a1))
+	}
+}
+
 func TestRollupOpSameTransform(t *testing.T) {
 	rollupOp := RollupOp{
 		newName: b("foo"),