You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2015/07/27 18:34:59 UTC
spark git commit: [SPARK-9371][SQL] fix SPARK-9371 for branch 1.4
Repository: spark
Updated Branches:
refs/heads/branch-1.4 cfca1c5af -> 43035b4b4
[SPARK-9371][SQL] fix SPARK-9371 for branch 1.4
a follow up of https://github.com/apache/spark/pull/7684
Author: Wenchen Fan <cl...@outlook.com>
Closes #7690 from cloud-fan/branch-1.4 and squashes the following commits:
450904d [Wenchen Fan] fix SPARK-9371 for branch 1.4
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/43035b4b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/43035b4b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/43035b4b
Branch: refs/heads/branch-1.4
Commit: 43035b4b40dd2fb87af6c28c705dcd9734aea521
Parents: cfca1c5
Author: Wenchen Fan <cl...@outlook.com>
Authored: Mon Jul 27 09:34:56 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Mon Jul 27 09:34:56 2015 -0700
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/sql/hive/HiveQl.scala | 6 +++---
.../org/apache/spark/sql/hive/execution/SQLQuerySuite.scala | 8 ++++++++
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/43035b4b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala
----------------------------------------------------------------------
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala
index a5ca361..ed6685f 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala
@@ -1337,11 +1337,11 @@ https://cwiki.apache.org/confluence/display/Hive/Enhanced+Aggregation%2C+Cube%2C
/* Attribute References */
case Token("TOK_TABLE_OR_COL",
Token(name, Nil) :: Nil) =>
- UnresolvedAttribute(cleanIdentifier(name))
+ UnresolvedAttribute.quoted(cleanIdentifier(name))
case Token(".", qualifier :: Token(attr, Nil) :: Nil) =>
nodeToExpr(qualifier) match {
- case UnresolvedAttribute(qualifierName) =>
- UnresolvedAttribute(qualifierName :+ cleanIdentifier(attr))
+ case UnresolvedAttribute(nameParts) =>
+ UnresolvedAttribute(nameParts :+ cleanIdentifier(attr))
case other => UnresolvedExtractValue(other, Literal(attr))
}
http://git-wip-us.apache.org/repos/asf/spark/blob/43035b4b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
----------------------------------------------------------------------
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
index e302f8b..13054ad 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
@@ -938,4 +938,12 @@ class SQLQuerySuite extends QueryTest {
case None => // OK
}
}
+
+ test("SPARK-9371: fix the support for special chars in column names for hive context") {
+ TestHive.read.json(TestHive.sparkContext.makeRDD(
+ """{"a": {"c.b": 1}, "b.$q": [{"a@!.q": 1}], "q.w": {"w.i&": [1]}}""" :: Nil))
+ .registerTempTable("t")
+
+ checkAnswer(sql("SELECT a.`c.b`, `b.$q`[0].`a@!.q`, `q.w`.`w.i&`[0] FROM t"), Row(1, 1, 1))
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org