cloud-fan commented on a change in pull request #26995: [SPARK-30341][SQL]
Overflow check for interval arithmetic operations
URL: https://github.com/apache/spark/pull/26995#discussion_r361591860
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/IntervalUtils.scala
##########
@@ -413,45 +415,141 @@ object IntervalUtils {
new CalendarInterval(truncatedMonths, truncatedDays, micros.round)
}
+ /**
+ * Makes an interval from months, days and micros with the fractional part by
+ * adding the month fraction to days and the days fraction to micros.
+ */
+ private def safeFromDoubles(
+ monthsWithFraction: Double,
+ daysWithFraction: Double,
+ microsWithFraction: Double): CalendarInterval = {
+ val monthInLong = monthsWithFraction.toLong
+ val truncatedMonths = if (monthInLong > Int.MaxValue) {
+ Int.MaxValue
+ } else if (monthInLong < Int.MinValue) {
+ Int.MinValue
+ } else {
+ monthInLong.toInt
+ }
+ val days = daysWithFraction + DAYS_PER_MONTH * (monthsWithFraction -
truncatedMonths)
+ val dayInLong = days.toLong
+ val truncatedDays = if (dayInLong > Int.MaxValue) {
+ Int.MaxValue
+ } else if (monthInLong < Int.MinValue) {
+ Int.MinValue
+ } else {
+ dayInLong.toInt
+ }
+ val micros = microsWithFraction + MICROS_PER_DAY * (days - truncatedDays)
+ new CalendarInterval(truncatedMonths, truncatedDays.toInt, micros.round)
+ }
+
/**
* Unary minus, return the negated the calendar interval value.
*
* @param interval the interval to be negated
* @return a new calendar interval instance with all it parameters negated
from the origin one.
+ * @throws ArithmeticException if the result overflows any field value
*/
def negate(interval: CalendarInterval): CalendarInterval = {
+ val months = Math.negateExact(interval.months)
Review comment:
ah, seems better to follow the java naming conversion: `negate` and
`negateExact`.
----------------------------------------------------------------
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
