You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2015/05/01 03:51:11 UTC
spark git commit: [SPARK-7123] [SQL] support table.star in sqlcontext
Repository: spark
Updated Branches:
refs/heads/master 3ba5aaab8 -> 473552fa5
[SPARK-7123] [SQL] support table.star in sqlcontext
Run following sql get error
`SELECT r.*
FROM testData l join testData2 r on (l.key = r.a)`
Author: scwf <wa...@huawei.com>
Closes #5690 from scwf/tablestar and squashes the following commits:
3b2e2b6 [scwf] support table.star
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/473552fa
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/473552fa
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/473552fa
Branch: refs/heads/master
Commit: 473552fa5db9fa81f1a800f4ebacd23472e8c212
Parents: 3ba5aaa
Author: scwf <wa...@huawei.com>
Authored: Thu Apr 30 18:50:14 2015 -0700
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Thu Apr 30 18:50:14 2015 -0700
----------------------------------------------------------------------
.../scala/org/apache/spark/sql/catalyst/SqlParser.scala | 1 +
.../test/scala/org/apache/spark/sql/SQLQuerySuite.scala | 10 ++++++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/473552fa/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
index 0af969c..1d3a2dc 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
@@ -365,6 +365,7 @@ class SqlParser extends AbstractSparkSQLParser with DataTypeParser {
protected lazy val baseExpression: Parser[Expression] =
( "*" ^^^ UnresolvedStar(None)
+ | ident <~ "." ~ "*" ^^ { case tableName => UnresolvedStar(Option(tableName)) }
| primary
)
http://git-wip-us.apache.org/repos/asf/spark/blob/473552fa/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
index 255f8c3..0ab8558 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
@@ -51,6 +51,16 @@ class SQLQuerySuite extends QueryTest with BeforeAndAfterAll {
Row("1", 1) :: Row("2", 1) :: Row("3", 1) :: Nil)
}
+ test("support table.star") {
+ checkAnswer(
+ sql(
+ """
+ |SELECT r.*
+ |FROM testData l join testData2 r on (l.key = r.a)
+ """.stripMargin),
+ Row(1, 1) :: Row(1, 2) :: Row(2, 1) :: Row(2, 2) :: Row(3, 1) :: Row(3, 2) :: Nil)
+ }
+
test("self join with alias in agg") {
Seq(1,2,3)
.map(i => (i, i.toString))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org