aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscwf <wangfei1@huawei.com>2014-12-30 11:30:47 -0800
committerMichael Armbrust <michael@databricks.com>2014-12-30 11:30:47 -0800
commit65357f11c25a7c91577df5da31ebf349d7845eef (patch)
treeaa3ab9f535e69171b2846239ec4148d6a79ba082
parent94d60b7021960dc10d98039dbc6ad7193e8557f5 (diff)
downloadspark-65357f11c25a7c91577df5da31ebf349d7845eef.tar.gz
spark-65357f11c25a7c91577df5da31ebf349d7845eef.tar.bz2
spark-65357f11c25a7c91577df5da31ebf349d7845eef.zip
[SPARK-4975][SQL] Fix HiveInspectorSuite test failure
HiveInspectorSuite test failureļ¼š [info] - wrap / unwrap null, constant null and writables *** FAILED *** (21 milliseconds) [info] 1 did not equal 0 (HiveInspectorSuite.scala:136) this is because the origin date(is 3914-10-23) not equals the date returned by ```unwrap```(is 3914-10-22). Setting TimeZone and Locale fix this. Another minor change here is rename ```def checkValues(v1: Any, v2: Any): Unit``` to ```def checkValue(v1: Any, v2: Any): Unit ``` to make the code more clear Author: scwf <wangfei1@huawei.com> Author: Fei Wang <wangfei1@huawei.com> Closes #3814 from scwf/fix-inspectorsuite and squashes the following commits: d8531ef [Fei Wang] Delete test.log 72b19a9 [scwf] fix HiveInspectorSuite test error
-rw-r--r--sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveInspectorSuite.scala28
1 files changed, 17 insertions, 11 deletions
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveInspectorSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveInspectorSuite.scala
index bfe608a51a..f90d360791 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveInspectorSuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveInspectorSuite.scala
@@ -19,6 +19,7 @@ package org.apache.spark.sql.hive
import java.sql.Date
import java.util
+import java.util.{Locale, TimeZone}
import org.apache.hadoop.hive.serde2.io.DoubleWritable
import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory
@@ -63,6 +64,11 @@ class HiveInspectorSuite extends FunSuite with HiveInspectors {
.get())
}
+ // Timezone is fixed to America/Los_Angeles for those timezone sensitive tests (timestamp_*)
+ TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"))
+ // Add Locale setting
+ Locale.setDefault(Locale.US)
+
val data =
Literal(true) ::
Literal(0.asInstanceOf[Byte]) ::
@@ -121,11 +127,11 @@ class HiveInspectorSuite extends FunSuite with HiveInspectors {
def checkValues(row1: Seq[Any], row2: Seq[Any]): Unit = {
row1.zip(row2).map {
- case (r1, r2) => checkValues(r1, r2)
+ case (r1, r2) => checkValue(r1, r2)
}
}
- def checkValues(v1: Any, v2: Any): Unit = {
+ def checkValue(v1: Any, v2: Any): Unit = {
(v1, v2) match {
case (r1: Decimal, r2: Decimal) =>
// Ignore the Decimal precision
@@ -195,26 +201,26 @@ class HiveInspectorSuite extends FunSuite with HiveInspectors {
})
checkValues(row, unwrap(wrap(row, toInspector(dt)), toInspector(dt)).asInstanceOf[Row])
- checkValues(null, unwrap(wrap(null, toInspector(dt)), toInspector(dt)))
+ checkValue(null, unwrap(wrap(null, toInspector(dt)), toInspector(dt)))
}
test("wrap / unwrap Array Type") {
val dt = ArrayType(dataTypes(0))
val d = row(0) :: row(0) :: Nil
- checkValues(d, unwrap(wrap(d, toInspector(dt)), toInspector(dt)))
- checkValues(null, unwrap(wrap(null, toInspector(dt)), toInspector(dt)))
- checkValues(d, unwrap(wrap(d, toInspector(Literal(d, dt))), toInspector(Literal(d, dt))))
- checkValues(d, unwrap(wrap(null, toInspector(Literal(d, dt))), toInspector(Literal(d, dt))))
+ checkValue(d, unwrap(wrap(d, toInspector(dt)), toInspector(dt)))
+ checkValue(null, unwrap(wrap(null, toInspector(dt)), toInspector(dt)))
+ checkValue(d, unwrap(wrap(d, toInspector(Literal(d, dt))), toInspector(Literal(d, dt))))
+ checkValue(d, unwrap(wrap(null, toInspector(Literal(d, dt))), toInspector(Literal(d, dt))))
}
test("wrap / unwrap Map Type") {
val dt = MapType(dataTypes(0), dataTypes(1))
val d = Map(row(0) -> row(1))
- checkValues(d, unwrap(wrap(d, toInspector(dt)), toInspector(dt)))
- checkValues(null, unwrap(wrap(null, toInspector(dt)), toInspector(dt)))
- checkValues(d, unwrap(wrap(d, toInspector(Literal(d, dt))), toInspector(Literal(d, dt))))
- checkValues(d, unwrap(wrap(null, toInspector(Literal(d, dt))), toInspector(Literal(d, dt))))
+ checkValue(d, unwrap(wrap(d, toInspector(dt)), toInspector(dt)))
+ checkValue(null, unwrap(wrap(null, toInspector(dt)), toInspector(dt)))
+ checkValue(d, unwrap(wrap(d, toInspector(Literal(d, dt))), toInspector(Literal(d, dt))))
+ checkValue(d, unwrap(wrap(null, toInspector(Literal(d, dt))), toInspector(Literal(d, dt))))
}
}