Skip to content

Commit efd58ed

Browse files
committed
Remove extraneous blank line added during conflict resolution
1 parent bcc43d1 commit efd58ed

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

sql/core/src/main/scala/org/apache/spark/sql/execution/exchange/ShuffleExchange.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ object ShuffleExchange {
259259
//
260260
// Note that we don't perform local sort if the new partitioning has only 1 partition, under
261261
// that case all output rows go to the same partition.
262-
263262
val newRdd = if (isRoundRobin && SparkEnv.get.conf.get(SQLConf.SORT_BEFORE_REPARTITION)) {
264263
rdd.mapPartitionsInternal { iter =>
265264
val recordComparatorSupplier = new Supplier[RecordComparator] {

0 commit comments

Comments
 (0)