diff options
| author | Michael Armbrust <michael@databricks.com> | 2014-09-10 20:59:40 -0700 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2014-09-10 20:59:40 -0700 |
| commit | f92cde24e8f30dddd5bcec71bb3687498c1406da (patch) | |
| tree | 3766d785e288d71dc2e2278a4bdab4ba52e03d33 | |
| parent | 84e2c8bfe41837baf2aeffa9741e4dbd14351981 (diff) | |
| download | spark-f92cde24e8f30dddd5bcec71bb3687498c1406da.tar.gz spark-f92cde24e8f30dddd5bcec71bb3687498c1406da.tar.bz2 spark-f92cde24e8f30dddd5bcec71bb3687498c1406da.zip | |
[SPARK-3447][SQL] Remove explicit conversion with JListWrapper to avoid NPE
Author: Michael Armbrust <michael@databricks.com>
Closes #2323 from marmbrus/kryoJListNPE and squashes the following commits:
9634f11 [Michael Armbrust] Rollback JSON RDD changes
4d4d93c [Michael Armbrust] Merge remote-tracking branch 'origin/master' into kryoJListNPE
646976b [Michael Armbrust] Fix JSON RDD Conversion too
59065bc [Michael Armbrust] Remove explicit conversion to avoid NPE
| -rw-r--r-- | sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala index a2f334aab9..c551c7c987 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala @@ -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 @@ -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] |