Skip to content

[SPARK-31439][SQL] Fix perf regression of fromJavaDate #28205

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 13 commits into from
Closed

[SPARK-31439][SQL] Fix perf regression of fromJavaDate #28205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eb06e2c
Optimise fromJavaDate
MaxGekk Apr 12, 2020
44caa4a
Benchmark fromJavaDate
MaxGekk Apr 12, 2020
af70cdc
Re-gen DateTimeRebaseBenchmark results on JDK 8
MaxGekk Apr 12, 2020
2b2e1c7
Re-gen DateTimeBenchmark results on JDK 8
MaxGekk Apr 12, 2020
84c7010
Re-gen DateTimeBenchmark results on JDK 11
MaxGekk Apr 13, 2020
9b66846
Merge remote-tracking branch 'origin/master' into optimize-fromJavaDate
MaxGekk Apr 13, 2020
b174c1a
Re-gen DateTimeBenchmark results on JDK 8
MaxGekk Apr 13, 2020
e6b514f
Change benchmark title
MaxGekk Apr 13, 2020
bcc8559
Re-gen DateTimeBenchmark results on JDK 8
MaxGekk Apr 13, 2020
bc8110b
Re-gen DateTimeBenchmark results on JDK 11
MaxGekk Apr 13, 2020
f6ba8e6
Merge remote-tracking branch 'origin/master' into optimize-fromJavaDate
MaxGekk Apr 14, 2020
037b22e
Re-gen DateTimeBenchmark results on JDK 11
MaxGekk Apr 14, 2020
ee1d788
Re-gen DateTimeBenchmark results on JDK 8
MaxGekk Apr 14, 2020
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
14 changes: 4 additions & 10 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 @@ -101,16 +101,10 @@ object DateTimeUtils {
* @return The number of days since epoch from java.sql.Date.
*/
def fromJavaDate(date: Date): SQLDate = {
val era = if (date.before(julianCommonEraStart)) 0 else 1
val localDate = LocalDate
.of(date.getYear + 1900, date.getMonth + 1, 1)
.`with`(ChronoField.ERA, era)
// Add days separately to convert dates existed in Julian calendar but not
// in Proleptic Gregorian calendar. For example, 1000-02-29 is valid date
// in Julian calendar because 1000 is a leap year but 1000 is not a leap
// year in Proleptic Gregorian calendar. And 1000-02-29 doesn't exist in it.
.plusDays(date.getDate - 1) // Returns the next valid date after `date.getDate - 1` days
localDateToDays(localDate)
val millisUtc = date.getTime
val millisLocal = millisUtc + TimeZone.getDefault.getOffset(millisUtc)
val julianDays = Math.toIntExact(Math.floorDiv(millisLocal, MILLIS_PER_DAY))
Copy link
Member Author

@MaxGekk MaxGekk Apr 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cloud-fan Spark 2.4 uses floating point ops, see https://github.com/apache/spark/blob/branch-2.4/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/DateTimeUtils.scala#L137

rebaseJulianToGregorianDays(julianDays)
}

/**
Expand Down
Loading