fix.

apache · Dec 18, 2017 · 4ec9a37 · 4ec9a37
1 parent 0c8fca4
commit 4ec9a37
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
@@ -222,22 +222,20 @@ class Analyzer(
  */
  object ResolveAliases extends Rule[LogicalPlan] {
  private def assignAliases(exprs: Seq[NamedExpression]) = {
- exprs.zipWithIndex.map {
- case (expr, i) =>
- expr.transformUp { case u @ UnresolvedAlias(child, optGenAliasFunc) =>
- child match {
- case ne: NamedExpression => ne
- case go @ GeneratorOuter(g: Generator) if g.resolved => MultiAlias(go, Nil)
- case e if !e.resolved => u
- case g: Generator => MultiAlias(g, Nil)
- case c @ Cast(ne: NamedExpression, _, _) => Alias(c, ne.name)()
- case e: ExtractValue => Alias(e, toPrettySQL(e))()
- case e if optGenAliasFunc.isDefined =>
- Alias(child, optGenAliasFunc.get.apply(e))()
- case e => Alias(e, toPrettySQL(e))()
- }
+ exprs.map(_.transformUp { case u @ UnresolvedAlias(child, optGenAliasFunc) =>
+ child match {
+ case ne: NamedExpression => ne
+ case go @ GeneratorOuter(g: Generator) if g.resolved => MultiAlias(go, Nil)
+ case e if !e.resolved => u
+ case g: Generator => MultiAlias(g, Nil)
+ case c @ Cast(ne: NamedExpression, _, _) => Alias(c, ne.name)()
+ case e: ExtractValue => Alias(e, toPrettySQL(e))()
+ case e if optGenAliasFunc.isDefined =>
+ Alias(child, optGenAliasFunc.get.apply(e))()
+ case e => Alias(e, toPrettySQL(e))()
  }
- }.asInstanceOf[Seq[NamedExpression]]
+ }
+ ).asInstanceOf[Seq[NamedExpression]]
  }
 
  private def hasUnresolvedAlias(exprs: Seq[NamedExpression]) =