Skip to content
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

[SPARK-7225][SQL] CombineLimits optimizer does not work #5770

Closed
wants to merge 16 commits into from
Closed

[SPARK-7225][SQL] CombineLimits optimizer does not work #5770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c3f046f
Merge pull request #1 from apache/master
pzzs Mar 2, 2015
cb1852d
Merge pull request #2 from apache/master
pzzs Mar 5, 2015
c87e8b6
Merge pull request #3 from apache/master
pzzs Mar 10, 2015
161cae3
Merge pull request #4 from apache/master
pzzs Mar 12, 2015
98b134f
Merge pull request #5 from apache/master
pzzs Mar 19, 2015
d00303b
Merge pull request #6 from apache/master
pzzs Mar 24, 2015
802261c
Merge pull request #7 from apache/master
pzzs Mar 26, 2015
34b1a9a
Merge pull request #8 from apache/master
pzzs Apr 8, 2015
f61210c
Merge pull request #9 from apache/master
pzzs Apr 17, 2015
f12fa50
Merge pull request #10 from apache/master
pzzs Apr 21, 2015
f03fe7f
Merge pull request #12 from apache/master
pzzs Apr 29, 2015
e2a491d
Update Optimizer.scala
pzzs Apr 29, 2015
7db4566
Update CombiningLimitsSuite.scala
pzzs Apr 29, 2015
19ab875
Update CombiningLimitsSuite.scala
pzzs Apr 29, 2015
97e18cf
Update Optimizer.scala
pzzs Apr 30, 2015
c68eaa7
Update CombiningLimitsSuite.scala
pzzs Apr 30, 2015
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
15 changes: 7 additions & 8 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 @@ -36,7 +36,13 @@ object DefaultOptimizer extends Optimizer {
// SubQueries are only needed for analysis and can be removed before execution.
Batch("Remove SubQueries", FixedPoint(100),
EliminateSubQueries) ::
Batch("Combine Limits", FixedPoint(100),
Batch("Operator Reordering", FixedPoint(100),
UnionPushdown,
CombineFilters,
PushPredicateThroughProject,
PushPredicateThroughJoin,
PushPredicateThroughGenerate,
ColumnPruning,
CombineLimits) ::
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead, can we just move CombineLimits down into the Filter Pushdown batch?

Copy link
Contributor

Choose a reason for hiding this comment

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

(and rename "Filter Pushdown" into "Operator Reordering")

Batch("ConstantFolding", FixedPoint(100),
NullPropagation,
Expand All @@ -49,13 +55,6 @@ object DefaultOptimizer extends Optimizer {
OptimizeIn) ::
Batch("Decimal Optimizations", FixedPoint(100),
DecimalAggregates) ::
Batch("Filter Pushdown", FixedPoint(100),
UnionPushdown,
CombineFilters,
PushPredicateThroughProject,
PushPredicateThroughJoin,
PushPredicateThroughGenerate,
ColumnPruning) ::
Batch("LocalRelation", FixedPoint(100),
ConvertToLocalRelation) :: Nil
}
Expand Down
19 changes: 19 additions & 0 deletions ...atalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/CombiningLimitsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ class CombiningLimitsSuite extends PlanTest {

object Optimize extends RuleExecutor[LogicalPlan] {
val batches =
Batch("Filter Pushdown", FixedPoint(100),
ColumnPruning) ::
Batch("Combine Limit", FixedPoint(10),
CombineLimits) ::
Batch("Constant Folding", FixedPoint(10),
Expand Down Expand Up @@ -69,4 +71,21 @@ class CombiningLimitsSuite extends PlanTest {

comparePlans(optimized, correctAnswer)
}

test("limits: combines two limits after ColumnPruning") {
val originalQuery =
testRelation
.select('a)
.limit(2)
.select('a)
.limit(5)

val optimized = Optimize.execute(originalQuery.analyze)
val correctAnswer =
testRelation
.select('a)
.limit(2).analyze

comparePlans(optimized, correctAnswer)
}
}