Skip to content

[SPARK-29651][SQL] Fix parsing of interval seconds fraction #26313

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
MaxGekk wants to merge 8 commits into from
Closed

[SPARK-29651][SQL] Fix parsing of interval seconds fraction #26313

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
012143f
Fix parsing nanos
MaxGekk Oct 30, 2019
d768468
Fix parsing negative nanos
MaxGekk Oct 30, 2019
46f1464
Regen interval.sql.out
MaxGekk Oct 30, 2019
182deef
Address a review comment
MaxGekk Oct 30, 2019
bf324f1
Fix IntervalUtilsSuite
MaxGekk Oct 30, 2019
a9797db
Regen interval.sql.out
MaxGekk Oct 30, 2019
81881c3
Fix for DDLParserSuite
MaxGekk Oct 30, 2019
337e9af
Regen literals.sql.out
MaxGekk Oct 30, 2019
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
Prev Previous commit
Next Next commit
Fix for DDLParserSuite
  • Loading branch information
@MaxGekk
MaxGekk committed Oct 30, 2019
commit 81881c331b541d54b3205ff7e560a58b5ea17ba0
5 changes: 4 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/IntervalUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,10 @@ object IntervalUtils {
// Parses a string with nanoseconds, truncates the result and returns microseconds
private def parseNanos(nanosStr: String, isNegative: Boolean): Long = {
if (nanosStr != null) {
val alignedStr = (nanosStr + "000000000").substring(0, 9)
val maxNanosLen = 9
val alignedStr = if (nanosStr.length < maxNanosLen) {
(nanosStr + "000000000").substring(0, maxNanosLen)
} else nanosStr
val nanos = toLongWithRange("nanosecond", alignedStr, 0L, 999999999L)
val micros = nanos / DateTimeUtils.NANOS_PER_MICROS
if (isNegative) -micros else micros
Expand Down