Skip to content

[SPARK-26138][SQL] Cross join requires push LocalLimit in LimitPushDown rule #23104

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

[SPARK-26138][SQL] Cross join requires push LocalLimit in LimitPushDown rule #23104

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
deb1809
[SPARK-26138][SQL] LimitPushDown cross join requires maybeBushLocalLimit
Nov 21, 2018
a0b9cb4
[SPARK-26138][SQL] add three UTs
Nov 22, 2018
588c151
[SPARK-26138][SQL] Push limit to the right side
Nov 23, 2018
e173962
[SPARK-26138][SQL] Fix the scala style. File line length exceeds 100 …
Dec 18, 2018
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
2 changes: 2 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,8 @@ object LimitPushDown extends Rule[LogicalPlan] {
val newJoin = joinType match {
case RightOuter => join.copy(right = maybePushLocalLimit(exp, right))
case LeftOuter => join.copy(left = maybePushLocalLimit(exp, left))
case Cross => join.copy(left = maybePushLocalLimit(exp, left),
right = maybePushLocalLimit(exp, right))
case _ => join
}
LocalLimit(exp, newJoin)
Expand Down
23 changes: 22 additions & 1 deletion sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/LimitPushdownSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import org.apache.spark.sql.catalyst.analysis.EliminateSubqueryAliases
import org.apache.spark.sql.catalyst.dsl.expressions._
import org.apache.spark.sql.catalyst.dsl.plans._
import org.apache.spark.sql.catalyst.expressions.Add
import org.apache.spark.sql.catalyst.plans.{FullOuter, LeftOuter, PlanTest, RightOuter}
import org.apache.spark.sql.catalyst.plans.{Cross, FullOuter, LeftOuter, PlanTest, RightOuter}
import org.apache.spark.sql.catalyst.plans.logical._
import org.apache.spark.sql.catalyst.rules._

Expand Down Expand Up @@ -171,4 +171,25 @@ class LimitPushdownSuite extends PlanTest {
// No pushdown for FULL OUTER JOINS.
comparePlans(optimized, originalQuery)
}

test("cross join") {
val originalQuery = x.join(y, Cross).limit(1)
val optimized = Optimize.execute(originalQuery.analyze)
val correctAnswer = Limit(1, LocalLimit(1, x).join(LocalLimit(1, y), Cross)).analyze
comparePlans(optimized, correctAnswer)
}

test("cross join and left sides are limited") {
val originalQuery = x.limit(2).join(y, Cross).limit(1)
val optimized = Optimize.execute(originalQuery.analyze)
val correctAnswer = Limit(1, LocalLimit(1, x).join(LocalLimit(1, y), Cross)).analyze
comparePlans(optimized, correctAnswer)
}

test("cross join and right sides are limited") {
val originalQuery = x.join(y.limit(2), Cross).limit(1)
val optimized = Optimize.execute(originalQuery.analyze)
val correctAnswer = Limit(1, LocalLimit(1, x).join(LocalLimit(1, y), Cross)).analyze
comparePlans(optimized, correctAnswer)
}
}