Skip to content

[SPARK-19959][SQL] Fix to throw NullPointerException in df[java.lang.Long].collect #17302

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 9 commits into from
Closed

[SPARK-19959][SQL] Fix to throw NullPointerException in df[java.lang.Long].collect #17302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ec6aa50
initial commit
kiszk Mar 15, 2017
2deeba8
fix test failures
kiszk Mar 15, 2017
fd4fc3d
ExternalRDD.apply() set true into nullable if T in RDD[T] is non-prim…
kiszk Mar 19, 2017
e81b0cb
move nullable inference logic to CatalystSerde.generateObjAttr
kiszk Mar 21, 2017
6e3e44d
address review comment
kiszk Mar 21, 2017
d7d0a36
Also check resolution myself
kiszk Mar 21, 2017
0a455be
address review comment
kiszk Mar 22, 2017
299fd68
address review comment for get nullable
kiszk Mar 23, 2017
e1fee6e
addressed review comment
kiszk Mar 23, 2017
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
5 changes: 4 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/object.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ object CatalystSerde {
}

def generateObjAttr[T : Encoder]: Attribute = {
AttributeReference("obj", encoderFor[T].deserializer.dataType, nullable = false)()
val enc = encoderFor[T]
val dataType = enc.deserializer.dataType
val nullable = !enc.clsTag.runtimeClass.isPrimitive
Copy link
Member

@viirya viirya Mar 23, 2017

Choose a reason for hiding this comment

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

Looks good now.

AttributeReference("obj", dataType, nullable)()
}
}

Expand Down
11 changes: 11 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/DataFrameImplicitsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,15 @@ class DataFrameImplicitsSuite extends QueryTest with SharedSQLContext {
sparkContext.parallelize(1 to 10).map(_.toString).toDF("stringCol"),
(1 to 10).map(i => Row(i.toString)))
}

test("SPARK-19959: df[java.lang.Long].collect includes null throws NullPointerException") {
checkAnswer(sparkContext.parallelize(Seq[java.lang.Integer](0, null, 2), 1).toDF,
Seq(Row(0), Row(null), Row(2)))
checkAnswer(sparkContext.parallelize(Seq[java.lang.Long](0L, null, 2L), 1).toDF,
Seq(Row(0L), Row(null), Row(2L)))
checkAnswer(sparkContext.parallelize(Seq[java.lang.Float](0.0F, null, 2.0F), 1).toDF,
Seq(Row(0.0F), Row(null), Row(2.0F)))
checkAnswer(sparkContext.parallelize(Seq[java.lang.Double](0.0D, null, 2.0D), 1).toDF,
Seq(Row(0.0D), Row(null), Row(2.0D)))
}
}