Skip to content

[SPARK-59643][SQL] Tighten CheckOverflow nullability to match MakeDecimal #58913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
david-mollitor-db wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −3
Open

[SPARK-59643][SQL] Tighten CheckOverflow nullability to match MakeDecimal #58913

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ...atalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/decimalExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ case class CheckOverflow(
dataType: DecimalType,
nullOnOverflow: Boolean) extends UnaryExpression with SupportQueryContext {

override def nullable: Boolean = true
// When `nullOnOverflow` is false, an overflow throws instead of producing null, so the result is
// null only when the input is. When true, an overflow yields null regardless of the input.
override def nullable: Boolean = child.nullable || nullOnOverflow

override def nullSafeEval(input: Any): Any =
input.asInstanceOf[Decimal].toPrecision(
Expand All @@ -130,11 +132,14 @@ case class CheckOverflow(
override protected def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = {
val errorContextCode = getContextOrNullCode(ctx, !nullOnOverflow)
nullSafeCodeGen(ctx, ev, eval => {
// Mirror MakeDecimal above: `ev.isNull` is a literal when this expression is non-nullable
// (under `!nullOnOverflow` a non-null input never overflows to null -- it throws), so only
// re-derive it from the value when the expression is actually nullable.
val setIsNull = if (nullable) s"\n${ev.isNull} = ${ev.value} == null;" else ""
// scalastyle:off line.size.limit
s"""
|${ev.value} = $eval.toPrecision(
| ${dataType.precision}, ${dataType.scale}, Decimal.ROUND_HALF_UP(), $nullOnOverflow, $errorContextCode);
|${ev.isNull} = ${ev.value} == null;
| ${dataType.precision}, ${dataType.scale}, Decimal.ROUND_HALF_UP(), $nullOnOverflow, $errorContextCode);$setIsNull
""".stripMargin
// scalastyle:on line.size.limit
})
Expand Down