diff options
author | LY Lai <ly.lai@vpon.com> | 2014-05-27 16:08:38 -0700 |
---|---|---|
committer | Reynold Xin <rxin@apache.org> | 2014-05-27 16:08:49 -0700 |
commit | 5d6382566719043cf07adde36ffe76abb576e7da (patch) | |
tree | a2a5f3fce486ffa9390b9670c71d29455ad4fc46 /sql/hive/src/main | |
parent | 50e234ba510acac0f75c080b1b1ea681a3a28449 (diff) | |
download | spark-5d6382566719043cf07adde36ffe76abb576e7da.tar.gz spark-5d6382566719043cf07adde36ffe76abb576e7da.tar.bz2 spark-5d6382566719043cf07adde36ffe76abb576e7da.zip |
[SQL] SPARK-1922
Allow underscore in column name of a struct field https://issues.apache.org/jira/browse/SPARK-1922 .
Author: LY Lai <ly.lai@vpon.com>
Closes #873 from lyuanlai/master and squashes the following commits:
2253263 [LY Lai] Allow underscore in struct field column name
(cherry picked from commit 068256745052b0aa947dd8c16b1f1d73d8e4631e)
Signed-off-by: Reynold Xin <rxin@apache.org>
Diffstat (limited to 'sql/hive/src/main')
-rw-r--r-- | sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala | 2 |
1 files changed, 1 insertions, 1 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 636c4f7b93..9f74e0334f 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 @@ -201,7 +201,7 @@ object HiveMetastoreTypes extends RegexParsers { } protected lazy val structField: Parser[StructField] = - "[a-zA-Z0-9]*".r ~ ":" ~ dataType ^^ { + "[a-zA-Z0-9_]*".r ~ ":" ~ dataType ^^ { case name ~ _ ~ tpe => StructField(name, tpe, nullable = true) } |