Skip to content

[SPARK-16672][SQL] SQLBuilder should not raise exceptions on EXISTS queries #14307

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
dongjoon-hyun wants to merge 4 commits into from
Closed

[SPARK-16672][SQL] SQLBuilder should not raise exceptions on EXISTS queries #14307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86308df
[SPARK-16672][SQL] SQLBuilder should not raise exceptions on EXISTS q…
dongjoon-hyun Jul 21, 2016
422e2eb
Move testcase into LogicalPlanToSQLSuite.
dongjoon-hyun Jul 23, 2016
ff156e0
Address comments.
dongjoon-hyun Jul 25, 2016
be2085a
Use checkSQL.
dongjoon-hyun Jul 25, 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
9 changes: 7 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/catalyst/SQLBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,13 @@ class SQLBuilder(logicalPlan: LogicalPlan) extends Logging {
ScalarSubquery(rewrite, Seq.empty, exprId)

case PredicateSubquery(query, conditions, false, exprId) =>
val plan = Project(Seq(Alias(Literal(1), "1")()),
Filter(conditions.reduce(And), addSubqueryIfNeeded(query)))
val subquery = addSubqueryIfNeeded(query)
val plan = if (conditions.isEmpty) {
subquery
} else {
Project(Seq(Alias(Literal(1), "1")()),
Filter(conditions.reduce(And), subquery))
}
Exists(plan, exprId)

case PredicateSubquery(query, conditions, true, exprId) =>
Expand Down
4 changes: 4 additions & 0 deletions sql/hive/src/test/resources/sqlgen/predicate_subquery.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-- This file is automatically generated by LogicalPlanToSQLSuite.
select * from t1 b where exists (select * from t1 a)
--------------------------------------------------------------------------------
SELECT `gen_attr` AS `a` FROM (SELECT `gen_attr` FROM (SELECT `a` AS `gen_attr` FROM `default`.`t1`) AS gen_subquery_0 WHERE EXISTS(SELECT `gen_attr` AS `a` FROM ((SELECT `gen_attr` FROM (SELECT `a` AS `gen_attr` FROM `default`.`t1`) AS gen_subquery_0) AS gen_subquery_1) AS gen_subquery_1)) AS b
10 changes: 10 additions & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/catalyst/LogicalPlanToSQLSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import scala.util.control.NonFatal
import org.apache.spark.sql.Column
import org.apache.spark.sql.catalyst.parser.ParseException
import org.apache.spark.sql.functions._
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.test.SQLTestUtils

/**
Expand Down Expand Up @@ -927,6 +928,15 @@ class LogicalPlanToSQLSuite extends SQLBuilderTest with SQLTestUtils {
}
}

test("predicate subquery") {
withTable("t1") {
withSQLConf(SQLConf.CROSS_JOINS_ENABLED.key -> "true") {
sql("CREATE TABLE t1(a int)")
checkSQL("select * from t1 b where exists (select * from t1 a)", "predicate_subquery")
}
}
}

test("SPARK-14933 - select orc table") {
withTable("orc_t") {
sql("create table orc_t stored as orc as select 1 as c1, 'abc' as c2")
Expand Down