Skip to content

[SPARK-4975][SQL] Fix HiveInspectorSuite test failure #3814

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

[SPARK-4975][SQL] Fix HiveInspectorSuite test failure #3814

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72b19a9
fix HiveInspectorSuite test error
scwf Dec 27, 2014
d8531ef
Delete test.log
scwf Dec 27, 2014
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
28 changes: 17 additions & 11 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveInspectorSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]) ::
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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))))
}
}