(incubator-uniffle) branch master updated: [#1373][FOLLOWUP] fix(spark): incorrect partition id type (#1582)

[zuston]

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

zuston pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git


The following commit(s) were added to refs/heads/master by this push:
     new c3c0c373a [#1373][FOLLOWUP] fix(spark): incorrect partition id type 
(#1582)
c3c0c373a is described below

commit c3c0c373ad694fa4a84361f734dbc70f42466f57
Author: dingshun3016 <dingshun...@163.com>
AuthorDate: Fri Mar 15 10:57:58 2024 +0800

    [#1373][FOLLOWUP] fix(spark): incorrect partition id type (#1582)
    
    ### What changes were proposed in this pull request?
    
    fix partition id type is incorrect
    
    ### Why are the changes needed?
    Fix: (#1373)
    
    ### Does this PR introduce _any_ user-facing change?
    No.
    
    ### How was this patch tested?
    Not necessary.
---
 .../src/main/java/org/apache/spark/shuffle/RssShuffleManager.java  | 7 ++++---
 .../src/main/java/org/apache/spark/shuffle/RssShuffleManager.java  | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/client-spark/spark2/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
 
b/client-spark/spark2/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
index 07e1a180b..501744298 100644
--- 
a/client-spark/spark2/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
+++ 
b/client-spark/spark2/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
@@ -898,16 +898,17 @@ public class RssShuffleManager extends 
RssShuffleManagerBase {
               ShuffleServerInfo newAssignedServer = 
assignShuffleServer(shuffleId, id);
               ShuffleHandleInfo shuffleHandleInfo = 
shuffleIdToShuffleHandleInfo.get(shuffleId);
               for (String partitionId : partitionIds) {
+                Integer partitionIdInteger = Integer.valueOf(partitionId);
                 List<ShuffleServerInfo> shuffleServerInfoList =
-                    shuffleHandleInfo.getPartitionToServers().get(partitionId);
+                    
shuffleHandleInfo.getPartitionToServers().get(partitionIdInteger);
                 for (int i = 0; i < shuffleServerInfoList.size(); i++) {
                   if 
(shuffleServerInfoList.get(i).getId().equals(faultyShuffleServerId)) {
                     shuffleHandleInfo
                         .getFailoverPartitionServers()
-                        .computeIfAbsent(Integer.valueOf(partitionId), k -> 
Maps.newHashMap());
+                        .computeIfAbsent(partitionIdInteger, k -> 
Maps.newHashMap());
                     shuffleHandleInfo
                         .getFailoverPartitionServers()
-                        .get(partitionId)
+                        .get(partitionIdInteger)
                         .computeIfAbsent(i, j -> Lists.newArrayList())
                         .add(newAssignedServer);
                   }
diff --git 
a/client-spark/spark3/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
 
b/client-spark/spark3/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
index 1f4a4cd0f..b360807b4 100644
--- 
a/client-spark/spark3/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
+++ 
b/client-spark/spark3/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
@@ -1190,16 +1190,17 @@ public class RssShuffleManager extends 
RssShuffleManagerBase {
               ShuffleServerInfo newAssignedServer = 
assignShuffleServer(shuffleId, id);
               ShuffleHandleInfo shuffleHandleInfo = 
shuffleIdToShuffleHandleInfo.get(shuffleId);
               for (String partitionId : partitionIds) {
+                Integer partitionIdInteger = Integer.valueOf(partitionId);
                 List<ShuffleServerInfo> shuffleServerInfoList =
-                    shuffleHandleInfo.getPartitionToServers().get(partitionId);
+                    
shuffleHandleInfo.getPartitionToServers().get(partitionIdInteger);
                 for (int i = 0; i < shuffleServerInfoList.size(); i++) {
                   if 
(shuffleServerInfoList.get(i).getId().equals(faultyShuffleServerId)) {
                     shuffleHandleInfo
                         .getFailoverPartitionServers()
-                        .computeIfAbsent(Integer.valueOf(partitionId), k -> 
Maps.newHashMap());
+                        .computeIfAbsent(partitionIdInteger, k -> 
Maps.newHashMap());
                     shuffleHandleInfo
                         .getFailoverPartitionServers()
-                        .get(partitionId)
+                        .get(partitionIdInteger)
                         .computeIfAbsent(i, j -> Lists.newArrayList())
                         .add(newAssignedServer);
                   }