Skip to content
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

[SPARK-10197] [SQL] Add null check in wrapperFor (inside HiveInspectors). #8407

Closed
wants to merge 1 commit into from
Closed

[SPARK-10197] [SQL] Add null check in wrapperFor (inside HiveInspectors). #8407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 24 additions & 5 deletions sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,17 +370,36 @@ private[hive] trait HiveInspectors {
protected def wrapperFor(oi: ObjectInspector, dataType: DataType): Any => Any = oi match {
case _: JavaHiveVarcharObjectInspector =>
(o: Any) =>
val s = o.asInstanceOf[UTF8String].toString
new HiveVarchar(s, s.size)
if (o != null) {
val s = o.asInstanceOf[UTF8String].toString
new HiveVarchar(s, s.size)
} else {
null
}

case _: JavaHiveDecimalObjectInspector =>
(o: Any) => HiveDecimal.create(o.asInstanceOf[Decimal].toJavaBigDecimal)
(o: Any) =>
if (o != null) {
HiveDecimal.create(o.asInstanceOf[Decimal].toJavaBigDecimal)
} else {
null
}

case _: JavaDateObjectInspector =>
(o: Any) => DateTimeUtils.toJavaDate(o.asInstanceOf[Int])
(o: Any) =>
if (o != null) {
DateTimeUtils.toJavaDate(o.asInstanceOf[Int])
} else {
null
}

case _: JavaTimestampObjectInspector =>
(o: Any) => DateTimeUtils.toJavaTimestamp(o.asInstanceOf[Long])
(o: Any) =>
if (o != null) {
DateTimeUtils.toJavaTimestamp(o.asInstanceOf[Long])
} else {
null
}

case soi: StandardStructObjectInspector =>
val schema = dataType.asInstanceOf[StructType]
Expand Down
29 changes: 29 additions & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/OrcSourceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,35 @@ abstract class OrcSuite extends QueryTest with BeforeAndAfterAll {
sql("SELECT * FROM normal_orc_as_source"),
(6 to 10).map(i => Row(i, s"part-$i")))
}

test("write null values") {
sql("DROP TABLE IF EXISTS orcNullValues")

val df = sql(
"""
|SELECT
| CAST(null as TINYINT),
| CAST(null as SMALLINT),
| CAST(null as INT),
| CAST(null as BIGINT),
| CAST(null as FLOAT),
| CAST(null as DOUBLE),
| CAST(null as DECIMAL(7,2)),
| CAST(null as TIMESTAMP),
| CAST(null as DATE),
| CAST(null as STRING),
| CAST(null as VARCHAR(10))
|FROM orc_temp_table limit 1
""".stripMargin)

df.write.format("orc").saveAsTable("orcNullValues")

checkAnswer(
sql("SELECT * FROM orcNullValues"),
Row.fromSeq(Seq.fill(11)(null)))

sql("DROP TABLE IF EXISTS orcNullValues")
}
}

class OrcSourceSuite extends OrcSuite {
Expand Down