rebase solution

apache · Sep 24, 2014 · 2458229 · 2458229
1 parent 729952a
commit 2458229
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala
@@ -244,6 +244,7 @@ object HiveMetastoreTypes extends RegexParsers {
     case BooleanType => "boolean"
     case DecimalType => "decimal"
     case TimestampType => "timestamp"
+    case NullType => "void"
   }
 }
 

diff --git a/sql/hive/src/test/resources/golden/select null from table-0-5bb53cca754cc8afe9cd22feb8c586d1 b/sql/hive/src/test/resources/golden/select null from table-0-5bb53cca754cc8afe9cd22feb8c586d1
@@ -0,0 +1 @@
+NULL
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
@@ -330,6 +330,9 @@ class HiveQuerySuite extends HiveComparisonTest {
   createQueryTest("timestamp cast #8",
     "SELECT CAST(CAST(-1.2 AS TIMESTAMP) AS DOUBLE) FROM src LIMIT 1")
 
+  createQueryTest("select null from table",
+    "SELECT null FROM src LIMIT 1")
+
   test("implement identity function using case statement") {
     val actual = sql("SELECT (CASE key WHEN key THEN key END) FROM src")
       .map { case Row(i: Int) => i }