mridulm commented on a change in pull request #34122:
URL: https://github.com/apache/spark/pull/34122#discussion_r785389352
##########
File path: core/src/main/scala/org/apache/spark/Dependency.scala
##########
@@ -106,7 +106,17 @@ class ShuffleDependency[K: ClassTag, V: ClassTag, C:
ClassTag](
// By default, shuffle merge is enabled for ShuffleDependency if push based
shuffle
// is enabled
- private[this] var _shuffleMergeEnabled = canShuffleMergeBeEnabled()
+ private[this] var _shuffleMergeAllowed = canShuffleMergeBeEnabled()
+
+ private[spark] def setShuffleMergeAllowed(shuffleMergeAllowed: Boolean):
Unit = {
+ _shuffleMergeAllowed = shuffleMergeAllowed
+ }
+
+ def shuffleMergeAllowed : Boolean = _shuffleMergeAllowed
+
+ // By default, shuffle merge is enabled for ShuffleDependency if push based
shuffle
+ // is enabled
+ private[this] var _shuffleMergeEnabled = shuffleMergeAllowed
private[spark] def setShuffleMergeEnabled(shuffleMergeEnabled: Boolean):
Unit = {
_shuffleMergeEnabled = shuffleMergeEnabled
Review comment:
With all the changes we have made, do we need this boolean ? Or will
`mergerLocs.nonEmpty` not do ? (`def shuffleMergeEnabled : Boolean =
mergerLocs.nonEmpty`)
Also, in `setShuffleMergeEnabled ` (if we are keeping it) or in
`setMergerLocs`, add`assert (! shuffleMergeEnabled || shuffleMergeAllowed)`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
