mgaido91 commented on a change in pull request #21599: [SPARK-26218][SQL]
Overflow on arithmetic operations returns incorrect result
URL: https://github.com/apache/spark/pull/21599#discussion_r308797063
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala
##########
@@ -35,17 +35,36 @@ import org.apache.spark.unsafe.types.CalendarInterval
""")
case class UnaryMinus(child: Expression) extends UnaryExpression
with ExpectsInputTypes with NullIntolerant {
+ private val checkOverflow = SQLConf.get.arithmeticOperationOverflowCheck
override def inputTypes: Seq[AbstractDataType] =
Seq(TypeCollection.NumericAndInterval)
override def dataType: DataType = child.dataType
override def toString: String = s"-$child"
- private lazy val numeric = TypeUtils.getNumeric(dataType)
+ private lazy val numeric = TypeUtils.getNumeric(dataType, checkOverflow)
override def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode =
dataType match {
case _: DecimalType => defineCodeGen(ctx, ev, c => s"$c.unary_$$minus()")
+ case ByteType | ShortType if checkOverflow =>
+ nullSafeCodeGen(ctx, ev, eval => {
+ val javaBoxedType = CodeGenerator.boxedType(dataType)
+ val javaType = CodeGenerator.javaType(dataType)
+ val originValue = ctx.freshName("origin")
+ s"""
+ |$javaType $originValue = ($javaType)($eval);
+ |if ($originValue == $javaBoxedType.MIN_VALUE) {
+ | throw new ArithmeticException("- " + $originValue + " caused
overflow.");
+ |}
+ |${ev.value} = ($javaType)(-($originValue));
+ """.stripMargin
+ })
+ case IntegerType | LongType if checkOverflow =>
+ nullSafeCodeGen(ctx, ev, eval => {
+ val mathClass = classOf[Math].getName
+ s"${ev.value} = $mathClass.negateExact(-($eval));"
Review comment:
mmmh...it should indeed...I am wondering how could test cases pass...
----------------------------------------------------------------
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
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
