Skip to content

[SPARK-35679][SQL] instantToMicros overflow #32839

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
dgd-contributor wants to merge 7 commits into from
Closed

[SPARK-35679][SQL] instantToMicros overflow #32839

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
249d299
[SPARK-35679][SQL] instantToMicro overflow
dchvn Jun 9, 2021
1efb2d3
Update condition
dchvn Jun 9, 2021
0a6963e
Update
dchvn Jun 9, 2021
377be9e
Update approach from durationToMicro
dchvn Jun 9, 2021
8f008a8
constant value for Math.floorDiv
dchvn Jun 10, 2021
bcf67ac
update
dchvn Jun 10, 2021
134c356
Update constant
dchvn Jun 10, 2021
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
13 changes: 10 additions & 3 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,16 @@ object DateTimeUtils {
* microseconds where microsecond 0 is 1970-01-01 00:00:00Z.
*/
def instantToMicros(instant: Instant): Long = {
val us = Math.multiplyExact(instant.getEpochSecond, MICROS_PER_SECOND)
val result = Math.addExact(us, NANOSECONDS.toMicros(instant.getNano))
result
val secs = instant.getEpochSecond
if (secs == Math.floorDiv(Long.MinValue, MICROS_PER_SECOND)) {
Comment thread
dgd-contributor marked this conversation as resolved.
Outdated
val us = Math.multiplyExact(secs + 1, MICROS_PER_SECOND)
Comment thread
dgd-contributor marked this conversation as resolved.
val result = Math.addExact(us, NANOSECONDS.toMicros(instant.getNano) - MICROS_PER_SECOND)
Comment thread
dgd-contributor marked this conversation as resolved.
Outdated
result
} else {
val us = Math.multiplyExact(secs, MICROS_PER_SECOND)
val result = Math.addExact(us, NANOSECONDS.toMicros(instant.getNano))
result
Comment thread
dgd-contributor marked this conversation as resolved.
Outdated
}
}

/**
Expand Down
5 changes: 5 additions & 0 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,4 +820,9 @@ class DateTimeUtilsSuite extends SparkFunSuite with Matchers with SQLHelper {
}
}
}

test("SPARK-35679: instantToMicros should be able to return microseconds of Long.MinValue") {
assert(instantToMicros(microsToInstant(Long.MaxValue)) === Long.MaxValue)
assert(instantToMicros(microsToInstant(Long.MinValue)) === Long.MinValue)
}
}