Remove unneeded changes and code.

Author: marmbrus

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala

@@ -158,8 +158,8 @@ class Analyzer(catalog: Catalog, registry: FunctionRegistry, caseSensitive: Bool
    */
   object ImplicitGenerate extends Rule[LogicalPlan] {
     def apply(plan: LogicalPlan): LogicalPlan = plan transform {
-      case Project(Seq(Alias(g: Generator, alias)), child) =>
-        Generate(g, join = false, outer = false, Some(alias), child)
+      case Project(Seq(Alias(g: Generator, _)), child) =>
+        Generate(g, join = false, outer = false, None, child)
     }
   }
 

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala

@@ -259,7 +259,7 @@ trait HiveTypeCoercion {
       case Cast(e, BooleanType) if e.dataType != BooleanType => Not(EqualTo(e, Literal(0)))
       // Turn true into 1, and false into 0 if casting boolean into other types.
       case Cast(e, dataType) if e.dataType == BooleanType =>
-        If(e, Cast(Literal(1), dataType), Cast(Literal(0), dataType))
+        Cast(If(e, Literal(1), Literal(0)), dataType)
     }
   }
 

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/BoundAttribute.scala

@@ -62,7 +62,6 @@ class BindReferences[TreeNode <: QueryPlan[TreeNode]] extends Rule[TreeNode] {
     plan.transform {
       case n: NoBind => n.asInstanceOf[TreeNode]
       case leafNode if leafNode.children.isEmpty => leafNode
-      case nb: NoBind => nb.asInstanceOf[TreeNode]
       case unaryNode if unaryNode.children.size == 1 => unaryNode.transformExpressions { case e =>
         bindReference(e, unaryNode.children.head.output)
       }

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/GeneratedRow.scala

@@ -35,7 +35,7 @@ object GenerateMutableProjection extends CodeGenerator {
 
   // TODO: Safe to fire up multiple instances of the compiler?
   def apply(expressions: Seq[Expression]): () => MutableProjection =
-    CodeGeneration.synchronized {
+    globalLock.synchronized {
       val cleanedExpressions = expressions.map(ExpressionCanonicalizer(_))
       projectionCache.getOrElseUpdate(cleanedExpressions, createProjection(cleanedExpressions))
     }

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateMutableProjection.scala

@@ -31,7 +31,7 @@ object GenerateOrdering extends CodeGenerator {
   val orderingCache = new collection.mutable.HashMap[Seq[SortOrder], Ordering[Row]]
 
   // TODO: Safe to fire up multiple instances of the compiler?
-  def apply(ordering: Seq[SortOrder]): Ordering[Row] = CodeGeneration.synchronized {
+  def apply(ordering: Seq[SortOrder]): Ordering[Row] = globalLock.synchronized {
     val cleanedExpression = ordering.map(ExpressionCanonicalizer(_)).asInstanceOf[Seq[SortOrder]]
     orderingCache.getOrElseUpdate(cleanedExpression, createOrdering(cleanedExpression))
   }

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala

@@ -30,7 +30,7 @@ object GeneratePredicate extends CodeGenerator {
   val predicateCache = new collection.mutable.HashMap[Expression, (Row) => Boolean]
 
   // TODO: Safe to fire up multiple instances of the compiler?
-  def apply(predicate: Expression): (Row => Boolean) = CodeGeneration.synchronized {
+  def apply(predicate: Expression): (Row => Boolean) = globalLock.synchronized {
     val cleanedExpression = ExpressionCanonicalizer(predicate)
     predicateCache.getOrElseUpdate(cleanedExpression, createPredicate(cleanedExpression))
   }

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GeneratePredicate.scala

@@ -37,7 +37,7 @@ object GenerateProjection extends CodeGenerator {
     apply(expressions.map(BindReferences.bindReference(_, inputSchema)))
 
   // TODO: Safe to fire up multiple instances of the compiler?
-  def apply(expressions: Seq[Expression]): Projection = CodeGeneration.synchronized {
+  def apply(expressions: Seq[Expression]): Projection = globalLock.synchronized {
     val cleanedExpressions = expressions.map(ExpressionCanonicalizer(_))
     projectionCache.getOrElseUpdate(cleanedExpressions, createProjection(cleanedExpressions))
   }

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateProjection.scala

@@ -31,7 +31,7 @@ package object codegen {
    * A lock to protect invoking the scala compiler at runtime, since it is not thread safe in Scala
    * 2.10.
    */
-  protected val globalLock = new Object()
+  protected[codegen] val globalLock = new Object()
 
   /** Canonicalizes an expression so those that differ only by names can reuse the same code. */
   object ExpressionCanonicalizer extends rules.RuleExecutor[Expression] {

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/package.scala

@@ -56,11 +56,10 @@ case class Generate(
         val nullValues = Seq.fill(generator.output.size)(Literal(null))
         // Used to produce rows with no matches when outer = true.
         val outerProjection =
-          new InterpretedProjection(child.output ++ nullValues, child.output)
+          newProjection(child.output ++ nullValues, child.output)
 
         val joinProjection =
-          new InterpretedProjection(
-            child.output ++ generator.output, child.output ++ generator.output)
+          newProjection(child.output ++ generator.output, child.output ++ generator.output)
         val joinedRow = new JoinedRow
 
         iter.flatMap {row =>