diff options
| author | Renat Yusupov <re.yusupov@2gis.ru> | 2014-10-05 17:56:24 -0700 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2014-10-05 17:56:34 -0700 |
| commit | 90897ea5f24b03c9f3455a62c7f68b3d3f0435ad (patch) | |
| tree | ec2120eb11bb340cf434aae0d50fe635f2b0a403 /sql/catalyst/src/main/scala/org/apache | |
| parent | 34b97a067d1b370fbed8ecafab2f48501a35d783 (diff) | |
| download | spark-90897ea5f24b03c9f3455a62c7f68b3d3f0435ad.tar.gz spark-90897ea5f24b03c9f3455a62c7f68b3d3f0435ad.tar.bz2 spark-90897ea5f24b03c9f3455a62c7f68b3d3f0435ad.zip | |
[SPARK-3776][SQL] Wrong conversion to Catalyst for Option[Product]
Author: Renat Yusupov <re.yusupov@2gis.ru>
Closes #2641 from r3natko/feature/catalyst_option and squashes the following commits:
55d0c06 [Renat Yusupov] [SQL] SPARK-3776: Wrong conversion to Catalyst for Option[Product]
Diffstat (limited to 'sql/catalyst/src/main/scala/org/apache')
| -rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala index 88a8fa7c28..b3ae8e6779 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala @@ -33,7 +33,7 @@ object ScalaReflection { /** Converts Scala objects to catalyst rows / types */ def convertToCatalyst(a: Any): Any = a match { - case o: Option[_] => o.orNull + case o: Option[_] => o.map(convertToCatalyst).orNull case s: Seq[_] => s.map(convertToCatalyst) case m: Map[_, _] => m.map { case (k, v) => convertToCatalyst(k) -> convertToCatalyst(v) } case p: Product => new GenericRow(p.productIterator.map(convertToCatalyst).toArray) |