diff options
| author | Takuya UESHIN <ueshin@happy-camper.st> | 2014-11-10 15:55:15 -0800 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2014-11-10 15:56:55 -0800 |
| commit | 0089a4f64d90f923dc02aee45bcda4be726d740a (patch) | |
| tree | 67f2618adb08e0e930cc933a307b8138a82a1227 /sql | |
| parent | 19dcb5714ba326c272981e6e7e547ff7990648b9 (diff) | |
| download | spark-0089a4f64d90f923dc02aee45bcda4be726d740a.tar.gz spark-0089a4f64d90f923dc02aee45bcda4be726d740a.tar.bz2 spark-0089a4f64d90f923dc02aee45bcda4be726d740a.zip | |
[SPARK-4319][SQL] Enable an ignored test "null count".
Author: Takuya UESHIN <ueshin@happy-camper.st>
Closes #3185 from ueshin/issues/SPARK-4319 and squashes the following commits:
a44a38e [Takuya UESHIN] Enable an ignored test "null count".
(cherry picked from commit dbf10588de03e8ea993fff687a78727eff55db1f)
Signed-off-by: Michael Armbrust <michael@databricks.com>
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala | 9 | ||||
| -rw-r--r-- | sql/core/src/test/scala/org/apache/spark/sql/TestData.scala | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala index 702714af53..8a80724c08 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala @@ -281,14 +281,13 @@ class SQLQuerySuite extends QueryTest with BeforeAndAfterAll { 3) } - // No support for primitive nulls yet. - ignore("null count") { + test("null count") { checkAnswer( - sql("SELECT a, COUNT(b) FROM testData3"), - Seq((1,0), (2, 1))) + sql("SELECT a, COUNT(b) FROM testData3 GROUP BY a"), + Seq((1, 0), (2, 1))) checkAnswer( - testData3.groupBy()(Count('a), Count('b), Count(1), CountDistinct('a :: Nil), CountDistinct('b :: Nil)), + sql("SELECT COUNT(a), COUNT(b), COUNT(1), COUNT(DISTINCT a), COUNT(DISTINCT b) FROM testData3"), (2, 1, 2, 2, 1) :: Nil) } diff --git a/sql/core/src/test/scala/org/apache/spark/sql/TestData.scala b/sql/core/src/test/scala/org/apache/spark/sql/TestData.scala index ef87a23063..92b49e8155 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/TestData.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/TestData.scala @@ -64,11 +64,12 @@ object TestData { BinaryData("123".getBytes(), 4) :: Nil).toSchemaRDD binaryData.registerTempTable("binaryData") - // TODO: There is no way to express null primitives as case classes currently... + case class TestData3(a: Int, b: Option[Int]) val testData3 = - logical.LocalRelation('a.int, 'b.int).loadData( - (1, null) :: - (2, 2) :: Nil) + TestSQLContext.sparkContext.parallelize( + TestData3(1, None) :: + TestData3(2, Some(2)) :: Nil).toSchemaRDD + testData3.registerTempTable("testData3") val emptyTableData = logical.LocalRelation('a.int, 'b.int) |