Repository: spark Updated Branches: refs/heads/master 7463cd248 -> 1a0da0ec5
[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. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1a0da0ec Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1a0da0ec Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1a0da0ec Branch: refs/heads/master Commit: 1a0da0ec5799f3226ce238cac03f53fa4f7c9326 Parents: 7463cd2 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:22 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/1a0da0ec/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] =
