From 3a0184d15d987e4fd1141d292d61efe054a3e3df Mon Sep 17 00:00:00 2001 From: Almog Tavor <70065337+almogtavor@users.noreply.github.com> Date: Fri, 23 Jul 2021 12:46:31 -0500 Subject: [PATCH] [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 <70065337+almogtavor@users.noreply.github.com> Signed-off-by: Sean Owen (cherry picked from commit 530c8addbb69d64370e6b27a8f19e77a951de25f) Signed-off-by: Sean Owen --- .../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 f6ab78b1ab7d4..088ff388ea7ec 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 boolean equals(Object other) { 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;