From 7dbc162f12cc1a447c85a1a2c20d32ebb5cbeacf Mon Sep 17 00:00:00 2001
From: zhaorongsheng <334362872@qq.com>
Date: Tue, 21 Mar 2017 11:30:55 -0700
Subject: [PATCH] [SPARK-20017][SQL] change the nullability of function
'StringToMap' from 'false' to 'true'
## What changes were proposed in this pull request?
Change the nullability of function `StringToMap` from `false` to `true`.
Author: zhaorongsheng <334362872@qq.com>
Closes #17350 from zhaorongsheng/bug-fix_strToMap_NPE.
---
.../sql/catalyst/expressions/complexTypeCreator.scala | 4 +++-
.../spark/sql/catalyst/expressions/ComplexTypeSuite.scala | 7 +++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeCreator.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeCreator.scala
index 22277ad8d5..b6675a84ec 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeCreator.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeCreator.scala
@@ -390,6 +390,8 @@ case class CreateNamedStructUnsafe(children: Seq[Expression]) extends CreateName
Examples:
> SELECT _FUNC_('a:1,b:2,c:3', ',', ':');
map("a":"1","b":"2","c":"3")
+ > SELECT _FUNC_('a');
+ map("a":null)
""")
// scalastyle:on line.size.limit
case class StringToMap(text: Expression, pairDelim: Expression, keyValueDelim: Expression)
@@ -407,7 +409,7 @@ case class StringToMap(text: Expression, pairDelim: Expression, keyValueDelim: E
override def inputTypes: Seq[AbstractDataType] = Seq(StringType, StringType, StringType)
- override def dataType: DataType = MapType(StringType, StringType, valueContainsNull = false)
+ override def dataType: DataType = MapType(StringType, StringType)
override def checkInputDataTypes(): TypeCheckResult = {
if (Seq(pairDelim, keyValueDelim).exists(! _.foldable)) {
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ComplexTypeSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ComplexTypeSuite.scala
index abe1d2b2c9..5f8a8f44d4 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ComplexTypeSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ComplexTypeSuite.scala
@@ -251,6 +251,9 @@ class ComplexTypeSuite extends SparkFunSuite with ExpressionEvalHelper {
}
test("StringToMap") {
+ val expectedDataType = MapType(StringType, StringType, valueContainsNull = true)
+ assert(new StringToMap("").dataType === expectedDataType)
+
val s0 = Literal("a:1,b:2,c:3")
val m0 = Map("a" -> "1", "b" -> "2", "c" -> "3")
checkEvaluation(new StringToMap(s0), m0)
@@ -271,6 +274,10 @@ class ComplexTypeSuite extends SparkFunSuite with ExpressionEvalHelper {
val m4 = Map("a" -> "1", "b" -> "2", "c" -> "3")
checkEvaluation(new StringToMap(s4, Literal("_")), m4)
+ val s5 = Literal("a")
+ val m5 = Map("a" -> null)
+ checkEvaluation(new StringToMap(s5), m5)
+
// arguments checking
assert(new StringToMap(Literal("a:1,b:2,c:3")).checkInputDataTypes().isSuccess)
assert(new StringToMap(Literal(null)).checkInputDataTypes().isFailure)
--
GitLab