Github user rxin commented on a diff in the pull request:
https://github.com/apache/spark/pull/6405#discussion_r31301678
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala
---
@@ -17,72 +17,88 @@
package org.apache.spark.sql.catalyst.expressions
-import org.apache.spark.sql.catalyst.analysis.UnresolvedException
-import org.apache.spark.sql.catalyst.errors.TreeNodeException
+import org.apache.spark.sql.catalyst.analysis.TypeCheckResult
+import org.apache.spark.sql.catalyst.util.TypeUtils
import org.apache.spark.sql.types._
-case class UnaryMinus(child: Expression) extends UnaryExpression {
+abstract class UnaryArithmetic extends UnaryExpression {
+ self: Product =>
- override def dataType: DataType = child.dataType
override def foldable: Boolean = child.foldable
override def nullable: Boolean = child.nullable
- override def toString: String = s"-$child"
-
- lazy val numeric = dataType match {
- case n: NumericType => n.numeric.asInstanceOf[Numeric[Any]]
- case other => sys.error(s"Type $other does not support numeric
operations")
- }
+ override def dataType: DataType = child.dataType
override def eval(input: Row): Any = {
val evalE = child.eval(input)
if (evalE == null) {
null
} else {
- numeric.negate(evalE)
+ evalInternal(evalE)
}
}
+
+ protected def evalInternal(evalE: Any): Any =
+ sys.error(s"UnaryArithmetics must either override eval or
evalInternal")
}
-case class Sqrt(child: Expression) extends UnaryExpression {
+case class UnaryMinus(child: Expression) extends UnaryArithmetic {
+ override def toString: String = s"-$child"
+
+ override def checkInputDataTypes(): TypeCheckResult =
+ TypeUtils.checkForNumericExpr(child.dataType, "operator -")
+ private lazy val numeric = TypeUtils.getNumeric(dataType)
+
+ protected override def evalInternal(evalE: Any) = numeric.negate(evalE)
+}
+
+case class Sqrt(child: Expression) extends UnaryArithmetic {
override def dataType: DataType = DoubleType
- override def foldable: Boolean = child.foldable
override def nullable: Boolean = true
override def toString: String = s"SQRT($child)"
- lazy val numeric = child.dataType match {
- case n: NumericType => n.numeric.asInstanceOf[Numeric[Any]]
- case other => sys.error(s"Type $other does not support non-negative
numeric operations")
- }
+ override def checkInputDataTypes(): TypeCheckResult =
+ TypeUtils.checkForNumericExpr(child.dataType, "function sqrt")
- override def eval(input: Row): Any = {
- val evalE = child.eval(input)
- if (evalE == null) {
- null
- } else {
- val value = numeric.toDouble(evalE)
- if (value < 0) null
- else math.sqrt(value)
- }
+ private lazy val numeric = TypeUtils.getNumeric(child.dataType)
+
+ protected override def evalInternal(evalE: Any) = {
+ val value = numeric.toDouble(evalE)
+ if (value < 0) null
+ else math.sqrt(value)
}
}
+/**
+ * A function that get the absolute value of the numeric value.
+ */
+case class Abs(child: Expression) extends UnaryArithmetic {
+ override def toString: String = s"Abs($child)"
+
+ override def checkInputDataTypes(): TypeCheckResult =
+ TypeUtils.checkForNumericExpr(child.dataType, "function abs")
+
+ private lazy val numeric = TypeUtils.getNumeric(dataType)
+
+ protected override def evalInternal(evalE: Any) = numeric.abs(evalE)
+}
+
abstract class BinaryArithmetic extends BinaryExpression {
self: Product =>
- override lazy val resolved =
- left.resolved && right.resolved &&
- left.dataType == right.dataType &&
- !DecimalType.isFixed(left.dataType)
+ override def dataType: DataType = left.dataType
- override def dataType: DataType = {
- if (!resolved) {
- throw new UnresolvedException(this,
- s"datatype. Can not resolve due to differing types
${left.dataType}, ${right.dataType}")
+ override def checkInputDataTypes(): TypeCheckResult = {
+ if (left.dataType != right.dataType) {
+ TypeCheckResult.fail(
+ s"differing types in ${this.getClass.getSimpleName},
${left.dataType} != ${right.dataType}")
--- End diff --
```
differing types in ${this.getClass.getSimpleName} (${left.dataType} and
${right.dataType}).
```
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
