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/01/11 02:07:49 UTC
spark git commit: [SPARK-5029][SQL] Enable from follow multiple
brackets
Repository: spark
Updated Branches:
refs/heads/master 92d9a704c -> d22a31f5e
[SPARK-5029][SQL] Enable from follow multiple brackets
Enable from follow multiple brackets:
```
select key from ((select * from testData limit 1) union all (select * from testData limit 1)) x limit 1
```
Author: scwf <wa...@huawei.com>
Closes #3853 from scwf/from and squashes the following commits:
14f110a [scwf] enable from follow multiple brackets
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d22a31f5
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d22a31f5
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d22a31f5
Branch: refs/heads/master
Commit: d22a31f5e84e27e27a059f540d08a8a441fc17fa
Parents: 92d9a70
Author: scwf <wa...@huawei.com>
Authored: Sat Jan 10 17:07:34 2015 -0800
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Sat Jan 10 17:07:34 2015 -0800
----------------------------------------------------------------------
.../org/apache/spark/sql/catalyst/SqlParser.scala | 2 +-
.../scala/org/apache/spark/sql/SQLQuerySuite.scala | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/d22a31f5/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 fc7b874..5d974df 100755
--- 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
@@ -125,7 +125,7 @@ class SqlParser extends AbstractSparkSQLParser {
}
protected lazy val start: Parser[LogicalPlan] =
- ( select *
+ ( (select | ("(" ~> select <~ ")")) *
( UNION ~ ALL ^^^ { (q1: LogicalPlan, q2: LogicalPlan) => Union(q1, q2) }
| INTERSECT ^^^ { (q1: LogicalPlan, q2: LogicalPlan) => Intersect(q1, q2) }
| EXCEPT ^^^ { (q1: LogicalPlan, q2: LogicalPlan) => Except(q1, q2)}
http://git-wip-us.apache.org/repos/asf/spark/blob/d22a31f5/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 add4e21..d9de568 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
@@ -272,6 +272,23 @@ class SQLQuerySuite extends QueryTest with BeforeAndAfterAll {
mapData.collect().take(1).toSeq)
}
+ test("from follow multiple brackets") {
+ checkAnswer(sql(
+ "select key from ((select * from testData limit 1) union all (select * from testData limit 1)) x limit 1"),
+ 1
+ )
+
+ checkAnswer(sql(
+ "select key from (select * from testData) x limit 1"),
+ 1
+ )
+
+ checkAnswer(sql(
+ "select key from (select * from testData limit 1 union all select * from testData limit 1) x limit 1"),
+ 1
+ )
+ }
+
test("average") {
checkAnswer(
sql("SELECT AVG(a) FROM testData2"),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org