diff options
| author | Michael Armbrust <michael@databricks.com> | 2014-05-15 16:50:42 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-05-15 16:50:49 -0700 |
| commit | ffa9c49d44ec62762736427be8c37e59d72a5c6b (patch) | |
| tree | 3b8a591c72edbdd7acf62c5314b3872bb0d9e34a /sql/hive | |
| parent | 22f261a1a3efbd466ca0588cc77beb92fb14b6a3 (diff) | |
| download | spark-ffa9c49d44ec62762736427be8c37e59d72a5c6b.tar.gz spark-ffa9c49d44ec62762736427be8c37e59d72a5c6b.tar.bz2 spark-ffa9c49d44ec62762736427be8c37e59d72a5c6b.zip | |
[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.
(cherry picked from commit a4aafe5f9fb191533400caeafddf04986492c95f)
Signed-off-by: Reynold Xin <rxin@apache.org>
Diffstat (limited to 'sql/hive')
| -rw-r--r-- | sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala | 6 |
1 files 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" |