Skip to content

[SPARK-25352][SQL][Followup] Add helper method and address style issue #22409

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 1 commit into from
Closed

[SPARK-25352][SQL][Followup] Add helper method and address style issue #22409

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 23 additions & 32 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,44 +66,35 @@ abstract class SparkStrategies extends QueryPlanner[SparkPlan] {
* Plans special cases of limit operators.
*/
object SpecialLimits extends Strategy {
override def apply(plan: LogicalPlan): Seq[SparkPlan] = plan match {
case ReturnAnswer(rootPlan) => rootPlan match {
case Limit(IntegerLiteral(limit), s@Sort(order, true, child)) =>
if (limit < conf.topKSortFallbackThreshold) {
private def decideTopRankNode(limit: Int, child: LogicalPlan): Seq[SparkPlan] = {
if (limit < conf.topKSortFallbackThreshold) {
child match {
case Sort(order, true, child) =>
TakeOrderedAndProjectExec(limit, order, child.output, planLater(child)) :: Nil
} else {
GlobalLimitExec(limit,
LocalLimitExec(limit, planLater(s)),
orderedLimit = true) :: Nil
}
case Limit(IntegerLiteral(limit), p@Project(projectList, Sort(order, true, child))) =>
if (limit < conf.topKSortFallbackThreshold) {
case Project(projectList, Sort(order, true, child)) =>
TakeOrderedAndProjectExec(limit, order, projectList, planLater(child)) :: Nil
} else {
GlobalLimitExec(limit,
LocalLimitExec(limit, planLater(p)),
orderedLimit = true) :: Nil
}
}
} else {
GlobalLimitExec(limit,
LocalLimitExec(limit, planLater(child)),
orderedLimit = true) :: Nil
}
}

override def apply(plan: LogicalPlan): Seq[SparkPlan] = plan match {
case ReturnAnswer(rootPlan) => rootPlan match {
case Limit(IntegerLiteral(limit), s @ Sort(order, true, child)) =>
decideTopRankNode(limit, s)
case Limit(IntegerLiteral(limit), p @ Project(projectList, Sort(order, true, child))) =>
decideTopRankNode(limit, p)
case Limit(IntegerLiteral(limit), child) =>
CollectLimitExec(limit, planLater(child)) :: Nil
case other => planLater(other) :: Nil
}
case Limit(IntegerLiteral(limit), s@Sort(order, true, child)) =>
if (limit < conf.topKSortFallbackThreshold) {
TakeOrderedAndProjectExec(limit, order, child.output, planLater(child)) :: Nil
} else {
GlobalLimitExec(limit,
LocalLimitExec(limit, planLater(s)),
orderedLimit = true) :: Nil
}
case Limit(IntegerLiteral(limit), p@Project(projectList, Sort(order, true, child))) =>
if (limit < conf.topKSortFallbackThreshold) {
TakeOrderedAndProjectExec(limit, order, projectList, planLater(child)) :: Nil
} else {
GlobalLimitExec(limit,
LocalLimitExec(limit, planLater(p)),
orderedLimit = true) :: Nil
}
case Limit(IntegerLiteral(limit), s @ Sort(order, true, child)) =>
decideTopRankNode(limit, s)
case Limit(IntegerLiteral(limit), p @ Project(projectList, Sort(order, true, child))) =>
decideTopRankNode(limit, p)
case _ => Nil
}
}
Expand Down