Explicitly converting ArrayBuffer to Seq so that build with SBT succeeds

otterc · otterc · commit c658423807de · 2020-11-11T15:17:48.000-08:00
diff --git a/core/src/main/scala/org/apache/spark/shuffle/ShuffleWriter.scala b/core/src/main/scala/org/apache/spark/shuffle/ShuffleWriter.scala
@@ -389,7 +389,7 @@ private[spark] abstract class ShuffleWriter[K, V] extends Logging {
         } else {
           if (blocks.nonEmpty) {
             // Convert the previous batch into a PushRequest
-            requests += PushRequest(mergerLocs(currentMergerId), blocks,
+            requests += PushRequest(mergerLocs(currentMergerId), blocks.toSeq,
               createRequestBuffer(transportConf, dataFile, currentReqOffset, currentReqSize))
           }
           // Start a new batch
@@ -416,10 +416,10 @@ private[spark] abstract class ShuffleWriter[K, V] extends Logging {
     }
     // Add in the final request
     if (blocks.nonEmpty) {
-      requests += PushRequest(mergerLocs(currentMergerId), blocks,
+      requests += PushRequest(mergerLocs(currentMergerId), blocks.toSeq,
         createRequestBuffer(transportConf, dataFile, currentReqOffset, currentReqSize))
     }
-    requests
+    requests.toSeq
   }
 
   // Visible for testing

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ private[spark] abstract class ShuffleWriter[K, V] extends Logging {`
`389`	`389`	`} else {`
`390`	`390`	`if (blocks.nonEmpty) {`
`391`	`391`	`// Convert the previous batch into a PushRequest`
`392`		`- requests += PushRequest(mergerLocs(currentMergerId), blocks,`
	`392`	`+ requests += PushRequest(mergerLocs(currentMergerId), blocks.toSeq,`
`393`	`393`	`createRequestBuffer(transportConf, dataFile, currentReqOffset, currentReqSize))`
`394`	`394`	`}`
`395`	`395`	`// Start a new batch`
`@@ -416,10 +416,10 @@ private[spark] abstract class ShuffleWriter[K, V] extends Logging {`
`416`	`416`	`}`
`417`	`417`	`// Add in the final request`
`418`	`418`	`if (blocks.nonEmpty) {`
`419`		`- requests += PushRequest(mergerLocs(currentMergerId), blocks,`
	`419`	`+ requests += PushRequest(mergerLocs(currentMergerId), blocks.toSeq,`
`420`	`420`	`createRequestBuffer(transportConf, dataFile, currentReqOffset, currentReqSize))`
`421`	`421`	`}`
`422`		`- requests`
	`422`	`+ requests.toSeq`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`// Visible for testing`