Merge branch 'master' of github.com:apache/spark into gen_defer

Conflicts:
	sql/core/src/main/scala/org/apache/spark/sql/execution/WholeStageCodegen.scala

sql/core/src/main/scala/org/apache/spark/sql/execution/WholeStageCodegen.scala

@@ -236,8 +236,8 @@ case class InputAdapter(child: SparkPlan) extends LeafNode with CodegenSupport {
     ctx.currentVars = null
     val columns = exprs.map(_.gen(ctx))
     s"""
-       | while (!shouldStop() && input.hasNext()) {
-       |   InternalRow $row = (InternalRow) input.next();
+       | while (!shouldStop() && $input.hasNext()) {
+       |   InternalRow $row = (InternalRow) $input.next();
        |   ${consume(ctx, columns).trim}
        | }
      """.stripMargin
@@ -371,7 +371,7 @@ case class WholeStageCodegen(plan: CodegenSupport, children: Seq[SparkPlan])
     if (row != null) {
       // There is an UnsafeRow already
       s"""
-         |currentRows.add($row.copy());
+         |append($row.copy());
        """.stripMargin
     } else {
       assert(input != null)
@@ -386,12 +386,12 @@ case class WholeStageCodegen(plan: CodegenSupport, children: Seq[SparkPlan])
         s"""
            |$evaluateInputs
            |${code.code.trim}
-           |currentRows.add(${code.value}.copy());
+           |append(${code.value}.copy());
          """.stripMargin
       } else {
         // There is no columns
         s"""
-           |currentRows.add(unsafeRow);
+           |append(unsafeRow);
          """.stripMargin
       }
     }