Skip to content

[SPARK-9167][SQL] use UTC Calendar in stringToDate #7488

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
cloud-fan wants to merge 2 commits into from
Closed

[SPARK-9167][SQL] use UTC Calendar in stringToDate #7488

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
21ef293
fix 2 bugs in datetime
cloud-fan Jul 18, 2015
9cd6005
address comments
cloud-fan Jul 18, 2015
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
9 changes: 5 additions & 4 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 @@ -65,8 +65,8 @@ object DateTimeUtils {
def millisToDays(millisUtc: Long): Int = {
// SPARK-6785: use Math.floor so negative number of days (dates before 1970)
// will correctly work as input for function toJavaDate(Int)
val millisLocal = millisUtc.toDouble + threadLocalLocalTimeZone.get().getOffset(millisUtc)
Math.floor(millisLocal / MILLIS_PER_DAY).toInt
val millisLocal = millisUtc + threadLocalLocalTimeZone.get().getOffset(millisUtc)
Math.floor(millisLocal.toDouble / MILLIS_PER_DAY).toInt
}

// reverse of millisToDays
Expand Down Expand Up @@ -375,8 +375,9 @@ object DateTimeUtils {
segments(2) < 1 || segments(2) > 31) {
return None
}
val c = Calendar.getInstance()
val c = Calendar.getInstance(TimeZone.getTimeZone("GMT"))
c.set(segments(0), segments(1) - 1, segments(2), 0, 0, 0)
Some((c.getTimeInMillis / 1000 / 3600 / 24).toInt)
c.set(Calendar.MILLISECOND, 0)
Some((c.getTimeInMillis / MILLIS_PER_DAY).toInt)
}
}
3 changes: 0 additions & 3 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,6 @@ class CastSuite extends SparkFunSuite with ExpressionEvalHelper {
val nts = sts + ".1"
val ts = Timestamp.valueOf(nts)

val defaultTimeZone = TimeZone.getDefault
TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"))
var c = Calendar.getInstance()
c.set(2015, 2, 8, 2, 30, 0)
checkEvaluation(cast(cast(new Timestamp(c.getTimeInMillis), StringType), TimestampType),
Expand All @@ -291,7 +289,6 @@ class CastSuite extends SparkFunSuite with ExpressionEvalHelper {
c.set(2015, 10, 1, 2, 30, 0)
checkEvaluation(cast(cast(new Timestamp(c.getTimeInMillis), StringType), TimestampType),
c.getTimeInMillis * 1000)
TimeZone.setDefault(defaultTimeZone)

checkEvaluation(cast("abdef", StringType), "abdef")
checkEvaluation(cast("abdef", DecimalType.Unlimited), null)
Expand Down
19 changes: 10 additions & 9 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 @@ -90,34 +90,35 @@ class DateTimeUtilsSuite extends SparkFunSuite {
}

test("string to date") {
val millisPerDay = 1000L * 3600L * 24L
import DateTimeUtils.millisToDays

var c = Calendar.getInstance()
c.set(2015, 0, 28, 0, 0, 0)
c.set(Calendar.MILLISECOND, 0)
assert(DateTimeUtils.stringToDate(UTF8String.fromString("2015-01-28")).get ===
c.getTimeInMillis / millisPerDay)
millisToDays(c.getTimeInMillis))
c.set(2015, 0, 1, 0, 0, 0)
c.set(Calendar.MILLISECOND, 0)
assert(DateTimeUtils.stringToDate(UTF8String.fromString("2015")).get ===
c.getTimeInMillis / millisPerDay)
millisToDays(c.getTimeInMillis))
c = Calendar.getInstance()
c.set(2015, 2, 1, 0, 0, 0)
c.set(Calendar.MILLISECOND, 0)
assert(DateTimeUtils.stringToDate(UTF8String.fromString("2015-03")).get ===
c.getTimeInMillis / millisPerDay)
millisToDays(c.getTimeInMillis))
c = Calendar.getInstance()
c.set(2015, 2, 18, 0, 0, 0)
c.set(Calendar.MILLISECOND, 0)
assert(DateTimeUtils.stringToDate(UTF8String.fromString("2015-03-18")).get ===
c.getTimeInMillis / millisPerDay)
millisToDays(c.getTimeInMillis))
assert(DateTimeUtils.stringToDate(UTF8String.fromString("2015-03-18 ")).get ===
c.getTimeInMillis / millisPerDay)
millisToDays(c.getTimeInMillis))
assert(DateTimeUtils.stringToDate(UTF8String.fromString("2015-03-18 123142")).get ===
c.getTimeInMillis / millisPerDay)
millisToDays(c.getTimeInMillis))
assert(DateTimeUtils.stringToDate(UTF8String.fromString("2015-03-18T123123")).get ===
c.getTimeInMillis / millisPerDay)
millisToDays(c.getTimeInMillis))
assert(DateTimeUtils.stringToDate(UTF8String.fromString("2015-03-18T")).get ===
c.getTimeInMillis / millisPerDay)
millisToDays(c.getTimeInMillis))

assert(DateTimeUtils.stringToDate(UTF8String.fromString("2015-03-18X")).isEmpty)
assert(DateTimeUtils.stringToDate(UTF8String.fromString("2015/03/18")).isEmpty)
Expand Down