You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ge...@apache.org on 2024/06/03 18:49:26 UTC
(spark) branch master updated: [SPARK-47977] DateTimeUtils.timestampDiff and DateTimeUtils.timestampAdd should not throw INTERNAL_ERROR exception
This is an automated email from the ASF dual-hosted git repository.
gengliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 5baaa615ef85 [SPARK-47977] DateTimeUtils.timestampDiff and DateTimeUtils.timestampAdd should not throw INTERNAL_ERROR exception
5baaa615ef85 is described below
commit 5baaa615ef852c2032342c5986b4aa15ccf74b25
Author: Vitalii Li <vi...@databricks.com>
AuthorDate: Mon Jun 3 11:49:14 2024 -0700
[SPARK-47977] DateTimeUtils.timestampDiff and DateTimeUtils.timestampAdd should not throw INTERNAL_ERROR exception
### What changes were proposed in this pull request?
Convert `INTERNAL_ERROR` for `timestampAdd` and `timestampDiff` to error with class. Reusing `INVALID_PARAMETER_VALUE.DATETIME_UNIT` used when parsing expressions.
The change is needed since `timestampDiff` and `timestampAdd` expressions could be constructed without going through parser - e.g. PySpark creates `timestampDiff` through PythonSQLUtils.
### Why are the changes needed?
Correct classification of errors
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Existing unit tests updated with new error class
### Was this patch authored or co-authored using generative AI tooling?
No
Closes #46210 from vitaliili-db/SPARK-47977.
Authored-by: Vitalii Li <vi...@databricks.com>
Signed-off-by: Gengliang Wang <ge...@apache.org>
---
.../spark/sql/catalyst/util/DateTimeUtils.scala | 4 ++--
.../spark/sql/errors/QueryExecutionErrors.scala | 11 +++++++++++
.../spark/sql/catalyst/util/DateTimeUtilsSuite.scala | 20 +++++++++++++-------
3 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala
index e31ccdb81825..f1c36f2f5c28 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala
@@ -698,7 +698,7 @@ object DateTimeUtils extends SparkDateTimeUtils {
}
} catch {
case _: scala.MatchError =>
- throw SparkException.internalError(s"Got the unexpected unit '$unit'.")
+ throw QueryExecutionErrors.invalidDatetimeUnitError("TIMESTAMPADD", unit)
case _: ArithmeticException | _: DateTimeException =>
throw QueryExecutionErrors.timestampAddOverflowError(micros, quantity, unit)
case e: Throwable =>
@@ -736,7 +736,7 @@ object DateTimeUtils extends SparkDateTimeUtils {
val endLocalTs = getLocalDateTime(endTs, zoneId)
timestampDiffMap(unitInUpperCase)(startLocalTs, endLocalTs)
} else {
- throw SparkException.internalError(s"Got the unexpected unit '$unit'.")
+ throw QueryExecutionErrors.invalidDatetimeUnitError("TIMESTAMPDIFF", unit)
}
}
}
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala
index f587d87284f3..30e53f146982 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala
@@ -2782,4 +2782,15 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase with ExecutionE
)
)
}
+
+ def invalidDatetimeUnitError(
+ functionName: String,
+ invalidValue: String): Throwable = {
+ new SparkIllegalArgumentException(
+ errorClass = "INVALID_PARAMETER_VALUE.DATETIME_UNIT",
+ messageParameters = Map(
+ "functionName" -> toSQLId(functionName),
+ "parameter" -> toSQLId("unit"),
+ "invalidValue" -> s"'$invalidValue'"))
+ }
}
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala
index f68d485ac95f..8d8669aece89 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit
import org.scalatest.matchers.must.Matchers
import org.scalatest.matchers.should.Matchers._
-import org.apache.spark.{SparkException, SparkFunSuite, SparkIllegalArgumentException}
+import org.apache.spark.{SparkFunSuite, SparkIllegalArgumentException}
import org.apache.spark.sql.catalyst.plans.SQLHelper
import org.apache.spark.sql.catalyst.util.DateTimeConstants._
import org.apache.spark.sql.catalyst.util.DateTimeTestUtils._
@@ -1040,11 +1040,14 @@ class DateTimeUtilsSuite extends SparkFunSuite with Matchers with SQLHelper {
}
checkError(
- exception = intercept[SparkException] {
+ exception = intercept[SparkIllegalArgumentException] {
timestampAdd("SECS", 1, date(1969, 1, 1, 0, 0, 0, 1, getZoneId("UTC")), getZoneId("UTC"))
},
- errorClass = "INTERNAL_ERROR",
- parameters = Map("message" -> "Got the unexpected unit 'SECS'."))
+ errorClass = "INVALID_PARAMETER_VALUE.DATETIME_UNIT",
+ parameters = Map(
+ "functionName" -> "`TIMESTAMPADD`",
+ "parameter" -> "`unit`",
+ "invalidValue" -> "'SECS'"))
}
test("SPARK-38284: difference between two timestamps in units") {
@@ -1092,14 +1095,17 @@ class DateTimeUtilsSuite extends SparkFunSuite with Matchers with SQLHelper {
}
checkError(
- exception = intercept[SparkException] {
+ exception = intercept[SparkIllegalArgumentException] {
timestampDiff(
"SECS",
date(1969, 1, 1, 0, 0, 0, 1, getZoneId("UTC")),
date(2022, 1, 1, 0, 0, 0, 1, getZoneId("UTC")),
getZoneId("UTC"))
},
- errorClass = "INTERNAL_ERROR",
- parameters = Map("message" -> "Got the unexpected unit 'SECS'."))
+ errorClass = "INVALID_PARAMETER_VALUE.DATETIME_UNIT",
+ parameters =
+ Map("functionName" -> "`TIMESTAMPDIFF`",
+ "parameter" -> "`unit`",
+ "invalidValue" -> "'SECS'"))
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org