You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2022/03/10 01:01:55 UTC
[GitHub] [spark] entong commented on a change in pull request #35787: [SPARK-38481][SQL] Substitute Java overflow exception from `TIMESTAMPADD` by Spark exception
entong commented on a change in pull request #35787:
URL: https://github.com/apache/spark/pull/35787#discussion_r823241977
##########
File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala
##########
@@ -1174,29 +1174,36 @@ object DateTimeUtils {
* @return A timestamp value, expressed in microseconds since 1970-01-01 00:00:00Z.
*/
def timestampAdd(unit: String, quantity: Int, micros: Long, zoneId: ZoneId): Long = {
- unit.toUpperCase(Locale.ROOT) match {
- case "MICROSECOND" =>
- timestampAddDayTime(micros, quantity, zoneId)
- case "MILLISECOND" =>
- timestampAddDayTime(micros, quantity * MICROS_PER_MILLIS, zoneId)
- case "SECOND" =>
- timestampAddDayTime(micros, quantity * MICROS_PER_SECOND, zoneId)
- case "MINUTE" =>
- timestampAddDayTime(micros, quantity * MICROS_PER_MINUTE, zoneId)
- case "HOUR" =>
- timestampAddDayTime(micros, quantity * MICROS_PER_HOUR, zoneId)
- case "DAY" | "DAYOFYEAR" =>
- timestampAddDayTime(micros, quantity * MICROS_PER_DAY, zoneId)
- case "WEEK" =>
- timestampAddDayTime(micros, quantity * MICROS_PER_DAY * DAYS_PER_WEEK, zoneId)
- case "MONTH" =>
- timestampAddMonths(micros, quantity, zoneId)
- case "QUARTER" =>
- timestampAddMonths(micros, quantity * 3, zoneId)
- case "YEAR" =>
- timestampAddMonths(micros, quantity * MONTHS_PER_YEAR, zoneId)
- case _ =>
+ try {
+ unit.toUpperCase(Locale.ROOT) match {
+ case "MICROSECOND" =>
+ timestampAddDayTime(micros, quantity, zoneId)
+ case "MILLISECOND" =>
+ timestampAddDayTime(micros, quantity * MICROS_PER_MILLIS, zoneId)
+ case "SECOND" =>
+ timestampAddDayTime(micros, quantity * MICROS_PER_SECOND, zoneId)
+ case "MINUTE" =>
+ timestampAddDayTime(micros, quantity * MICROS_PER_MINUTE, zoneId)
+ case "HOUR" =>
+ timestampAddDayTime(micros, quantity * MICROS_PER_HOUR, zoneId)
+ case "DAY" | "DAYOFYEAR" =>
+ timestampAddDayTime(micros, quantity * MICROS_PER_DAY, zoneId)
+ case "WEEK" =>
+ timestampAddDayTime(micros, quantity * MICROS_PER_DAY * DAYS_PER_WEEK, zoneId)
+ case "MONTH" =>
+ timestampAddMonths(micros, quantity, zoneId)
+ case "QUARTER" =>
+ timestampAddMonths(micros, quantity * 3, zoneId)
+ case "YEAR" =>
+ timestampAddMonths(micros, quantity * MONTHS_PER_YEAR, zoneId)
+ }
+ } catch {
+ case _: scala.MatchError =>
throw QueryExecutionErrors.invalidUnitInTimestampAdd(unit)
+ case _: ArithmeticException | _: DateTimeException =>
+ throw QueryExecutionErrors.datetimeOverflowError("timestampadd", micros, quantity, unit)
Review comment:
What if the original user query uses dateadd()?
--
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.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org