Skip to content

[SPARK-13321][SQL] Add nested union test cases #11361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
viirya wants to merge 10 commits into from
Closed

[SPARK-13321][SQL] Add nested union test cases #11361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
93bd51e
Support nested UNION in parser.
viirya Feb 15, 2016
f462997
Test actual parsed plan.
viirya Feb 15, 2016
190b326
Support recursively nested one.
viirya Feb 15, 2016
a00261d
Merge remote-tracking branch 'upstream/master' into nested-union
viirya Feb 21, 2016
d024fff
Merge remote-tracking branch 'upstream/master' into nested-union
viirya Feb 21, 2016
1e34c44
Merge remote-tracking branch 'upstream/master' into nested-union
viirya Feb 25, 2016
5ff5ac2
Add unit test.
viirya Feb 25, 2016
c616664
Merge remote-tracking branch 'upstream/master' into nested-union
viirya Feb 26, 2016
4d93e9e
Merge remote-tracking branch 'upstream/master' into nested-union
viirya Apr 1, 2016
6775020
Add nested union test cases.
viirya Apr 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 66 additions & 0 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/PlanParserSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
package org.apache.spark.sql.catalyst.parser

import org.apache.spark.sql.Row
import org.apache.spark.sql.catalyst.TableIdentifier
import org.apache.spark.sql.catalyst.analysis._
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.plans._
import org.apache.spark.sql.catalyst.plans.logical._
Expand Down Expand Up @@ -426,4 +428,68 @@ class PlanParserSuite extends PlanTest {
"Number of aliases must match the number of fields in an inline table.")
intercept[ArrayIndexOutOfBoundsException](parsePlan("values (1, 'a'), (2, 'b', 5Y)"))
}

test("nesting UNION") {
val parsed = parsePlan(
"""
|SELECT `u_1`.`id` FROM (((SELECT `t0`.`id` FROM `default`.`t0`)
|UNION ALL (SELECT `t0`.`id` FROM `default`.`t0`)) UNION ALL
|(SELECT `t0`.`id` FROM `default`.`t0`)) AS u_1
""".stripMargin)

val expected = Project(
Copy link
Contributor

@hvanhovell hvanhovell Apr 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor: @viirya could you update this use the DSL and assertEqual equals? It makes this a bit easier to read.

BTW this test is very similar to the following test case: https://github.com/apache/spark/blob/master/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/PlanParserSuite.scala#L384-L392

Copy link
Member Author

@viirya viirya Apr 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm. indeed. If so, I think I can close this pr now.

Copy link
Member Author

@viirya viirya Apr 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hvanhovell Is new ANTLR4 parser natively to solve this?

Copy link
Contributor

@hvanhovell hvanhovell Apr 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@viirya the new parser handles nested queries a lot better. This is mainly due to ANTLR4's better parsing algorithms.

"u_1.id".attr :: Nil,
SubqueryAlias("u_1",
Union(
Union(
Project(
"t0.id".attr :: Nil,
UnresolvedRelation(TableIdentifier("t0", Some("default")), None)),
Project(
"t0.id".attr :: Nil,
UnresolvedRelation(TableIdentifier("t0", Some("default")), None))),
Project(
"t0.id".attr :: Nil,
UnresolvedRelation(TableIdentifier("t0", Some("default")), None)))))

comparePlans(parsed, expected)

val parsedSame = parsePlan(
"""
|SELECT `u_1`.`id` FROM ((SELECT `t0`.`id` FROM `default`.`t0`)
|UNION ALL (SELECT `t0`.`id` FROM `default`.`t0`) UNION ALL
|(SELECT `t0`.`id` FROM `default`.`t0`)) AS u_1
""".stripMargin)

comparePlans(parsedSame, expected)

val parsed2 = parsePlan(
"""
|SELECT `u_1`.`id` FROM ((((SELECT `t0`.`id` FROM `default`.`t0`)
|UNION ALL (SELECT `t0`.`id` FROM `default`.`t0`)) UNION ALL
|(SELECT `t0`.`id` FROM `default`.`t0`))
|UNION ALL (SELECT `t0`.`id` FROM `default`.`t0`)) AS u_1
""".stripMargin)

val expected2 = Project(
"u_1.id".attr :: Nil,
SubqueryAlias("u_1",
Union(
Union(
Union(
Project(
"t0.id".attr :: Nil,
UnresolvedRelation(TableIdentifier("t0", Some("default")), None)),
Project(
"t0.id".attr :: Nil,
UnresolvedRelation(TableIdentifier("t0", Some("default")), None))),
Project(
"t0.id".attr :: Nil,
UnresolvedRelation(TableIdentifier("t0", Some("default")), None))),
Project(
"t0.id".attr :: Nil,
UnresolvedRelation(TableIdentifier("t0", Some("default")), None)))))

comparePlans(parsed2, expected2)
}
}
85 changes: 85 additions & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,6 +1114,91 @@ class HiveQuerySuite extends HiveComparisonTest with BeforeAndAfter {
}
}

test("nested union") {
sql(
"""
| EXPLAIN
Copy link
Contributor

@hvanhovell hvanhovell Apr 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the point of this SQL statement? See if it compiles?

Copy link
Member Author

@viirya viirya Apr 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previous solution to the ANTLR3 parser will hang on this query.

| SELECT count(1) FROM (
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
|
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
|
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
|
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
|
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src) src
""".stripMargin)

val countForSrc = sql("SELECT count(1) FROM src").first()

val countForUnion25Src = sql(
"""
| SELECT count(1) FROM (
Copy link
Contributor

@hvanhovell hvanhovell Apr 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems a bit redundant to write the allmost the same query as above...

Copy link
Member Author

@viirya viirya Apr 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ha. sure. let me update this.

| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
|
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
|
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
|
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
|
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src UNION ALL
| SELECT key, value FROM src) src
""".stripMargin).first()

assert(countForSrc.getLong(0) == 500)
assert(countForUnion25Src.getLong(0) == 500 * 25)

val nested = sql(
"""
| SELECT u_1.key FROM (((SELECT key FROM src)
| UNION ALL (SELECT key FROM src)) UNION ALL
| (SELECT key FROM src)) AS u_1
""".stripMargin).collect()

assert(nested.size == 500 * 3)
}

test("parse HQL set commands") {
// Adapted from its SQL counterpart.
val testKey = "spark.sql.key.usedfortestonly"
Expand Down