feat(pojo): add UNSPECIFIED value to AggregationPhase enum (#320)

mbwhite · web-flow · commit a0ef1dd2cd79 · 2025-01-08T08:31:40.000-08:00
BREAKING CHANGE: AggregationPhase enum has a new allowed value
diff --git a/core/src/main/java/io/substrait/expression/Expression.java b/core/src/main/java/io/substrait/expression/Expression.java
@@ -940,6 +940,7 @@ public static AggregationInvocation fromProto(AggregateFunction.AggregationInvoc
   }
 
   enum AggregationPhase {
+    UNSPECIFIED(io.substrait.proto.AggregationPhase.AGGREGATION_PHASE_UNSPECIFIED),
     INITIAL_TO_INTERMEDIATE(
         io.substrait.proto.AggregationPhase.AGGREGATION_PHASE_INITIAL_TO_INTERMEDIATE),
     INTERMEDIATE_TO_INTERMEDIATE(
diff --git a/spark/src/main/scala/io/substrait/spark/expression/ToAggregateFunction.scala b/spark/src/main/scala/io/substrait/spark/expression/ToAggregateFunction.scala
@@ -74,6 +74,8 @@ object ToAggregateFunction {
     case other => throw new UnsupportedOperationException(s"not currently supported: $other.")
   }
   def toSpark(phase: SExpression.AggregationPhase): AggregateMode = phase match {
+    case SExpression.AggregationPhase.UNSPECIFIED =>
+      Final // UNSPECIFIED implies INTERMEDIATE_TO_RESULT
     case SExpression.AggregationPhase.INITIAL_TO_INTERMEDIATE => Partial
     case SExpression.AggregationPhase.INTERMEDIATE_TO_INTERMEDIATE => PartialMerge
     case SExpression.AggregationPhase.INTERMEDIATE_TO_RESULT => Final

Original file line number	Diff line number	Diff line change
`@@ -940,6 +940,7 @@ public static AggregationInvocation fromProto(AggregateFunction.AggregationInvoc`
`940`	`940`	`}`
`941`	`941`
`942`	`942`	`enum AggregationPhase {`
	`943`	`+ UNSPECIFIED(io.substrait.proto.AggregationPhase.AGGREGATION_PHASE_UNSPECIFIED),`
`943`	`944`	`INITIAL_TO_INTERMEDIATE(`
`944`	`945`	`io.substrait.proto.AggregationPhase.AGGREGATION_PHASE_INITIAL_TO_INTERMEDIATE),`
`945`	`946`	`INTERMEDIATE_TO_INTERMEDIATE(`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,8 @@ object ToAggregateFunction {`
`74`	`74`	`case other => throw new UnsupportedOperationException(s"not currently supported: $other.")`
`75`	`75`	`}`
`76`	`76`	`def toSpark(phase: SExpression.AggregationPhase): AggregateMode = phase match {`
	`77`	`+ case SExpression.AggregationPhase.UNSPECIFIED =>`
	`78`	`+ Final // UNSPECIFIED implies INTERMEDIATE_TO_RESULT`
`77`	`79`	`case SExpression.AggregationPhase.INITIAL_TO_INTERMEDIATE => Partial`
`78`	`80`	`case SExpression.AggregationPhase.INTERMEDIATE_TO_INTERMEDIATE => PartialMerge`
`79`	`81`	`case SExpression.AggregationPhase.INTERMEDIATE_TO_RESULT => Final`