Repository: spark Updated Branches: refs/heads/branch-1.0 cefc6404a -> 8575d8809
[SQL] SPARK-1964 Add timestamp to hive metastore type parser. Author: Michael Armbrust <[email protected]> Closes #913 from marmbrus/timestampMetastore and squashes the following commits: 8e0154f [Michael Armbrust] Add timestamp to hive metastore type parser. (cherry picked from commit 1a0da0ec5799f3226ce238cac03f53fa4f7c9326) Signed-off-by: Reynold Xin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8575d880 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8575d880 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8575d880 Branch: refs/heads/branch-1.0 Commit: 8575d8809f9062dc87ca72c57c0de42ec570118f Parents: cefc640 Author: Michael Armbrust <[email protected]> Authored: Sat May 31 12:34:22 2014 -0700 Committer: Reynold Xin <[email protected]> Committed: Sat May 31 12:34:31 2014 -0700 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/8575d880/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala ---------------------------------------------------------------------- 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 9f74e03..a91b520 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 @@ -190,6 +190,7 @@ object HiveMetastoreTypes extends RegexParsers { "binary" ^^^ BinaryType | "boolean" ^^^ BooleanType | "decimal" ^^^ DecimalType | + "timestamp" ^^^ TimestampType | "varchar\\((\\d+)\\)".r ^^^ StringType protected lazy val arrayType: Parser[DataType] =
