Fix nullability of NewInstance.

apache · Jun 23, 2016 · be6ed48 · be6ed48
1 parent 093a9fa
commit be6ed48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/encoders/RowEncoder.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/encoders/RowEncoder.scala
@@ -122,19 +122,10 @@ object RowEncoder {
     case t @ ArrayType(et, containsNull) => et match {
       case BooleanType | ByteType | ShortType | IntegerType | LongType | FloatType | DoubleType =>
         // TODO: validate input type for primitive array.
-        val nonNullOutput = NewInstance(
+        NewInstance(
           classOf[GenericArrayData],
           inputObject :: Nil,
-          dataType = t,
-          propagateNull = false)
-
-        if (inputObject.nullable) {
-          If(IsNull(inputObject),
-            Literal.create(null, inputType),
-            nonNullOutput)
-        } else {
-          nonNullOutput
-        }
+          dataType = t)
 
       case _ => MapObjects(
         { element =>

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects/objects.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects/objects.scala
@@ -213,7 +213,7 @@ case class NewInstance(
     outerPointer: Option[() => AnyRef]) extends Expression with NonSQLExpression {
   private val className = cls.getName
 
-  override def nullable: Boolean = propagateNull
+  override def nullable: Boolean = propagateNull && arguments.exists(_.nullable)
 
   override def children: Seq[Expression] = arguments
 
@@ -238,7 +238,7 @@ case class NewInstance(
     val outer = outerPointer.map(func => Literal.fromObject(func()).genCode(ctx))
 
     var isNull = ev.isNull
-    val setIsNull = if (propagateNull && arguments.nonEmpty) {
+    val setIsNull = if (nullable) {
       s"final boolean $isNull = ${argGen.map(_.isNull).mkString(" || ")};"
     } else {
       isNull = "false"