Skip to content

[SPARK-12445][SQL] Fix NullPointerException when passing null as array #10401

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

[SPARK-12445][SQL] Fix NullPointerException when passing null as array #10401

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
086bf00
Fix null exception when passing null as array.
viirya Dec 20, 2015
296196e
Move test case.
viirya Dec 22, 2015
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
11 changes: 7 additions & 4 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,10 +407,13 @@ object ScalaReflection extends ScalaReflection {
val externalDataType = dataTypeFor(elementType)
val Schema(catalystType, nullable) = silentSchemaFor(elementType)
if (isNativeType(catalystType)) {
NewInstance(
classOf[GenericArrayData],
input :: Nil,
dataType = ArrayType(catalystType, nullable))
expressions.If(
IsNull(input),
expressions.Literal.create(null, ArrayType(catalystType, nullable)),
NewInstance(
classOf[GenericArrayData],
input :: Nil,
dataType = ArrayType(catalystType, nullable)))

@cloud-fan cloud-fan Dec 28, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A simple idea is to set propafateNull = true for NewInstance, and it's also fixed in #10443 which makes false as default value for propagateNull.

@viirya viirya Dec 28, 2015

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok. I think this can be closed.

@viirya viirya Dec 28, 2015

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will #10443 be merged soon? I think I have another pr depending this fixing.

} else {
val clsName = getClassNameFromType(elementType)
val newPath = s"""- array element class: "$clsName"""" +: walkedTypePath
Expand Down
25 changes: 25 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/ScalaReflectionRelationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ package org.apache.spark.sql
import java.sql.{Date, Timestamp}

import org.apache.spark.SparkFunSuite
import org.apache.spark.sql.catalyst.ScalaReflection
import org.apache.spark.sql.catalyst.encoders._
import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder
import org.apache.spark.sql.catalyst.expressions.UnsafeRow
import org.apache.spark.sql.catalyst.plans.logical.LocalRelation
import org.apache.spark.sql.types.StructType
import org.apache.spark.sql.test.SharedSQLContext

case class ReflectData(
Expand Down Expand Up @@ -138,4 +144,23 @@ class ScalaReflectionRelationSuite extends SparkFunSuite with SharedSQLContext {
Map(10 -> 100L, 20 -> 200L, 30 -> null),
Row(null, "abc"))))
}

test("null as array") {

@marmbrus marmbrus Dec 22, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this test be done with the encoder tests?

val data = Seq(
(Array[Int](2, 1, 3), Array("b", "c", "a")),
(Array[Int](), Array[String]()),
(null, null)
)

val schema = ScalaReflection.schemaFor[Tuple2[Array[Int], Array[String]]]
.dataType.asInstanceOf[StructType]
val attributeSeq = schema.toAttributes
val arrayDataEncoder = encoderFor[Tuple2[Array[Int], Array[String]]]
val unsafeRows = data.map(arrayDataEncoder.toRow(_).copy())
val df = DataFrame(sqlContext, LocalRelation(attributeSeq, unsafeRows))
assert(df.collect() === Seq(
Row(Seq(2, 1, 3), Seq("b", "c", "a")),
Row(Seq[Int](), Seq[String]()),
Row(null, null)))
}
}