Skip to content

Commit e052dff

Browse files
committed
[SPARK-4676] [SQL] JavaSchemaRDD.schema may throw NullType MatchError if sql has null
1 parent 4b4bb34 commit e052dff

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

sql/core/src/test/scala/org/apache/spark/sql/api/java/JavaSQLSuite.scala

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,21 @@ class JavaSQLSuite extends FunSuite {
6868
javaSqlCtx.sql("SELECT * FROM people").collect()
6969
}
7070

71-
test("schema with null from JavaBeans") {
72-
val person = new PersonBean
73-
person.setName("Michael")
74-
person.setAge(29)
75-
76-
val rdd = javaCtx.parallelize(person :: Nil)
77-
val schemaRDD = javaSqlCtx.applySchema(rdd, classOf[PersonBean])
78-
79-
schemaRDD.registerTempTable("people")
80-
val nullRDD = javaSqlCtx.sql("SELECT null FROM people")
81-
val structFields = nullRDD.schema.getFields()
82-
assert(structFields.size == 1)
83-
assert(structFields(0).getDataType().isInstanceOf[NullType])
84-
assert(nullRDD.collect.head.row === Seq(null))
85-
}
71+
test("schema with null from JavaBeans") {
72+
val person = new PersonBean
73+
person.setName("Michael")
74+
person.setAge(29)
75+
76+
val rdd = javaCtx.parallelize(person :: Nil)
77+
val schemaRDD = javaSqlCtx.applySchema(rdd, classOf[PersonBean])
78+
79+
schemaRDD.registerTempTable("people")
80+
val nullRDD = javaSqlCtx.sql("SELECT null FROM people")
81+
val structFields = nullRDD.schema.getFields()
82+
assert(structFields.size == 1)
83+
assert(structFields(0).getDataType().isInstanceOf[NullType])
84+
assert(nullRDD.collect.head.row === Seq(null))
85+
}
8686

8787
test("all types in JavaBeans") {
8888
val bean = new AllTypesBean

0 commit comments

Comments
 (0)