Clean up

Signed-off-by: Karen Feng <[email protected]>

Author: karenfeng

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala

@@ -111,8 +111,10 @@ case class Generate(
 
   val unrequiredSet: Set[Int] = unrequiredChildIndex.toSet
 
-  lazy val requiredChildOutput: Seq[Attribute] =
+  lazy val requiredChildOutput: Seq[Attribute] = {
+    val unrequiredSet = unrequiredChildIndex.toSet
     child.output.zipWithIndex.filterNot(t => unrequiredSet.contains(t._2)).map(_._1)
+  }
 
   override lazy val resolved: Boolean = {
     generator.resolved &&
@@ -136,8 +138,7 @@ case class Generate(
   }
 
   def output: Seq[Attribute] = requiredChildOutput ++ qualifiedGeneratorOutput
-  override def metadataOutput: Seq[Attribute] =
-    child.metadataOutput.zipWithIndex.filterNot(t => unrequiredSet.contains(t._2)).map(_._1)
+  override def metadataOutput: Seq[Attribute] = child.metadataOutput
 }
 
 case class Filter(condition: Expression, child: LogicalPlan)
@@ -376,7 +377,7 @@ case class Join(
 
   override def metadataOutput: Seq[Attribute] = {
     joinType match {
-      case j: ExistenceJoin =>
+      case ExistenceJoin(_) =>
         left.metadataOutput
       case LeftExistence(_) =>
         left.metadataOutput