add qualifier only for generator output

apache · Apr 17, 2015 · 04ae500 · 04ae500
1 parent 5ee5d2c
commit 04ae500
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala
@@ -69,12 +69,12 @@ case class Generate(
   override def expressions: Seq[Expression] = generator :: Nil
 
   def output: Seq[Attribute] = {
-    val withoutQualifier = if (join) child.output ++ generatorOutput else generatorOutput
-
-    qualifier.map(q =>
+    val qualified = qualifier.map(q =>
       // prepend the new qualifier to the existed one
-      withoutQualifier.map(a => a.withQualifiers(q +: a.qualifiers))
-    ).getOrElse(withoutQualifier)
+      generatorOutput.map(a => a.withQualifiers(q +: a.qualifiers))
+    ).getOrElse(generatorOutput)
+
+    if (join) child.output ++ qualified else qualified
   }
 }