Skip to content

[SPARK-3447][SQL] Remove explicit conversion with JListWrapper to avoid NPE #2323

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

[SPARK-3447][SQL] Remove explicit conversion with JListWrapper to avoid NPE #2323

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59065bc
Remove explicit conversion to avoid NPE
marmbrus Sep 8, 2014
646976b
Fix JSON RDD Conversion too
marmbrus Sep 10, 2014
4d4d93c
Merge remote-tracking branch 'origin/master' into kryoJListNPE
marmbrus Sep 11, 2014
9634f11
Rollback JSON RDD changes
marmbrus Sep 11, 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
4 changes: 1 addition & 3 deletions sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,6 @@ class SQLContext(@transient val sparkContext: SparkContext)
rdd: RDD[Array[Any]],
schema: StructType): SchemaRDD = {
import scala.collection.JavaConversions._
import scala.collection.convert.Wrappers.{JListWrapper, JMapWrapper}

def needsConversion(dataType: DataType): Boolean = dataType match {
case ByteType => true
Expand All @@ -482,8 +481,7 @@ class SQLContext(@transient val sparkContext: SparkContext)
case (null, _) => null

case (c: java.util.List[_], ArrayType(elementType, _)) =>
val converted = c.map { e => convert(e, elementType)}
JListWrapper(converted)
c.map { e => convert(e, elementType)}: Seq[Any]

case (c, ArrayType(elementType, _)) if c.getClass.isArray =>
c.asInstanceOf[Array[_]].map(e => convert(e, elementType)): Seq[Any]
Expand Down