otterc commented on a change in pull request #35325: URL: https://github.com/apache/spark/pull/35325#discussion_r792983163
########## File path: common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/RemoteBlockPushResolver.java ########## @@ -1008,19 +995,28 @@ AppShufflePartitionInfo getPartitionInfo() { * required for the shuffles of indeterminate stages. */ public static class AppShuffleMergePartitionsInfo { + // ConcurrentHashMap doesn't allow null for keys or values which is why this is required. + // Marker to identify finalized indeterminate shuffle partitions in the case of indeterminate + // stage retries. + @VisibleForTesting + public static final Map<Integer, AppShufflePartitionInfo> SHUFFLE_FINALIZED_MARKER = + Collections.emptyMap(); private final int shuffleMergeId; - private final Map<Integer, AppShufflePartitionInfo> shuffleMergePartitions; + private final Map<Integer, AppShufflePartitionInfo> mergePartitions; Review comment: reverted the rename -- 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: reviews-unsubscr...@spark.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org