For comments.

Author: viirya

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/json/JacksonParser.scala

@@ -101,7 +101,22 @@ object JacksonParser {
         parser.getFloatValue
 
       case (VALUE_STRING, FloatType) =>
-        parser.getFloatValue
+        // Special case handling for quoted non-numeric numbers.
+        if (configOptions.allowNonNumericNumbers) {
+          val value = parser.getText
+          val lowerCaseValue = value.toLowerCase()
+          if (lowerCaseValue.equals("nan") ||
+            lowerCaseValue.equals("infinity") ||
+            lowerCaseValue.equals("-infinity") ||
+            lowerCaseValue.equals("inf") ||
+            lowerCaseValue.equals("-inf")) {
+            value.toFloat
+          } else {
+            sys.error(s"Cannot parse $value as FloatType.")
+          }
+        } else {
+          parser.getFloatValue
+        }
 
       case (VALUE_NUMBER_INT | VALUE_NUMBER_FLOAT, DoubleType) =>
         parser.getDoubleValue

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/json/JsonParsingOptionsSuite.scala

@@ -94,7 +94,7 @@ class JsonParsingOptionsSuite extends QueryTest with SharedSQLContext {
   }
 
   test("allowNonNumericNumbers off") {
-    val testCases: Seq[String] = Seq("""{"age": NaN}""", """{"age": Infinity}""",
+    var testCases: Seq[String] = Seq("""{"age": NaN}""", """{"age": Infinity}""",
       """{"age": -Infinity}""")
 
     testCases.foreach { str =>
@@ -103,6 +103,16 @@ class JsonParsingOptionsSuite extends QueryTest with SharedSQLContext {
 
       assert(df.schema.head.name == "_corrupt_record")
     }
+
+    testCases = Seq("""{"age": "NaN"}""", """{"age": "Infinity"}""",
+      """{"age": "-Infinity"}""")
+
+    testCases.foreach { str =>
+      val rdd = sqlContext.sparkContext.parallelize(Seq(str))
+      val df = sqlContext.read.option("allowNonNumericNumbers", "false").json(rdd)
+
+      assert(df.schema.head.name == "age")
+    }
   }
 
   test("allowNonNumericNumbers on") {