Skip to content

[SPARK-56913][SQL] Simplify BinaryArithmetic byte/short codegen under ANSI mode #55938

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
gengliangwang wants to merge 4 commits into
base: master
Choose a base branch
from
+13 −23
Open

[SPARK-56913][SQL] Simplify BinaryArithmetic byte/short codegen under ANSI mode #55938

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b38e73a
[SPARK-56913][SQL] Refactor BinaryArithmetic byte/short codegen under…
gengliangwang May 17, 2026
915a357
address review comments from viirya
gengliangwang May 19, 2026
e64a5b0
address review comments from cloud-fan: call ByteExactNumeric/ShortEx…
gengliangwang May 20, 2026
94014a0
switch BinaryArithmetic codegen to call ByteExactNumeric/ShortExactNu…
gengliangwang May 20, 2026
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
36 changes: 13 additions & 23 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,31 +301,21 @@ abstract class BinaryArithmetic extends BinaryOperator with SupportQueryContext
val mathUtils = IntervalMathUtils.getClass.getCanonicalName.stripSuffix("$")
defineCodeGen(ctx, ev, (eval1, eval2) => s"$mathUtils.${exactMathMethod.get}($eval1, $eval2)")
// byte and short are casted into int when add, minus, times or divide
case ByteType | ShortType if failOnError =>
val methodName = symbol match {
case "+" => "plus"
case "-" => "minus"
case "*" => "times"
case _ =>
throw SparkException.internalError(
s"Unexpected symbol '$symbol' for Byte/Short BinaryArithmetic")
}
val numericObj = (if (dataType == ByteType) ByteExactNumeric else ShortExactNumeric)
.getClass.getCanonicalName.stripSuffix("$")
defineCodeGen(ctx, ev, (eval1, eval2) => s"$numericObj.$methodName($eval1, $eval2)")
case ByteType | ShortType =>
nullSafeCodeGen(ctx, ev, (eval1, eval2) => {
val tmpResult = ctx.freshName("tmpResult")
val try_suggestion = symbol match {
case "+" => "try_add"
case "-" => "try_subtract"
case "*" => "try_multiply"
case _ => "unknown_function"
}
val overflowCheck = if (failOnError) {
val javaType = CodeGenerator.boxedType(dataType)
s"""
|if ($tmpResult < $javaType.MIN_VALUE || $tmpResult > $javaType.MAX_VALUE) {
| throw QueryExecutionErrors.binaryArithmeticCauseOverflowError(
| $eval1, "$symbol", $eval2, "$try_suggestion");
|}
""".stripMargin
} else {
""
}
s"""
|${CodeGenerator.JAVA_INT} $tmpResult = $eval1 $symbol $eval2;
|$overflowCheck
|${ev.value} = (${CodeGenerator.javaType(dataType)})($tmpResult);
""".stripMargin
s"${ev.value} = (${CodeGenerator.javaType(dataType)})($eval1 $symbol $eval2);"
})
case IntegerType | LongType if failOnError && exactMathMethod.isDefined =>
nullSafeCodeGen(ctx, ev, (eval1, eval2) => {
Expand Down