Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7A5181820D for ; Tue, 15 Dec 2015 00:48:16 +0000 (UTC) Received: (qmail 39467 invoked by uid 500); 15 Dec 2015 00:48:16 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 39428 invoked by uid 500); 15 Dec 2015 00:48:16 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 39418 invoked by uid 99); 15 Dec 2015 00:48:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Dec 2015 00:48:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2CF08E09AF; Tue, 15 Dec 2015 00:48:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marmbrus@apache.org To: commits@spark.apache.org Message-Id: <0183273c168e4896986070dd2e1fa501@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [SPARK-12274][SQL] WrapOption should not have type constraint for child Date: Tue, 15 Dec 2015 00:48:16 +0000 (UTC) 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 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 Authored: Mon Dec 14 16:48:11 2015 -0800 Committer: Michael Armbrust 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