[SPARK-18260] Make from_json null safe #15771
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
marmbrus
reviewed
Nov 4, 2016
| Seq("""{"a": 1}""").toDF("value").write.parquet(new File(dir, "p=x").toString) | ||
| Seq("""{"a": 2}""").toDF("record").write.parquet(new File(dir, "p=y").toString) | ||
| val schema = new StructType().add("a", IntegerType) | ||
| val df = spark.read.parquet(dir.toString) |
There was a problem hiding this comment.
Why parquet? Seems this is testing more than it needs to (and thus runs slower).
marmbrus
reviewed
Nov 4, 2016
| @@ -499,6 +499,7 @@ case class JsonToStruct(schema: StructType, options: Map[String, String], child: | |||
|
|
|||
| override def eval(input: InternalRow): Any = { | |||
| try parser.parse(child.eval(input).toString).head catch { | |||
| case _: NullPointerException => null | |||
There was a problem hiding this comment.
I would consider doing this with an if. I think catching and throwing an exception can be expensive (though maybe JVM optimizations save us?). Since its easy I'd rather not rely on that.
|
@marmbrus Addressed |
|
Test build #68151 has finished for PR 15771 at commit
|
|
Test build #68156 has finished for PR 15771 at commit
|
|
Test build #68155 has finished for PR 15771 at commit
|
marmbrus
reviewed
Nov 4, 2016
| @@ -498,7 +498,7 @@ case class JsonToStruct(schema: StructType, options: Map[String, String], child: | |||
| override def children: Seq[Expression] = child :: Nil | |||
|
|
|||
| override def eval(input: InternalRow): Any = { | |||
| try parser.parse(child.eval(input).toString).head catch { | |||
| try Option(child.eval(input)).map(json => parser.parse(json.toString).head).orNull catch { | |||
There was a problem hiding this comment.
Sorry to keep iterating... I think you want to avoid an extra allocation in the execution path. I would use an if statement.
|
LGTM, pending tests |
|
Test build #68165 has finished for PR 15771 at commit
|
|
Merging in master/branch-2.1. |
asfgit
pushed a commit
that referenced
this pull request
Nov 5, 2016
## What changes were proposed in this pull request? `from_json` is currently not safe against `null` rows. This PR adds a fix and a regression test for it. ## How was this patch tested? Regression test Author: Burak Yavuz <[email protected]> Closes #15771 from brkyvz/json_fix. (cherry picked from commit 6e27018) Signed-off-by: Reynold Xin <[email protected]>
uzadude
pushed a commit
to uzadude/spark
that referenced
this pull request
Jan 27, 2017
## What changes were proposed in this pull request? `from_json` is currently not safe against `null` rows. This PR adds a fix and a regression test for it. ## How was this patch tested? Regression test Author: Burak Yavuz <[email protected]> Closes apache#15771 from brkyvz/json_fix.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
from_jsonis currently not safe againstnullrows. This PR adds a fix and a regression test for it.How was this patch tested?
Regression test