rebase

Author: Bhargava Vadlamani

native/spark-expr/src/math_funcs/div.rs

@@ -88,7 +88,8 @@ fn spark_decimal_div_internal(
         arrow::compute::kernels::arity::try_binary(left, right, |l, r| {
             let l = BigInt::from(l) * &l_mul;
             let r = BigInt::from(r) * &r_mul;
-            if eval_mode == EvalMode::Ansi && is_integral_div && r.is_zero() {
+            if eval_mode == EvalMode::Ansi && r.is_zero() {
+                println!("ANSI MODE ENABLED AND R is ZERO !!!!");
                 return Err(ArrowError::ComputeError(divide_by_zero_error().to_string()));
             }
             let div = if r.eq(&zero) { zero.clone() } else { &l / &r };
@@ -107,7 +108,8 @@ fn spark_decimal_div_internal(
         arrow::compute::kernels::arity::try_binary(left, right, |l, r| {
             let l = l * l_mul;
             let r = r * r_mul;
-            if eval_mode == EvalMode::Ansi && is_integral_div && r.is_zero() {
+            if eval_mode == EvalMode::Ansi && r.is_zero() {
+                println!("ELSE ::: ANSI MODE ENABLED AND R is ZERO !!!!");
                 return Err(ArrowError::ComputeError(divide_by_zero_error().to_string()));
             }
             let div = if r == 0 { 0 } else { l / r };

spark/src/main/scala/org/apache/comet/serde/arithmetic.scala

@@ -198,7 +198,7 @@ object CometIntegralDivide extends CometExpressionSerde[IntegralDivide] with Mat
       if (expr.right.dataType.isInstanceOf[DecimalType]) expr.right
       else Cast(expr.right, DecimalType(19, 0))
 
-    val rightExpr = if (expr.evalMode != EvalMode.ANSI) right else nullIfWhenPrimitive(right)
+    val rightExpr = if (expr.evalMode != EvalMode.ANSI) nullIfWhenPrimitive(right) else right
 
     val dataType = (left.dataType, right.dataType) match {
       case (l: DecimalType, r: DecimalType) =>

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

@@ -2842,7 +2842,7 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
             randomSize = 10000)
           withParquetTable(path1.toString, "tbl1") {
             withParquetTable(path2.toString, "tbl2") {
-              checkSparkAnswerAndOperator("""
+              val res = spark.sql("""
                   |select
                   | t1._2 div t2._2, div(t1._2, t2._2),
                   | t1._3 div t2._3, div(t1._3, t2._3),
@@ -2854,6 +2854,13 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
                   | from tbl1 t1 join tbl2 t2 on t1._id = t2._id
                   | order by t1._id""".stripMargin)
 
+//              res.show(10, false)
+
+              checkSparkAnswerAndOperator(res)
+//              withSQLConf(CometConf.COMET_ENABLED.key -> "false") {
+//                res.show(10, false)
+//              }
+
               checkSparkAnswerAndOperator("""
                   |select
                   | t1._12 div t2._12, div(t1._12, t2._12),