From 8e37ed6eb81687140b6cdb00f4ec609ec7ba9be1 Mon Sep 17 00:00:00 2001
From: Takuya UESHIN <ueshin@happy-camper.st>
Date: Sat, 26 Apr 2014 14:39:54 -0700
Subject: [PATCH] [SPARK-1608] [SQL] Fix Cast.nullable when cast from
StringType to NumericType/TimestampType.
`Cast.nullable` should be `true` when cast from `StringType` to `NumericType` or `TimestampType`.
Because if `StringType` expression has an illegal number string or illegal timestamp string, the casted value becomes `null`.
Author: Takuya UESHIN <ueshin@happy-camper.st>
Closes #532 from ueshin/issues/SPARK-1608 and squashes the following commits:
065d37c [Takuya UESHIN] Add tests to check nullabilities of cast expressions.
f278ed7 [Takuya UESHIN] Revert test to keep it readable and concise.
9fc9380 [Takuya UESHIN] Fix Cast.nullable when cast from StringType to NumericType/TimestampType.
---
.../apache/spark/sql/catalyst/expressions/Cast.scala | 6 +++++-
.../expressions/ExpressionEvaluationSuite.scala | 12 ++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala
index 8b79b0cd65..40d2b42a0c 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala
@@ -24,7 +24,11 @@ import org.apache.spark.sql.catalyst.types._
/** Cast the child expression to the target data type. */
case class Cast(child: Expression, dataType: DataType) extends UnaryExpression {
override def foldable = child.foldable
- def nullable = child.nullable
+ def nullable = (child.dataType, dataType) match {
+ case (StringType, _: NumericType) => true
+ case (StringType, TimestampType) => true
+ case _ => child.nullable
+ }
override def toString = s"CAST($child, $dataType)"
type EvaluatedType = Any
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvaluationSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvaluationSuite.scala
index 4ce0dff9e1..d287ad73b9 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvaluationSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionEvaluationSuite.scala
@@ -245,6 +245,18 @@ class ExpressionEvaluationSuite extends FunSuite {
checkEvaluation(Literal(23.toShort) + Cast(true, ShortType), 24)
intercept[Exception] {evaluate(Literal(1) cast BinaryType, null)}
+
+ assert(("abcdef" cast StringType).nullable === false)
+ assert(("abcdef" cast BinaryType).nullable === false)
+ assert(("abcdef" cast BooleanType).nullable === false)
+ assert(("abcdef" cast TimestampType).nullable === true)
+ assert(("abcdef" cast LongType).nullable === true)
+ assert(("abcdef" cast IntegerType).nullable === true)
+ assert(("abcdef" cast ShortType).nullable === true)
+ assert(("abcdef" cast ByteType).nullable === true)
+ assert(("abcdef" cast DecimalType).nullable === true)
+ assert(("abcdef" cast DoubleType).nullable === true)
+ assert(("abcdef" cast FloatType).nullable === true)
}
test("timestamp") {
--
GitLab