You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/08/12 05:18:09 UTC
git commit: [SPARK-2968][SQL] Fix nullabilities of Explode.
Repository: spark
Updated Branches:
refs/heads/master c9c89c31b -> c686b7dd4
[SPARK-2968][SQL] Fix nullabilities of Explode.
Output nullabilities of `Explode` could be detemined by `ArrayType.containsNull` or `MapType.valueContainsNull`.
Author: Takuya UESHIN <ue...@happy-camper.st>
Closes #1888 from ueshin/issues/SPARK-2968 and squashes the following commits:
d128c95 [Takuya UESHIN] Fix nullability of Explode.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c686b7dd
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c686b7dd
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c686b7dd
Branch: refs/heads/master
Commit: c686b7dd4668b5e9fc3177f15edeae3446d2e634
Parents: c9c89c3
Author: Takuya UESHIN <ue...@happy-camper.st>
Authored: Mon Aug 11 20:18:03 2014 -0700
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Mon Aug 11 20:18:03 2014 -0700
----------------------------------------------------------------------
.../apache/spark/sql/catalyst/expressions/generators.scala | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/c686b7dd/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/generators.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/generators.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/generators.scala
index 3d41acb..e99c5b4 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/generators.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/generators.scala
@@ -86,19 +86,19 @@ case class Explode(attributeNames: Seq[String], child: Expression)
(child.dataType.isInstanceOf[ArrayType] || child.dataType.isInstanceOf[MapType])
private lazy val elementTypes = child.dataType match {
- case ArrayType(et, _) => et :: Nil
- case MapType(kt,vt, _) => kt :: vt :: Nil
+ case ArrayType(et, containsNull) => (et, containsNull) :: Nil
+ case MapType(kt, vt, valueContainsNull) => (kt, false) :: (vt, valueContainsNull) :: Nil
}
// TODO: Move this pattern into Generator.
protected def makeOutput() =
if (attributeNames.size == elementTypes.size) {
attributeNames.zip(elementTypes).map {
- case (n, t) => AttributeReference(n, t, nullable = true)()
+ case (n, (t, nullable)) => AttributeReference(n, t, nullable)()
}
} else {
elementTypes.zipWithIndex.map {
- case (t, i) => AttributeReference(s"c_$i", t, nullable = true)()
+ case ((t, nullable), i) => AttributeReference(s"c_$i", t, nullable)()
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org