Make sortAnswers = false the default in SparkPlanTest

Author: JoshRosen

sql/core/src/test/scala/org/apache/spark/sql/execution/SparkPlanTest.scala

@@ -53,7 +53,7 @@ class SparkPlanTest extends SparkFunSuite {
       input: DataFrame,
       planFunction: SparkPlan => SparkPlan,
       expectedAnswer: Seq[Row],
-      sortAnswers: Boolean): Unit = {
+      sortAnswers: Boolean = true): Unit = {
     checkAnswer(
       input :: Nil,
       (plans: Seq[SparkPlan]) => planFunction(plans.head),
@@ -76,7 +76,7 @@ class SparkPlanTest extends SparkFunSuite {
       right: DataFrame,
       planFunction: (SparkPlan, SparkPlan) => SparkPlan,
       expectedAnswer: Seq[Row],
-      sortAnswers: Boolean): Unit = {
+      sortAnswers: Boolean = true): Unit = {
     checkAnswer(
       left :: right :: Nil,
       (plans: Seq[SparkPlan]) => planFunction(plans(0), plans(1)),
@@ -97,7 +97,7 @@ class SparkPlanTest extends SparkFunSuite {
       input: Seq[DataFrame],
       planFunction: Seq[SparkPlan] => SparkPlan,
       expectedAnswer: Seq[Row],
-      sortAnswers: Boolean): Unit = {
+      sortAnswers: Boolean = true): Unit = {
     SparkPlanTest.checkAnswer(input, planFunction, expectedAnswer, sortAnswers) match {
       case Some(errorMessage) => fail(errorMessage)
       case None =>
@@ -117,7 +117,7 @@ class SparkPlanTest extends SparkFunSuite {
       input: DataFrame,
       planFunction: SparkPlan => SparkPlan,
       expectedAnswer: Seq[A],
-      sortAnswers: Boolean): Unit = {
+      sortAnswers: Boolean = true): Unit = {
     val expectedRows = expectedAnswer.map(Row.fromTuple)
     checkAnswer(input, planFunction, expectedRows, sortAnswers)
   }
@@ -137,7 +137,7 @@ class SparkPlanTest extends SparkFunSuite {
       right: DataFrame,
       planFunction: (SparkPlan, SparkPlan) => SparkPlan,
       expectedAnswer: Seq[A],
-      sortAnswers: Boolean): Unit = {
+      sortAnswers: Boolean = true): Unit = {
     val expectedRows = expectedAnswer.map(Row.fromTuple)
     checkAnswer(left, right, planFunction, expectedRows, sortAnswers)
   }
@@ -155,7 +155,7 @@ class SparkPlanTest extends SparkFunSuite {
       input: Seq[DataFrame],
       planFunction: Seq[SparkPlan] => SparkPlan,
       expectedAnswer: Seq[A],
-      sortAnswers: Boolean): Unit = {
+      sortAnswers: Boolean = true): Unit = {
     val expectedRows = expectedAnswer.map(Row.fromTuple)
     checkAnswer(input, planFunction, expectedRows, sortAnswers)
   }
@@ -176,7 +176,7 @@ class SparkPlanTest extends SparkFunSuite {
       input: DataFrame,
       planFunction: SparkPlan => SparkPlan,
       expectedPlanFunction: SparkPlan => SparkPlan,
-      sortAnswers: Boolean): Unit = {
+      sortAnswers: Boolean = true): Unit = {
     SparkPlanTest.checkAnswer(input, planFunction, expectedPlanFunction, sortAnswers) match {
       case Some(errorMessage) => fail(errorMessage)
       case None =>

sql/core/src/test/scala/org/apache/spark/sql/execution/joins/OuterJoinSuite.scala

@@ -47,17 +47,15 @@ class OuterJoinSuite extends SparkPlanTest {
         (1, 2.0, null, null),
         (2, 1.0, 2, 3.0),
         (3, 3.0, null, null)
-      ),
-      sortAnswers = true)
+      ))
 
     checkAnswer(left, right, (left: SparkPlan, right: SparkPlan) =>
       ShuffledHashOuterJoin(leftKeys, rightKeys, RightOuter, condition, left, right),
       Seq(
         (2, 1.0, 2, 3.0),
         (null, null, 3, 2.0),
         (null, null, 4, 1.0)
-      ),
-      sortAnswers = true)
+      ))
 
     checkAnswer(left, right, (left: SparkPlan, right: SparkPlan) =>
       ShuffledHashOuterJoin(leftKeys, rightKeys, FullOuter, condition, left, right),
@@ -67,8 +65,7 @@ class OuterJoinSuite extends SparkPlanTest {
         (3, 3.0, null, null),
         (null, null, 3, 2.0),
         (null, null, 4, 1.0)
-      ),
-      sortAnswers = true)
+      ))
   }
 
   test("broadcast hash outer join") {
@@ -78,16 +75,14 @@ class OuterJoinSuite extends SparkPlanTest {
         (1, 2.0, null, null),
         (2, 1.0, 2, 3.0),
         (3, 3.0, null, null)
-      ),
-      sortAnswers = true)
+      ))
 
     checkAnswer(left, right, (left: SparkPlan, right: SparkPlan) =>
       BroadcastHashOuterJoin(leftKeys, rightKeys, RightOuter, condition, left, right),
       Seq(
         (2, 1.0, 2, 3.0),
         (null, null, 3, 2.0),
         (null, null, 4, 1.0)
-      ),
-      sortAnswers = true)
+      ))
   }
 }