From bebb0240e6ece6ec7c79bdd62098529146fcb0c0 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Sat, 23 Apr 2016 16:39:35 -0700 Subject: [MINOR] [SQL] Fix error message string in nullSafeEvel of TernaryExpression ## What changes were proposed in this pull request? TernaryExpressions should thows proper error message for itself. ```scala protected def nullSafeEval(input1: Any, input2: Any, input3: Any): Any = - sys.error(s"BinaryExpressions must override either eval or nullSafeEval") + sys.error(s"TernaryExpressions must override either eval or nullSafeEval") ``` ## How was this patch tested? Manual. Author: Dongjoon Hyun Closes #12642 from dongjoon-hyun/minor_fix_error_msg_in_ternaryexpression. --- .../scala/org/apache/spark/sql/catalyst/expressions/Expression.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql') diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Expression.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Expression.scala index 7dacdafb71..c26faee2f4 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Expression.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Expression.scala @@ -45,6 +45,7 @@ import org.apache.spark.sql.types._ * - [[LeafExpression]]: an expression that has no child. * - [[UnaryExpression]]: an expression that has one child. * - [[BinaryExpression]]: an expression that has two children. + * - [[TernaryExpression]]: an expression that has three children. * - [[BinaryOperator]]: a special case of [[BinaryExpression]] that requires two children to have * the same output data type. * @@ -531,7 +532,7 @@ abstract class TernaryExpression extends Expression { * of evaluation process, we should override [[eval]]. */ protected def nullSafeEval(input1: Any, input2: Any, input3: Any): Any = - sys.error(s"BinaryExpressions must override either eval or nullSafeEval") + sys.error(s"TernaryExpressions must override either eval or nullSafeEval") /** * Short hand for generating ternary evaluation code. -- cgit v1.2.3