cloud-fan commented on a change in pull request #29882: URL: https://github.com/apache/spark/pull/29882#discussion_r513232098
########## File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala ########## @@ -370,12 +417,13 @@ trait DivModLike extends BinaryArithmetic { ${eval2.code} boolean ${ev.isNull} = false; $javaType ${ev.value} = ${CodeGenerator.defaultValue(dataType)}; - if (${eval2.isNull} || $isZero) { + if (${eval2.isNull}$nullOnErrorCondition) { ${ev.isNull} = true; } else { ${eval1.code} if (${eval1.isNull}) { ${ev.isNull} = true; + $failOnErrorBranch Review comment: We should also change `eval` to match this. ########## File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala ########## @@ -370,12 +417,13 @@ trait DivModLike extends BinaryArithmetic { ${eval2.code} boolean ${ev.isNull} = false; $javaType ${ev.value} = ${CodeGenerator.defaultValue(dataType)}; - if (${eval2.isNull} || $isZero) { + if (${eval2.isNull}$nullOnErrorCondition) { ${ev.isNull} = true; } else { ${eval1.code} if (${eval1.isNull}) { ${ev.isNull} = true; + $failOnErrorBranch Review comment: We should also change `eval` method to match this. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org