sum_ansi_mode_checks_fix_tests_rebase_main

Author: coderfender

native/spark-expr/src/agg_funcs/sum_int.rs

@@ -110,7 +110,7 @@ impl SumIntegerAccumulator {
     fn new(eval_mode: EvalMode) -> Self {
         if eval_mode == EvalMode::Try {
             Self {
-                // Try mode starts with 0 (because if this is init to None we cant say if it is none due to all nulls or due to an overflow
+                // Try mode starts with 0 (because if this is init to None we cant say if it is none due to all nulls or due to an overflow)
                 sum: Some(0),
                 has_all_nulls: true,
                 eval_mode,
@@ -152,7 +152,7 @@ impl Accumulator for SumIntegerAccumulator {
                                             "integer",
                                         )))
                                     } else {
-                                        return Ok(None);
+                                        Ok(None)
                                     };
                                 }
                             };

spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala

@@ -3061,7 +3061,7 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
             (null.asInstanceOf[java.lang.Long], "b"),
             (null.asInstanceOf[java.lang.Long], "b")),
           "tbl") {
-          val res = sql("SELECT _2, sum(_1) FROM tbl group by 1")
+          val res = sql("SELECT _2, try_sum(_1) FROM tbl group by 1")
           checkSparkAnswerAndOperator(res)
           assert(res.orderBy(col("_2")).collect() === Array(Row("a", null), Row("b", null)))
         }
@@ -3076,7 +3076,7 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
         withParquetTable(Seq((Long.MaxValue, 1L), (100L, 1L)), "tbl") {
           val res = sql("SELECT SUM(_1) FROM tbl")
           if (ansiEnabled) {
-            checkSparkMaybeThrows(res) match {
+            checkSparkAnswerMaybeThrows(res) match {
               case (Some(sparkExc), Some(cometExc)) =>
                 assert(sparkExc.getMessage.contains("ARITHMETIC_OVERFLOW"))
                 assert(cometExc.getMessage.contains("ARITHMETIC_OVERFLOW"))
@@ -3090,7 +3090,7 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
         withParquetTable(Seq((Long.MinValue, 1L), (-100L, 1L)), "tbl") {
           val res = sql("SELECT SUM(_1) FROM tbl")
           if (ansiEnabled) {
-            checkSparkMaybeThrows(res) match {
+            checkSparkAnswerMaybeThrows(res) match {
               case (Some(sparkExc), Some(cometExc)) =>
                 assert(sparkExc.getMessage.contains("ARITHMETIC_OVERFLOW"))
                 assert(cometExc.getMessage.contains("ARITHMETIC_OVERFLOW"))
@@ -3133,7 +3133,7 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
           "tbl") {
           val res = sql("SELECT _2, SUM(_1) FROM tbl GROUP BY _2").repartition(2)
           if (ansiEnabled) {
-            checkSparkMaybeThrows(res) match {
+            checkSparkAnswerMaybeThrows(res) match {
               case (Some(sparkExc), Some(cometExc)) =>
                 assert(sparkExc.getMessage.contains("ARITHMETIC_OVERFLOW"))
                 assert(cometExc.getMessage.contains("ARITHMETIC_OVERFLOW"))
@@ -3150,7 +3150,7 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
           "tbl") {
           val res = sql("SELECT _2, SUM(_1) FROM tbl GROUP BY _2")
           if (ansiEnabled) {
-            checkSparkMaybeThrows(res) match {
+            checkSparkAnswerMaybeThrows(res) match {
               case (Some(sparkExc), Some(cometExc)) =>
                 assert(sparkExc.getMessage.contains("ARITHMETIC_OVERFLOW"))
                 assert(cometExc.getMessage.contains("ARITHMETIC_OVERFLOW"))