From 0a79d39a181c5ef44e40a7962745b74e4f05bdf3 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 6 Jul 2015 17:41:03 -0700
Subject: [PATCH] Revert "Undo part of a SparkPlanTest change in #7162 that
 broke my test."

This reverts commit 7c3c8643fb6e10c0e92ce9ef915cbd08d5f164e6.
---
 .../scala/org/apache/spark/sql/execution/SparkPlanTest.scala  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/SparkPlanTest.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/SparkPlanTest.scala
index 03650a02d5248..e72736d9e2691 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/SparkPlanTest.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/SparkPlanTest.scala
@@ -301,9 +301,7 @@ object SparkPlanTest {
     val resolvedPlan = TestSQLContext.prepareForExecution.execute(
       outputPlan transform {
         case plan: SparkPlan =>
-          val inputMap = plan.children.flatMap(_.output).zipWithIndex.map { case (a, i) =>
-            (a.name, BoundReference(i, a.dataType, a.nullable))
-          }.toMap
+          val inputMap = plan.children.flatMap(_.output).map(a => (a.name, a)).toMap
           plan.transformExpressions {
             case UnresolvedAttribute(Seq(u)) =>
               inputMap.getOrElse(u,