rename

DonnyZone · DonnyZone · commit b08fd9301cdb · 2017-09-12T17:34:53.000+08:00
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
@@ -314,7 +314,7 @@ class Analyzer(
                 s"grouping columns (${groupByExprs.mkString(",")})")
           }
         case e @ Grouping(col: Expression) =>
-          val idx = groupByExprs.indexWhere(e => resolver(e.toString, col.toString))
+          val idx = groupByExprs.indexWhere(x => resolver(x.toString, col.toString))
           if (idx >= 0) {
             Alias(Cast(BitwiseAnd(ShiftRight(gid, Literal(groupByExprs.length - 1 - idx)),
               Literal(1)), ByteType), toPrettySQL(e))()

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ class Analyzer(`
`314`	`314`	`s"grouping columns (${groupByExprs.mkString(",")})")`
`315`	`315`	`}`
`316`	`316`	`case e @ Grouping(col: Expression) =>`
`317`		`- val idx = groupByExprs.indexWhere(e => resolver(e.toString, col.toString))`
	`317`	`+ val idx = groupByExprs.indexWhere(x => resolver(x.toString, col.toString))`
`318`	`318`	`if (idx >= 0) {`
`319`	`319`	`Alias(Cast(BitwiseAnd(ShiftRight(gid, Literal(groupByExprs.length - 1 - idx)),`
`320`	`320`	`Literal(1)), ByteType), toPrettySQL(e))()`