SPARK-6489: explode optimize add project child plan in unittest

Author: dreamquster

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala

@@ -171,10 +171,13 @@ object ColumnPruning extends Rule[LogicalPlan] {
 
       Project(substitutedProjection, child)
 
-    case gen@Generate(generator: Explode, isJoin, isOuter, alias, child) =>
+    case gen@Generate(_: Explode, _, _, _, c) =>
       val allReferences = gen.references ++ gen.parentReferences
-      val pruneProject = prunedChild(child, allReferences)
-      Generate(generator, isJoin, isOuter, alias, pruneProject)
+      if ((c.outputSet -- allReferences.filter(c.outputSet.contains)).nonEmpty) {
+        gen.copy(child = Project(allReferences.filter(c.outputSet.contains).toSeq, c))
+      } else {
+        gen
+      }
 
     // Eliminate no-op Projects
     case Project(projectList, child) if child.output == projectList => child

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala

@@ -460,6 +460,7 @@ class FilterPushdownSuite extends PlanTest {
     val correctAnswer = {
       testRelationWithArrayType
         .where(('b >= 5) && ('a > 6))
+        .select('c_arr)
         .generate(Explode(Seq("c"), 'c_arr), true, false, Some("arr")).analyze
     }
 
@@ -477,6 +478,7 @@ class FilterPushdownSuite extends PlanTest {
     val referenceResult = {
       testRelationWithArrayType
         .where('b >= 5)
+        .select('c_arr)
         .generate(generator, true, false, Some("arr"))
         .where('c > 6).analyze
     }
@@ -502,7 +504,12 @@ class FilterPushdownSuite extends PlanTest {
         .where(('c > 6) || ('b > 5)).analyze
     }
     val optimized = Optimize(originalQuery)
-
-    comparePlans(optimized, originalQuery)
+    val correctAnswer = {
+      testRelationWithArrayType
+        .select('c_arr,'b)
+        .generate(Explode(Seq("c"), 'c_arr), true, false, Some("arr"))
+        .where(('c > 6) || ('b > 5)).analyze
+    }
+    comparePlans(optimized, correctAnswer)
   }
 }

sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/PruningSuite.scala

@@ -94,9 +94,10 @@ class PruningSuite extends HiveComparisonTest with BeforeAndAfter {
     Seq.empty)
 
   createPruningTest("Column pruning - outer explode with limit",
-    "SELECT name FROM person LATERAL VIEW OUTER explode(data) outd AS d limit 3",
+    "SELECT name FROM person LATERAL VIEW OUTER explode(data) outd AS d" +
+      " where  name < \"C\" limit 3",
     Seq("name"),
-    Seq("data","name"),
+    Seq("data", "name"),
     Seq.empty)