Skip to content

[SPARK-46396][SQL] Timestamp inference should not throw exception #44338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[SPARK-46396][SQL] Timestamp inference should not throw exception #44338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e869184
add try..catch in parseOptional
gengliangwang Dec 13, 2023
5670788
retrigger tests
gengliangwang Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions sql/api/src/main/scala/org/apache/spark/sql/catalyst/util/TimestampFormatter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,10 +415,14 @@ class LegacyFastTimestampFormatter(

override def parseOptional(s: String): Option[Long] = {
cal.clear() // Clear the calendar because it can be re-used many times
if (fastDateFormat.parse(s, new ParsePosition(0), cal)) {
Some(extractMicros(cal))
} else {
None
try {
if (fastDateFormat.parse(s, new ParsePosition(0), cal)) {
Some(extractMicros(cal))
} else {
None
}
} catch {
case NonFatal(_) => None
}
}

Expand Down
3 changes: 2 additions & 1 deletion sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/TimestampFormatterSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,10 +486,11 @@ class TimestampFormatterSuite extends DatetimeFormatterSuite {

assert(fastFormatter.parseOptional("2023-12-31 23:59:59.9990").contains(1704067199999000L))
assert(fastFormatter.parseOptional("abc").isEmpty)
assert(fastFormatter.parseOptional("23012150952").isEmpty)

assert(simpleFormatter.parseOptional("2023-12-31 23:59:59.9990").contains(1704067208990000L))
assert(simpleFormatter.parseOptional("abc").isEmpty)

assert(simpleFormatter.parseOptional("23012150952").isEmpty)
}

test("SPARK-45424: do not return optional parse results when only prefix match") {
Expand Down