From 3912f8456dbfcabcff80e00da893ef4f0b13b379 Mon Sep 17 00:00:00 2001 From: Wenchen Fan Date: Fri, 17 Jul 2015 02:14:35 +0800 Subject: [PATCH] address comments --- .../org/apache/spark/sql/catalyst/optimizer/Optimizer.scala | 2 +- .../spark/sql/catalyst/optimizer/FilterPushdownSuite.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala index 1c45a73a6f01a..d448e0db7d1be 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala @@ -516,7 +516,7 @@ object PushPredicateThroughProject extends Rule[LogicalPlan] { def apply(plan: LogicalPlan): LogicalPlan = plan transform { case filter @ Filter(condition, project @ Project(fields, grandChild)) => // Create a map of Aliases to their values from the child projection. - // e.g., 'SELECT a + b AS c, d ...' produces Map(c -> Alias(a + b, c)). + // e.g., 'SELECT a + b AS c, d ...' produces Map(c -> a + b). val aliasMap = AttributeMap(fields.collect { case a: Alias => (a.toAttribute, a.child) }) diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala index 368d552924920..79d70f615b01c 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala @@ -148,8 +148,8 @@ class FilterPushdownSuite extends PlanTest { test("nondeterministic: can't push down filter through project") { val originalQuery = testRelation - .select(Rand(10).as('rand)) - .where('rand > 5) + .select(Rand(10).as('rand), 'a) + .where('rand > 5 && 'a > 5) .analyze val optimized = Optimize.execute(originalQuery)