[SPARK-11753][SQL][test-hadoop2.2] Make allowNonNumericNumbers option work #9759
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ package org.apache.spark.sql.execution.datasources.json | |
|
|
||
| import org.apache.spark.sql.QueryTest | ||
| import org.apache.spark.sql.test.SharedSQLContext | ||
| import org.apache.spark.sql.types.{DoubleType, StructField, StructType} | ||
|
|
||
| /** | ||
| * Test cases for various [[JSONOptions]]. | ||
|
|
@@ -93,23 +94,51 @@ class JsonParsingOptionsSuite extends QueryTest with SharedSQLContext { | |
| assert(df.first().getLong(0) == 18) | ||
| } | ||
|
|
||
| test("allowNonNumericNumbers off") { | ||
| // non-quoted non-numeric numbers don't work if allowNonNumericNumbers is off. | ||
| var testCases: Seq[String] = Seq("""{"age": NaN}""", """{"age": Infinity}""", | ||
| """{"age": +Infinity}""", """{"age": -Infinity}""", """{"age": INF}""", | ||
| """{"age": +INF}""", """{"age": -INF}""") | ||
| testCases.foreach { str => | ||
| val rdd = spark.sparkContext.parallelize(Seq(str)) | ||
| val df = spark.read.option("allowNonNumericNumbers", "false").json(rdd) | ||
|
|
||
| assert(df.schema.head.name == "_corrupt_record") | ||
| } | ||
|
|
||
| // quoted non-numeric numbers should still work even allowNonNumericNumbers is off. | ||
| testCases = Seq("""{"age": "NaN"}""", """{"age": "Infinity"}""", """{"age": "+Infinity"}""", | ||
| """{"age": "-Infinity"}""", """{"age": "INF"}""", """{"age": "+INF"}""", | ||
| """{"age": "-INF"}""") | ||
| val tests: Seq[Double => Boolean] = Seq(_.isNaN, _.isPosInfinity, _.isPosInfinity, | ||
| _.isNegInfinity, _.isPosInfinity, _.isPosInfinity, _.isNegInfinity) | ||
| val schema = StructType(StructField("age", DoubleType, true) :: Nil) | ||
|
|
||
| testCases.zipWithIndex.foreach { case (str, idx) => | ||
| val rdd = spark.sparkContext.parallelize(Seq(str)) | ||
| val df = spark.read.option("allowNonNumericNumbers", "false").schema(schema).json(rdd) | ||
|
|
||
| assert(df.schema.head.name == "age") | ||
| assert(tests(idx)(df.first().getDouble(0))) | ||
|
There was a problem hiding this comment. why it's double type? Shouldn't it be string if There was a problem hiding this comment. from @rxin comment that we want to support quoted non-numeric numbers when There was a problem hiding this comment. This doesn't make sense to me. What if users really want to use There was a problem hiding this comment. Then I shouldn't change There was a problem hiding this comment. In other words, it should be number when the field is inferred as double/float type. There was a problem hiding this comment. @cloud-fan I updated it. Non-quoted non-numeric numbers are parsed as double when the corresponding field is double/float type. This behavior is as same as before this patch. There was a problem hiding this comment. Yea I don't think that's what I meant there. |
||
| } | ||
| } | ||
|
|
||
| test("allowNonNumericNumbers on") { | ||
| val testCases: Seq[String] = Seq("""{"age": NaN}""", """{"age": Infinity}""", | ||
|
There was a problem hiding this comment. can we still read them if they are quoted? There was a problem hiding this comment. No, so if we don't set |
||
| """{"age": +Infinity}""", """{"age": -Infinity}""", """{"age": +INF}""", | ||
| """{"age": -INF}""", """{"age": "NaN"}""", """{"age": "Infinity"}""", | ||
| """{"age": "-Infinity"}""") | ||
| val tests: Seq[Double => Boolean] = Seq(_.isNaN, _.isPosInfinity, _.isPosInfinity, | ||
| _.isNegInfinity, _.isPosInfinity, _.isNegInfinity, _.isNaN, _.isPosInfinity, | ||
| _.isNegInfinity, _.isPosInfinity, _.isNegInfinity) | ||
| val schema = StructType(StructField("age", DoubleType, true) :: Nil) | ||
| testCases.zipWithIndex.foreach { case (str, idx) => | ||
| val rdd = spark.sparkContext.parallelize(Seq(str)) | ||
| val df = spark.read.option("allowNonNumericNumbers", "true").schema(schema).json(rdd) | ||
|
|
||
| assert(df.schema.head.name == "age") | ||
| assert(tests(idx)(df.first().getDouble(0))) | ||
| } | ||
| } | ||
|
|
||
| test("allowBackslashEscapingAnyCharacter off") { | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why are we removing the special handling for float types here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yea, should revert it back. BTW, do we actually test "inf" and "-inf" before? Because "inf".toFloat is not legal.