MaxGekk commented on a change in pull request #35787:
URL: https://github.com/apache/spark/pull/35787#discussion_r823379716
##########
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:
or if we are going to re-use the error class in other ops:
```
"DATETIME_OVERFLOW" : {
"message" : [ "Datetime operation overflow: %s." ],
"sqlState" : "22008"
},
```
which users see as:
```
Datetime operation overflow: add 10000000 YEAR to '2022-03-10T11:12:13Z'.
```
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
