Skip to content

Commit d47a25f

Browse files
MaxGekksrowen
authored andcommitted
[SPARK-25670][TEST] Reduce number of tested timezones in JsonExpressionsSuite
## What changes were proposed in this pull request? After the changes, total execution time of `JsonExpressionsSuite.scala` dropped from 12.5 seconds to 3 seconds. Closes #22657 from MaxGekk/json-timezone-test. Authored-by: Maxim Gekk <maxim.gekk@databricks.com> Signed-off-by: Sean Owen <sean.owen@databricks.com>
1 parent 3494b12 commit d47a25f

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/JsonExpressionsSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import org.apache.spark.SparkFunSuite
2323
import org.apache.spark.sql.catalyst.InternalRow
2424
import org.apache.spark.sql.catalyst.errors.TreeNodeException
2525
import org.apache.spark.sql.catalyst.plans.PlanTestBase
26-
import org.apache.spark.sql.catalyst.util.{ArrayBasedMapData, DateTimeTestUtils, DateTimeUtils, GenericArrayData, PermissiveMode}
26+
import org.apache.spark.sql.catalyst.util._
2727
import org.apache.spark.sql.internal.SQLConf
2828
import org.apache.spark.sql.types._
2929
import org.apache.spark.unsafe.types.UTF8String
@@ -510,7 +510,7 @@ class JsonExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper with
510510
)
511511

512512
val jsonData2 = """{"t": "2016-01-01T00:00:00"}"""
513-
for (tz <- DateTimeTestUtils.ALL_TIMEZONES) {
513+
for (tz <- DateTimeTestUtils.outstandingTimezones) {
514514
c = Calendar.getInstance(tz)
515515
c.set(2016, 0, 1, 0, 0, 0)
516516
c.set(Calendar.MILLISECOND, 0)

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@ object DateTimeTestUtils {
2626

2727
val ALL_TIMEZONES: Seq[TimeZone] = TimeZone.getAvailableIDs.toSeq.map(TimeZone.getTimeZone)
2828

29+
val outstandingTimezones: Seq[TimeZone] = Seq(
30+
"UTC",
31+
"PST",
32+
"CET",
33+
"Africa/Dakar",
34+
"America/Los_Angeles",
35+
"Antarctica/Vostok",
36+
"Asia/Hong_Kong",
37+
"Europe/Amsterdam").map(TimeZone.getTimeZone)
38+
2939
def withDefaultTimeZone[T](newDefaultTimeZone: TimeZone)(block: => T): T = {
3040
val originalDefaultTimeZone = TimeZone.getDefault
3141
try {

0 commit comments

Comments
 (0)