aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorluogankun <luogankun@gmail.com>2014-08-27 15:08:22 -0700
committerMichael Armbrust <michael@databricks.com>2014-08-27 15:08:22 -0700
commit65253502b913f390b26b9b631380b2c6cf1ccdf7 (patch)
tree2042fbd8cd701a57c0668f25b8b683cc23017a22 /sql
parentcc275f4b7910f6d0ad266a43bac2fdae58e9739e (diff)
downloadspark-65253502b913f390b26b9b631380b2c6cf1ccdf7.tar.gz
spark-65253502b913f390b26b9b631380b2c6cf1ccdf7.tar.bz2
spark-65253502b913f390b26b9b631380b2c6cf1ccdf7.zip
[SPARK-3065][SQL] Add locale setting to fix results do not match for udf_unix_timestamp format "yyyy MMM dd h:mm:ss a" run with not "America/Los_Angeles" TimeZone in HiveCompatibilitySuite
When run the udf_unix_timestamp of org.apache.spark.sql.hive.execution.HiveCompatibilitySuite testcase with not "America/Los_Angeles" TimeZone throws error. [https://issues.apache.org/jira/browse/SPARK-3065] add locale setting on beforeAll and afterAll method to fix the bug of HiveCompatibilitySuite testcase Author: luogankun <luogankun@gmail.com> Closes #1968 from luogankun/SPARK-3065 and squashes the following commits: c167832 [luogankun] [SPARK-3065][SQL] Add Locale setting to HiveCompatibilitySuite 0a25e3a [luogankun] [SPARK-3065][SQL] Add Locale setting to HiveCompatibilitySuite
Diffstat (limited to 'sql')
-rw-r--r--sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala8
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala
index 7a69e3c512..035fd3214b 100644
--- a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala
+++ b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala
@@ -18,7 +18,7 @@
package org.apache.spark.sql.hive.execution
import java.io.File
-import java.util.TimeZone
+import java.util.{Locale, TimeZone}
import org.scalatest.BeforeAndAfter
@@ -33,6 +33,7 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter {
File.separator + "test" + File.separator + "queries" + File.separator + "clientpositive")
var originalTimeZone: TimeZone = _
+ var originalLocale: Locale = _
def testCases = hiveQueryDir.listFiles.map(f => f.getName.stripSuffix(".q") -> f)
@@ -41,11 +42,16 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter {
// Timezone is fixed to America/Los_Angeles for those timezone sensitive tests (timestamp_*)
originalTimeZone = TimeZone.getDefault
TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"))
+
+ // Add Locale setting
+ originalLocale = Locale.getDefault
+ Locale.setDefault(Locale.US)
}
override def afterAll() {
TestHive.cacheTables = false
TimeZone.setDefault(originalTimeZone)
+ Locale.setDefault(originalLocale)
}
/** A list of tests deemed out of scope currently and thus completely disregarded. */