spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marmb...@apache.org
Subject spark git commit: [SPARK-12274][SQL] WrapOption should not have type constraint for child
Date Tue, 15 Dec 2015 00:48:16 GMT
Repository: spark
Updated Branches:
  refs/heads/master fb3778de6 -> 9ea1a8efc


[SPARK-12274][SQL] WrapOption should not have type constraint for child

I think it was a mistake, and we have not catched it so far until https://github.com/apache/spark/pull/10260
which begin to check if the `fromRowExpression` is resolved.

Author: Wenchen Fan <wenchen@databricks.com>

Closes #10263 from cloud-fan/encoder.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9ea1a8ef
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9ea1a8ef
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9ea1a8ef

Branch: refs/heads/master
Commit: 9ea1a8efca7869618c192546ef4e6d94c17689b5
Parents: fb3778d
Author: Wenchen Fan <wenchen@databricks.com>
Authored: Mon Dec 14 16:48:11 2015 -0800
Committer: Michael Armbrust <michael@databricks.com>
Committed: Mon Dec 14 16:48:11 2015 -0800

----------------------------------------------------------------------
 .../org/apache/spark/sql/catalyst/expressions/objects.scala     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/9ea1a8ef/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects.scala
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects.scala
index b2facfd..96bc4fe 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/objects.scala
@@ -296,15 +296,12 @@ case class UnwrapOption(
  * (in the case of reference types) equality with null.
  * @param child The expression to evaluate and wrap.
  */
-case class WrapOption(child: Expression)
-  extends UnaryExpression with ExpectsInputTypes {
+case class WrapOption(child: Expression) extends UnaryExpression {
 
   override def dataType: DataType = ObjectType(classOf[Option[_]])
 
   override def nullable: Boolean = true
 
-  override def inputTypes: Seq[AbstractDataType] = ObjectType :: Nil
-
   override def eval(input: InternalRow): Any =
     throw new UnsupportedOperationException("Only code-generated evaluation is supported")
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message