ready for review

brkyvz · brkyvz · commit 6ef0f45bde31 · 2017-02-09T20:08:26.000-08:00
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
@@ -376,6 +376,14 @@ class JsonExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
     )
   }
 
+  test("SPARK-19543: from_json empty input column") {
+    val schema = StructType(StructField("a", IntegerType) :: Nil)
+    checkEvaluation(
+      JsonToStruct(schema, Map.empty, Literal.create(" ", StringType)),
+      null
+    )
+  }
+
   test("to_json") {
     val schema = StructType(StructField("a", IntegerType) :: Nil)
     val struct = Literal.create(create_row(1), schema)

Original file line number	Diff line number	Diff line change
`@@ -376,6 +376,14 @@ class JsonExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {`
`376`	`376`	`)`
`377`	`377`	`}`
`378`	`378`
	`379`	`+ test("SPARK-19543: from_json empty input column") {`
	`380`	`+ val schema = StructType(StructField("a", IntegerType) :: Nil)`
	`381`	`+ checkEvaluation(`
	`382`	`+ JsonToStruct(schema, Map.empty, Literal.create(" ", StringType)),`
	`383`	`+ null`
	`384`	`+ )`
	`385`	`+ }`
	`386`	`+`
`379`	`387`	`test("to_json") {`
`380`	`388`	`val schema = StructType(StructField("a", IntegerType) :: Nil)`
`381`	`389`	`val struct = Literal.create(create_row(1), schema)`