resolve the rebase issue

JkSelf · JkSelf · commit 18cdcd98771d · 2019-12-03T10:45:37.000+08:00
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/adaptive/AdaptiveQueryExecSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/adaptive/AdaptiveQueryExecSuite.scala
@@ -721,7 +721,7 @@ class AdaptiveQueryExecSuite
       //       +- ShuffleQueryStage
 
       val smjAfter = findTopLevelSortMergeJoin(adaptivePlan)
-      assert(smjAfter.size == 6)
+      assert(smjAfter.size == 5)
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -721,7 +721,7 @@ class AdaptiveQueryExecSuite`
`721`	`721`	`// +- ShuffleQueryStage`
`722`	`722`
`723`	`723`	`val smjAfter = findTopLevelSortMergeJoin(adaptivePlan)`
`724`		`- assert(smjAfter.size == 6)`
	`724`	`+ assert(smjAfter.size == 5)`
`725`	`725`	`}`
`726`	`726`	`}`
`727`	`727`	`}`