Skip to content

Commit 2a86d9c

Browse files
committed
Enable special timestamp values by default in DateTimeUtilsSuite and UnsafeArraySuite
1 parent 4f35fad commit 2a86d9c

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/DateTimeUtilsSuite.scala

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class DateTimeUtilsSuite extends SparkFunSuite with Matchers {
3939
val tf = TimestampFormatter.getFractionFormatter(DateTimeUtils.defaultTimeZone.toZoneId)
4040
def checkStringToTimestamp(originalTime: String, expectedParsedTime: String) {
4141
val parsedTimestampOp = DateTimeUtils.stringToTimestamp(
42-
UTF8String.fromString(originalTime), defaultZoneId, false)
42+
UTF8String.fromString(originalTime), defaultZoneId, true)
4343
assert(parsedTimestampOp.isDefined, "timestamp with nanoseconds was not parsed correctly")
4444
assert(DateTimeUtils.timestampToString(tf, parsedTimestampOp.get) === expectedParsedTime)
4545
}
@@ -282,9 +282,9 @@ class DateTimeUtilsSuite extends SparkFunSuite with Matchers {
282282

283283
// Test stringToTimestamp
284284
assert(stringToTimestamp(
285-
UTF8String.fromString("2015-02-29 00:00:00"), defaultZoneId, false).isEmpty)
285+
UTF8String.fromString("2015-02-29 00:00:00"), defaultZoneId, true).isEmpty)
286286
assert(stringToTimestamp(
287-
UTF8String.fromString("2015-04-31 00:00:00"), defaultZoneId, false).isEmpty)
287+
UTF8String.fromString("2015-04-31 00:00:00"), defaultZoneId, true).isEmpty)
288288
assert(toTimestamp("2015-02-29", defaultZoneId).isEmpty)
289289
assert(toTimestamp("2015-04-31", defaultZoneId).isEmpty)
290290
}
@@ -475,15 +475,15 @@ class DateTimeUtilsSuite extends SparkFunSuite with Matchers {
475475
}
476476

477477
val defaultInputTS = DateTimeUtils.stringToTimestamp(
478-
UTF8String.fromString("2015-03-05T09:32:05.359123"), defaultZoneId, false)
478+
UTF8String.fromString("2015-03-05T09:32:05.359123"), defaultZoneId, true)
479479
val defaultInputTS1 = DateTimeUtils.stringToTimestamp(
480-
UTF8String.fromString("2015-03-31T20:32:05.359"), defaultZoneId, false)
480+
UTF8String.fromString("2015-03-31T20:32:05.359"), defaultZoneId, true)
481481
val defaultInputTS2 = DateTimeUtils.stringToTimestamp(
482-
UTF8String.fromString("2015-04-01T02:32:05.359"), defaultZoneId, false)
482+
UTF8String.fromString("2015-04-01T02:32:05.359"), defaultZoneId, true)
483483
val defaultInputTS3 = DateTimeUtils.stringToTimestamp(
484-
UTF8String.fromString("2015-03-30T02:32:05.359"), defaultZoneId, false)
484+
UTF8String.fromString("2015-03-30T02:32:05.359"), defaultZoneId, true)
485485
val defaultInputTS4 = DateTimeUtils.stringToTimestamp(
486-
UTF8String.fromString("2015-03-29T02:32:05.359"), defaultZoneId, false)
486+
UTF8String.fromString("2015-03-29T02:32:05.359"), defaultZoneId, true)
487487

488488
testTrunc(DateTimeUtils.TRUNC_TO_YEAR, "2015-01-01T00:00:00", defaultInputTS.get)
489489
testTrunc(DateTimeUtils.TRUNC_TO_MONTH, "2015-03-01T00:00:00", defaultInputTS.get)
@@ -508,17 +508,17 @@ class DateTimeUtilsSuite extends SparkFunSuite with Matchers {
508508
for (tz <- ALL_TIMEZONES) {
509509
withDefaultTimeZone(tz) {
510510
val inputTS = DateTimeUtils.stringToTimestamp(
511-
UTF8String.fromString("2015-03-05T09:32:05.359"), defaultZoneId, false)
511+
UTF8String.fromString("2015-03-05T09:32:05.359"), defaultZoneId, true)
512512
val inputTS1 = DateTimeUtils.stringToTimestamp(
513-
UTF8String.fromString("2015-03-31T20:32:05.359"), defaultZoneId, false)
513+
UTF8String.fromString("2015-03-31T20:32:05.359"), defaultZoneId, true)
514514
val inputTS2 = DateTimeUtils.stringToTimestamp(
515-
UTF8String.fromString("2015-04-01T02:32:05.359"), defaultZoneId, false)
515+
UTF8String.fromString("2015-04-01T02:32:05.359"), defaultZoneId, true)
516516
val inputTS3 = DateTimeUtils.stringToTimestamp(
517-
UTF8String.fromString("2015-03-30T02:32:05.359"), defaultZoneId, false)
517+
UTF8String.fromString("2015-03-30T02:32:05.359"), defaultZoneId, true)
518518
val inputTS4 = DateTimeUtils.stringToTimestamp(
519-
UTF8String.fromString("2015-03-29T02:32:05.359"), defaultZoneId, false)
519+
UTF8String.fromString("2015-03-29T02:32:05.359"), defaultZoneId, true)
520520
val inputTS5 = DateTimeUtils.stringToTimestamp(
521-
UTF8String.fromString("1999-03-29T01:02:03.456789"), defaultZoneId, false)
521+
UTF8String.fromString("1999-03-29T01:02:03.456789"), defaultZoneId, true)
522522

523523
testTrunc(DateTimeUtils.TRUNC_TO_YEAR, "2015-01-01T00:00:00", inputTS.get, tz)
524524
testTrunc(DateTimeUtils.TRUNC_TO_MONTH, "2015-03-01T00:00:00", inputTS.get, tz)

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/UnsafeArraySuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ class UnsafeArraySuite extends SparkFunSuite {
4343
private def defaultZoneId = ZoneId.systemDefault()
4444
val timestampArray = Array(
4545
DateTimeUtils.stringToTimestamp(
46-
UTF8String.fromString("1970-1-1 00:00:00"), defaultZoneId, false).get,
46+
UTF8String.fromString("1970-1-1 00:00:00"), defaultZoneId, true).get,
4747
DateTimeUtils.stringToTimestamp(
48-
UTF8String.fromString("2016-7-26 00:00:00"), defaultZoneId, false).get)
48+
UTF8String.fromString("2016-7-26 00:00:00"), defaultZoneId, true).get)
4949
val decimalArray4_1 = Array(
5050
BigDecimal("123.4").setScale(1, BigDecimal.RoundingMode.FLOOR),
5151
BigDecimal("567.8").setScale(1, BigDecimal.RoundingMode.FLOOR))

0 commit comments

Comments
 (0)