Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SPARK-13056][SQL] map column would throw NPE if value is null #10964

Closed
wants to merge 7 commits into from
Closed

[SPARK-13056][SQL] map column would throw NPE if value is null #10964

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5b2d942
map column would throw NPE if value is null
adrian-wang Jan 28, 2016
2244999
address comments
adrian-wang Jan 29, 2016
bf429ca
address comments
adrian-wang Jan 29, 2016
21f29a5
move test
adrian-wang Feb 1, 2016
898cf20
use withTempTable
adrian-wang Feb 1, 2016
d77013f
modify test case
adrian-wang Feb 1, 2016
5b83626
add comment
adrian-wang Feb 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...lyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/complexTypeExtractors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ case class GetMapValue(child: Expression, key: Expression)
}
}

if (!found) {
if (!found || map.valueArray().isNullAt(i)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just realized the GetArrayItem also need to add null check for interpreted version eval, can you also fix that please?

null
} else {
map.valueArray().get(i, dataType)
Expand Down Expand Up @@ -307,7 +307,7 @@ case class GetMapValue(child: Expression, key: Expression)
}
}

if ($found) {
if ($found && !$eval1.valueArray().isNullAt($index)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we assign $eval1.valueArray() to a local variable？

${ev.value} = ${ctx.getValue(eval1 + ".valueArray()", dataType, index)};
} else {
${ev.isNull} = true;
Expand Down
7 changes: 7 additions & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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""")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The str_to_map stuff makes this test a little hard to read, can we create a DataFrame by
val df = Seq(1 -> Map("a" -> "1", "b" -> null)).toDF("key", "value") and test it by DataFrames APIs directly?

checkAnswer(sql("SELECT col1['abc'] FROM maptest"), Row("somestring"))
checkAnswer(sql("SELECT col1['cba'] FROM maptest"), Row(null))
}
}