rebase

Author: coderfender

native/core/src/common/bit.rs

@@ -671,7 +671,7 @@ impl BitReader {
             }
         }
 
-        debug_assert!(!(offset + i).is_multiple_of(8)|| num_bits_to_read - i < 8);
+        debug_assert!(!(offset + i).is_multiple_of(8) || num_bits_to_read - i < 8);
 
         // Now copy the remaining bits if there's any.
         while i < num_bits_to_read {

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

@@ -185,11 +185,6 @@ object CometIntegralDivide extends CometExpressionSerde[IntegralDivide] with Mat
       inputs: Seq[Attribute],
       binding: Boolean): Option[ExprOuterClass.Expr] = {
 
-    if (!supportedDataType(expr.left.dataType)) {
-      withInfo(expr, s"Unsupported datatype ${expr.left.dataType}")
-      return None
-    }
-
 //    Precision is set to 19 (max precision for a numerical data type except DecimalType)
 
     val left =
@@ -199,7 +194,8 @@ object CometIntegralDivide extends CometExpressionSerde[IntegralDivide] with Mat
       if (expr.right.dataType.isInstanceOf[DecimalType]) expr.right
       else Cast(expr.right, DecimalType(19, 0))
 
-    val rightExpr = 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

@@ -49,6 +49,9 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
   val ARITHMETIC_OVERFLOW_EXCEPTION_MSG =
     """org.apache.comet.CometNativeException: [ARITHMETIC_OVERFLOW] integer overflow. If necessary set "spark.sql.ansi.enabled" to "false" to bypass this error."""
 
+  val DIVIDE_BY_ZERO_ERROR =
+    """[DIVIDE_BY_ZERO] Division by zero. Use `try_divide` to tolerate divisor being 0 and return NULL instead"""
+
   override protected def test(testName: String, testTags: Tag*)(testFun: => Any)(implicit
       pos: Position): Unit = {
     super.test(testName, testTags: _*) {
@@ -469,9 +472,7 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
 
         checkSparkMaybeThrows(res) match {
           case (Some(sparkExc), Some(cometExc)) =>
-            val cometErrorPattern =
-              """org.apache.comet.CometNativeException: [DIVIDE_BY_ZERO] Division by zero. Use `try_divide` to tolerate divisor being 0 and return NULL instead"""
-            assert(cometExc.getMessage.contains(cometErrorPattern))
+            assert(cometExc.getMessage.contains(DIVIDE_BY_ZERO_ERROR))
             assert(sparkExc.getMessage.contains("Division by zero"))
           case _ => fail("Exception should be thrown")
         }
@@ -492,9 +493,7 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
 
         checkSparkMaybeThrows(res) match {
           case (Some(sparkExc), Some(cometExc)) =>
-            val cometErrorPattern =
-              """[DIVIDE_BY_ZERO] Division by zero. Use `try_divide` to tolerate divisor being 0 and return NULL instead"""
-            assert(cometExc.getMessage.contains(cometErrorPattern))
+            assert(cometExc.getMessage.contains(DIVIDE_BY_ZERO_ERROR))
             assert(sparkExc.getMessage.contains("Division by zero"))
           case _ => fail("Exception should be thrown")
         }
@@ -515,9 +514,7 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
 
         checkSparkMaybeThrows(res) match {
           case (Some(sparkExc), Some(cometExc)) =>
-            val cometErrorPattern =
-              """[DIVIDE_BY_ZERO] Division by zero. Use `try_divide` to tolerate divisor being 0 and return NULL instead"""
-            assert(cometExc.getMessage.contains(cometErrorPattern))
+            assert(cometExc.getMessage.contains(DIVIDE_BY_ZERO_ERROR))
             assert(sparkExc.getMessage.contains("Division by zero"))
           case _ => fail("Exception should be thrown")
         }