Repository: spark
Updated Branches:
refs/heads/master 68cb69daf -> 9b6ebe33d
[SPARK-4120][SQL] Join of multiple tables with syntax like SELECT .. FROM
T1,T2,T3.. does not work in SparkSQL
Right now it works for only 2 tables like below query.
sql("SELECT * FROM records1 as a,records2 as b where a.key=b.key ")
But it does not work for more than 2 tables like below query
sql("SELECT * FROM records1 as a,records2 as b,records3 as c where a.key=b.key
and a.key=c.key").
Author: ravipesala <[email protected]>
Closes #2987 from ravipesala/multijoin and squashes the following commits:
429b005 [ravipesala] Support multiple joins
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9b6ebe33
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9b6ebe33
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9b6ebe33
Branch: refs/heads/master
Commit: 9b6ebe33db27be38c3036ffeda17096043fb0fb9
Parents: 68cb69d
Author: ravipesala <[email protected]>
Authored: Thu Oct 30 17:15:45 2014 -0700
Committer: Michael Armbrust <[email protected]>
Committed: Thu Oct 30 17:15:45 2014 -0700
----------------------------------------------------------------------
.../scala/org/apache/spark/sql/catalyst/SqlParser.scala | 3 ++-
.../test/scala/org/apache/spark/sql/SQLQuerySuite.scala | 10 ++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/9b6ebe33/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 0acf725..942b843 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
@@ -166,7 +166,8 @@ class SqlParser extends AbstractSparkSQLParser {
// Based very loosely on the MySQL Grammar.
// http://dev.mysql.com/doc/refman/5.0/en/join.html
protected lazy val relations: Parser[LogicalPlan] =
- ( relation ~ ("," ~> relation) ^^ { case r1 ~ r2 => Join(r1, r2, Inner,
None) }
+ ( relation ~ rep1("," ~> relation) ^^ {
+ case r1 ~ joins => joins.foldLeft(r1) { case(lhs, r) => Join(lhs, r,
Inner, None) } }
| relation
)
http://git-wip-us.apache.org/repos/asf/spark/blob/9b6ebe33/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 1034c2d..4c36ca0 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
@@ -899,4 +899,14 @@ class SQLQuerySuite extends QueryTest with
BeforeAndAfterAll {
test("SPARK-3814 Support Bitwise ~ operator") {
checkAnswer(sql("SELECT ~key FROM testData WHERE key = 1 "), -2)
}
+
+ test("SPARK-4120 Join of multiple tables does not work in SparkSQL") {
+ checkAnswer(
+ sql(
+ """SELECT a.key, b.key, c.key
+ |FROM testData a,testData b,testData c
+ |where a.key = b.key and a.key = c.key
+ """.stripMargin),
+ (1 to 100).map(i => Seq(i, i, i)))
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
