Skip to content

[SPARK-13840] [SQL] Split Optimizer Rule ColumnPruning to ColumnPruning and EliminateOperator #11682

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

[SPARK-13840] [SQL] Split Optimizer Rule ColumnPruning to ColumnPruning and EliminateOperator #11682

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e128a0a
Disable Project Push Down Through Filter
gatorsmile Mar 13, 2016
e5e00ae
fixed test cases.
gatorsmile Mar 14, 2016
dd8c542
split columnpruning to two rules
gatorsmile Mar 14, 2016
99a7164
Merge remote-tracking branch 'upstream/master' into viewDuplicateNames
gatorsmile Mar 14, 2016
608b901
fix stackoverflow
gatorsmile Mar 14, 2016
c7c5f43
revert the change in OrcFilterSuite back.
gatorsmile Mar 14, 2016
f1eee03
change the test case name back
gatorsmile Mar 14, 2016
adf64da
revert the test case back
gatorsmile Mar 14, 2016
bc4685a
rename.
gatorsmile Mar 15, 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
Next Next commit
Disable Project Push Down Through Filter
  • Loading branch information
@gatorsmile
gatorsmile committed Mar 13, 2016
commit e128a0a3d23b7a6a37cdc77034a651d79e32c451
3 changes: 3 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 @@ -355,6 +355,9 @@ object ColumnPruning extends Rule[LogicalPlan] {
case j @ Join(left, right, LeftSemi, condition) =>
j.copy(right = prunedChild(right, j.references))

// Project should not be pushed below Filter. See PushPredicateThroughProject
case p @ Project(_, _: Filter) => p

// all the columns will be used to compare, so we can't prune them
case p @ Project(_, _: SetOperation) => p
case p @ Project(_, _: Distinct) => p
Expand Down
9 changes: 4 additions & 5 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/ColumnPruningSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,12 @@ class ColumnPruningSuite extends PlanTest {
comparePlans(optimized, expected)
}

test("Column pruning on Filter") {
test("No column pruning on Filter") {
val input = LocalRelation('a.int, 'b.string, 'c.double)
val query = Project('a :: Nil, Filter('c > Literal(0.0), input)).analyze
val expected =
Project('a :: Nil,
Filter('c > Literal(0.0),
Project(Seq('a, 'c), input))).analyze
Filter('c > Literal(0.0), input)).analyze
comparePlans(Optimize.execute(query), expected)
}

Expand Down Expand Up @@ -287,7 +286,7 @@ class ColumnPruningSuite extends PlanTest {
AggregateExpression(Count('b), Complete, isDistinct = false),
WindowSpecDefinition( 'a :: Nil,
SortOrder('b, Ascending) :: Nil,
UnspecifiedFrame)).as('window)).where('window > 1).select('a, 'c)
UnspecifiedFrame)).as('window)).select('a, 'c, 'window)

val correctAnswer =
input.select('a, 'b, 'c)
Expand All @@ -297,7 +296,7 @@ class ColumnPruningSuite extends PlanTest {
SortOrder('b, Ascending) :: Nil,
UnspecifiedFrame)).as('window) :: Nil,
'a :: Nil, 'b.asc :: Nil)
.select('a, 'c, 'window).where('window > 1).select('a, 'c).analyze
.select('a, 'c, 'window).analyze

val optimized = Optimize.execute(originalQuery.analyze)

Expand Down