[spark] branch master updated: [SPARK-36273][SHUFFLE] Fix identical values comparison

[srowen]

This is an automated email from the ASF dual-hosted git repository.

srowen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new 530c8ad  [SPARK-36273][SHUFFLE] Fix identical values comparison
530c8ad is described below

commit 530c8addbb69d64370e6b27a8f19e77a951de25f
Author: Almog Tavor <70065337+almogta...@users.noreply.github.com>
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 <70065337+almogta...@users.noreply.github.com>
    Signed-off-by: Sean Owen <sro...@gmail.com>
---
 .../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: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org