map column would throw NPE if value is null

apache · Jan 28, 2016 · 5b2d942 · 5b2d942
1 parent 3327fd2
commit 5b2d942
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...lyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeExtractors.scala b/...lyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeExtractors.scala
@@ -278,7 +278,7 @@ case class GetMapValue(child: Expression, key: Expression)
       }
     }
 
-    if (!found) {
+    if (!found || map.valueArray().isNullAt(i)) {
       null
     } else {
       map.valueArray().get(i, dataType)
@@ -307,7 +307,7 @@ case class GetMapValue(child: Expression, key: Expression)
           }
         }
 
-        if ($found) {
+        if ($found && !$eval1.valueArray().isNullAt($index)) {
           ${ev.value} = ${ctx.getValue(eval1 + ".valueArray()", dataType, index)};
         } else {
           ${ev.isNull} = true;

diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
@@ -1463,4 +1463,11 @@ class SQLQuerySuite extends QueryTest with SQLTestUtils with TestHiveSingleton {
         |FROM (SELECT '{"f1": "value1", "f2": 12}' json, 'hello' as str) test
       """.stripMargin), Row("value1", "12", BigDecimal("3.14"), "hello"))
   }
+
+  test("SPARK-13056: Null in map value causes NPE") {
+    Seq((1, "abc=somestring,cba")).toDF("key", "value").registerTempTable("mapsrc")
+    sql("""CREATE TABLE maptest AS SELECT str_to_map(value, ",", "=") as col1 FROM mapsrc""")
+    checkAnswer(sql("SELECT col1['abc'] FROM maptest"), Row("somestring"))
+    checkAnswer(sql("SELECT col1['cba'] FROM maptest"), Row(null))
+  }
 }