From 57e1da39464131329318b723caa54df9f55fa54f Mon Sep 17 00:00:00 2001
From: Eric Wasserman <ericw@sgn.com>
Date: Wed, 26 Apr 2017 11:42:43 +0800
Subject: [PATCH] [SPARK-16548][SQL] Inconsistent error handling in JSON
parsing SQL functions
## What changes were proposed in this pull request?
change to using Jackson's `com.fasterxml.jackson.core.JsonFactory`
public JsonParser createParser(String content)
## How was this patch tested?
existing unit tests
Please review http://spark.apache.org/contributing.html before opening a pull request.
Author: Eric Wasserman <ericw@sgn.com>
Closes #17693 from ewasserman/SPARK-20314.
---
.../catalyst/expressions/jsonExpressions.scala | 12 +++++++++---
.../expressions/JsonExpressionsSuite.scala | 17 +++++++++++++++++
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/jsonExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/jsonExpressions.scala
index df4d406b84..9fb0ea6815 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/jsonExpressions.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/jsonExpressions.scala
@@ -17,7 +17,7 @@
package org.apache.spark.sql.catalyst.expressions
-import java.io.{ByteArrayOutputStream, CharArrayWriter, StringWriter}
+import java.io.{ByteArrayInputStream, ByteArrayOutputStream, CharArrayWriter, InputStreamReader, StringWriter}
import scala.util.parsing.combinator.RegexParsers
@@ -149,7 +149,10 @@ case class GetJsonObject(json: Expression, path: Expression)
if (parsed.isDefined) {
try {
- Utils.tryWithResource(jsonFactory.createParser(jsonStr.getBytes)) { parser =>
+ /* We know the bytes are UTF-8 encoded. Pass a Reader to avoid having Jackson
+ detect character encoding which could fail for some malformed strings */
+ Utils.tryWithResource(jsonFactory.createParser(new InputStreamReader(
+ new ByteArrayInputStream(jsonStr.getBytes), "UTF-8"))) { parser =>
val output = new ByteArrayOutputStream()
val matched = Utils.tryWithResource(
jsonFactory.createGenerator(output, JsonEncoding.UTF8)) { generator =>
@@ -393,7 +396,10 @@ case class JsonTuple(children: Seq[Expression])
}
try {
- Utils.tryWithResource(jsonFactory.createParser(json.getBytes)) {
+ /* We know the bytes are UTF-8 encoded. Pass a Reader to avoid having Jackson
+ detect character encoding which could fail for some malformed strings */
+ Utils.tryWithResource(jsonFactory.createParser(new InputStreamReader(
+ new ByteArrayInputStream(json.getBytes), "UTF-8"))) {
parser => parseRow(parser, input)
}
} catch {
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/JsonExpressionsSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/JsonExpressionsSuite.scala
index c5b72235e5..4402ad4e9a 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/JsonExpressionsSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/JsonExpressionsSuite.scala
@@ -39,6 +39,10 @@ class JsonExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
|"fb:testid":"1234"}
|""".stripMargin
+ /* invalid json with leading nulls would trigger java.io.CharConversionException
+ in Jackson's JsonFactory.createParser(byte[]) due to RFC-4627 encoding detection */
+ val badJson = "\0\0\0A\1AAA"
+
test("$.store.bicycle") {
checkEvaluation(
GetJsonObject(Literal(json), Literal("$.store.bicycle")),
@@ -224,6 +228,13 @@ class JsonExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
null)
}
+ test("SPARK-16548: character conversion") {
+ checkEvaluation(
+ GetJsonObject(Literal(badJson), Literal("$.a")),
+ null
+ )
+ }
+
test("non foldable literal") {
checkEvaluation(
GetJsonObject(NonFoldableLiteral(json), NonFoldableLiteral("$.fb:testid")),
@@ -340,6 +351,12 @@ class JsonExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
InternalRow(null, null, null, null, null))
}
+ test("SPARK-16548: json_tuple - invalid json with leading nulls") {
+ checkJsonTuple(
+ JsonTuple(Literal(badJson) :: jsonTupleQuery),
+ InternalRow(null, null, null, null, null))
+ }
+
test("json_tuple - preserve newlines") {
checkJsonTuple(
JsonTuple(Literal("{\"a\":\"b\nc\"}") :: Literal("a") :: Nil),
--
GitLab