fix conflict

Davies Liu · Davies Liu · commit 3293994f421b · 2016-03-01T11:06:16.000-08:00
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/WholeStageCodegenSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/WholeStageCodegenSuite.scala
@@ -68,7 +68,7 @@ class WholeStageCodegenSuite extends SparkPlanTest with SharedSQLContext {
     val plan = df.queryExecution.executedPlan
     assert(plan.find(p =>
       p.isInstanceOf[WholeStageCodegen] &&
-        p.asInstanceOf[WholeStageCodegen].plan.isInstanceOf[Sort]).isDefined)
+        p.asInstanceOf[WholeStageCodegen].child.isInstanceOf[Sort]).isDefined)
     assert(df.collect() === Array(Row(1), Row(2), Row(3)))
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class WholeStageCodegenSuite extends SparkPlanTest with SharedSQLContext {`
`68`	`68`	`val plan = df.queryExecution.executedPlan`
`69`	`69`	`assert(plan.find(p =>`
`70`	`70`	`p.isInstanceOf[WholeStageCodegen] &&`
`71`		`- p.asInstanceOf[WholeStageCodegen].plan.isInstanceOf[Sort]).isDefined)`
	`71`	`+ p.asInstanceOf[WholeStageCodegen].child.isInstanceOf[Sort]).isDefined)`
`72`	`72`	`assert(df.collect() === Array(Row(1), Row(2), Row(3)))`
`73`	`73`	`}`
`74`	`74`	`}`