Repository: spark
Updated Branches:
  refs/heads/master 8880fd13e -> d5580ebaa


[SPARK-17884][SQL] To resolve Null pointer exception when casting from empty 
string to interval type.

## What changes were proposed in this pull request?
This change adds a check in castToInterval method of Cast expression , such 
that if converted value is null , then isNull variable should be set to true.

Earlier, the expression Cast(Literal(), CalendarIntervalType) was throwing 
NullPointerException because of the above mentioned reason.

## How was this patch tested?
Added test case in CastSuite.scala

jira entry for detail: https://issues.apache.org/jira/browse/SPARK-17884

Author: prigarg <prig...@adobe.com>

Closes #15449 from priyankagargnitk/SPARK-17884.


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

Branch: refs/heads/master
Commit: d5580ebaa086b9feb72d5428f24c5b60cd7da745
Parents: 8880fd1
Author: prigarg <prig...@adobe.com>
Authored: Wed Oct 12 10:14:45 2016 -0700
Committer: Reynold Xin <r...@databricks.com>
Committed: Wed Oct 12 10:14:45 2016 -0700

----------------------------------------------------------------------
 .../org/apache/spark/sql/catalyst/expressions/Cast.scala      | 7 ++++++-
 .../org/apache/spark/sql/catalyst/expressions/CastSuite.scala | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/d5580eba/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala
----------------------------------------------------------------------
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 1314c41..58fd65f 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
@@ -657,7 +657,12 @@ case class Cast(child: Expression, dataType: DataType) 
extends UnaryExpression w
   private[this] def castToIntervalCode(from: DataType): CastFunction = from 
match {
     case StringType =>
       (c, evPrim, evNull) =>
-        s"$evPrim = CalendarInterval.fromString($c.toString());"
+        s"""$evPrim = CalendarInterval.fromString($c.toString());
+           if(${evPrim} == null) {
+             ${evNull} = true;
+           }
+         """.stripMargin
+
   }
 
   private[this] def decimalToTimestampCode(d: String): String =

http://git-wip-us.apache.org/repos/asf/spark/blob/d5580eba/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuite.scala
----------------------------------------------------------------------
diff --git 
a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuite.scala
 
b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuite.scala
index 5c35baa..b748595 100644
--- 
a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuite.scala
+++ 
b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuite.scala
@@ -767,6 +767,7 @@ class CastSuite extends SparkFunSuite with 
ExpressionEvalHelper {
   test("cast between string and interval") {
     import org.apache.spark.unsafe.types.CalendarInterval
 
+    checkEvaluation(Cast(Literal(""), CalendarIntervalType), null)
     checkEvaluation(Cast(Literal("interval -3 month 7 hours"), 
CalendarIntervalType),
       new CalendarInterval(-3, 7 * CalendarInterval.MICROS_PER_HOUR))
     checkEvaluation(Cast(Literal.create(


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

Reply via email to