[SPARK-47977] DateTimeUtils.timestampDiff and DateTimeUtils.timestampAdd should not throw INTERNAL_ERROR exception #46210
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…Add should not throw INTERNAL_ERROR exception
|
@MaxGekk please take a look |
|
@cloud-fan please review |
| @@ -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) | |||
| @@ -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) | |||
gengliangwang
approved these changes
May 29, 2024
cloud-fan
approved these changes
May 29, 2024
|
it has merge conflicts, @vitaliili-db can you fix it? |
|
@cloud-fan done! |
|
Thanks, merging to master |
riyaverm-db
pushed a commit
to riyaverm-db/spark
that referenced
this pull request
Jun 7, 2024
…Add 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 apache#46210 from vitaliili-db/SPARK-47977. Authored-by: Vitalii Li <[email protected]> Signed-off-by: Gengliang Wang <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Convert
INTERNAL_ERRORfortimestampAddandtimestampDiffto error with class. ReusingINVALID_PARAMETER_VALUE.DATETIME_UNITused when parsing expressions.The change is needed since
timestampDiffandtimestampAddexpressions could be constructed without going through parser - e.g. PySpark createstimestampDiffthrough 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