Skip to content

Commit 51c47ca

Browse files
committed
update andrewor's comments
1 parent 2b27b19 commit 51c47ca

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockResolver.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,9 @@ public ManagedBuffer getBlockData(String appId, String execId, String blockId) {
108108

109109
if ("org.apache.spark.shuffle.hash.HashShuffleManager".equals(executor.shuffleManager)) {
110110
return getHashBasedShuffleBlockData(executor, blockId);
111-
} else if ("org.apache.spark.shuffle.sort.SortShuffleManager".equals(executor.shuffleManager)) {
111+
} else if ("org.apache.spark.shuffle.sort.SortShuffleManager".equals(executor.shuffleManager)
112+
|| "org.apache.spark.shuffle.unsafe.UnsafeShuffleManager".equals(executor.shuffleManager)) {
112113
return getSortBasedShuffleBlockData(executor, shuffleId, mapId, reduceId);
113-
} else if ("org.apache.spark.shuffle.unsafe.UnsafeShuffleManager".equals(
114-
executor.shuffleManager)) {
115-
return getSortBasedShuffleBlockData(executor, shuffleId, mapId, reduceId);
116114
} else {
117115
throw new UnsupportedOperationException(
118116
"Unsupported shuffle manager: " + executor.shuffleManager);

0 commit comments

Comments
 (0)