This is an automated email from the ASF dual-hosted git repository.
srowen pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 3a0184d [SPARK-36273][SHUFFLE] Fix identical values comparison
3a0184d is described below
commit 3a0184d15d987e4fd1141d292d61efe054a3e3df
Author: Almog Tavor <[email protected]>
AuthorDate: Fri Jul 23 12:46:31 2021 -0500
[SPARK-36273][SHUFFLE] Fix identical values comparison
This commit fixes the use of the "o.appAttemptId" variable instead of the
mistaken "appAttemptId" variable. The current situation is a comparison of
identical values. Jira issue report SPARK-36273.
### What changes were proposed in this pull request?
This is a patch for SPARK-35546 which is needed for push-based shuffle.
### Why are the changes needed?
A very minor fix of adding the reference from the other
"FinalizeShuffleMerge".
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
No unit tests were added. It's a pretty logical change.
Closes #33493 from almogtavor/patch-1.
Authored-by: Almog Tavor <[email protected]>
Signed-off-by: Sean Owen <[email protected]>
(cherry picked from commit 530c8addbb69d64370e6b27a8f19e77a951de25f)
Signed-off-by: Sean Owen <[email protected]>
---
.../org/apache/spark/network/shuffle/protocol/FinalizeShuffleMerge.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/FinalizeShuffleMerge.java
b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/FinalizeShuffleMerge.java
index f6ab78b..088ff38 100644
---
a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/FinalizeShuffleMerge.java
+++
b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/FinalizeShuffleMerge.java
@@ -68,7 +68,7 @@ public class FinalizeShuffleMerge extends
BlockTransferMessage {
if (other != null && other instanceof FinalizeShuffleMerge) {
FinalizeShuffleMerge o = (FinalizeShuffleMerge) other;
return Objects.equal(appId, o.appId)
- && appAttemptId == appAttemptId
+ && appAttemptId == o.appAttemptId
&& shuffleId == o.shuffleId;
}
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
