From a4aafe5f9fb191533400caeafddf04986492c95f Mon Sep 17 00:00:00 2001
From: Michael Armbrust <michael@databricks.com>
Date: Thu, 15 May 2014 16:50:42 -0700
Subject: [PATCH] [SQL] Fix tiny/small ints from HiveMetastore.
Author: Michael Armbrust <michael@databricks.com>
Closes #797 from marmbrus/smallInt and squashes the following commits:
2db9dae [Michael Armbrust] Fix tiny/small ints from HiveMetastore.
---
.../org/apache/spark/sql/hive/HiveMetastoreCatalog.scala | 6 ++++--
1 file changed, 4 insertions(+), 2 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
index fa30f596f8..636c4f7b93 100644
--- 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
@@ -183,7 +183,8 @@ object HiveMetastoreTypes extends RegexParsers {
"string" ^^^ StringType |
"float" ^^^ FloatType |
"int" ^^^ IntegerType |
- "tinyint" ^^^ ShortType |
+ "tinyint" ^^^ ByteType |
+ "smallint" ^^^ ShortType |
"double" ^^^ DoubleType |
"bigint" ^^^ LongType |
"binary" ^^^ BinaryType |
@@ -227,7 +228,8 @@ object HiveMetastoreTypes extends RegexParsers {
case StringType => "string"
case FloatType => "float"
case IntegerType => "int"
- case ShortType =>"tinyint"
+ case ByteType => "tinyint"
+ case ShortType => "smallint"
case DoubleType => "double"
case LongType => "bigint"
case BinaryType => "binary"
--
GitLab