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

nicholasjiang pushed a commit to branch branch-0.6
in repository https://gitbox.apache.org/repos/asf/celeborn.git


The following commit(s) were added to refs/heads/branch-0.6 by this push:
     new e16380159 [CELEBORN-2155] Avoid using duplicate diskFileInfoMap 
functions
e16380159 is described below

commit e16380159af1705e39d6dea1ac0d112a7f9e1f43
Author: xxx <953396...@qq.com>
AuthorDate: Sat Sep 20 15:08:19 2025 +0800

    [CELEBORN-2155] Avoid using duplicate diskFileInfoMap functions
    
    ### What changes were proposed in this pull request?
    
    Avoid using duplicate `diskFileInfoMap` functions.
    
    ### Why are the changes needed?
    
    Avoid using duplicate `diskFileInfoMap` functions.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    CI.
    
    Closes #3483 from xy2953396112/CELEBORN-2155.
    
    Authored-by: xxx <953396...@qq.com>
    Signed-off-by: SteNicholas <programg...@163.com>
    (cherry picked from commit 578a1c9a7889780d5fb608da04b7a6271ad3bbb8)
    Signed-off-by: SteNicholas <programg...@163.com>
---
 .../celeborn/service/deploy/worker/storage/StorageManager.scala   | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git 
a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/storage/StorageManager.scala
 
b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/storage/StorageManager.scala
index 59a4cc1da..e2868ffad 100644
--- 
a/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/storage/StorageManager.scala
+++ 
b/worker/src/main/scala/org/apache/celeborn/service/deploy/worker/storage/StorageManager.scala
@@ -394,12 +394,6 @@ final private[worker] class StorageManager(conf: 
CelebornConf, workerSource: Abs
 
   private def getNextIndex = counter.getAndUpdate(counterOperator)
 
-  private val newMapFunc =
-    new java.util.function.Function[String, ConcurrentHashMap[String, 
DiskFileInfo]]() {
-      override def apply(key: String): ConcurrentHashMap[String, DiskFileInfo] 
=
-        JavaUtils.newConcurrentHashMap()
-    }
-
   private val diskFileInfoMapFunc =
     new java.util.function.Function[String, ConcurrentHashMap[String, 
DiskFileInfo]]() {
       override def apply(key: String): ConcurrentHashMap[String, DiskFileInfo] 
=
@@ -1000,7 +994,7 @@ final private[worker] class StorageManager(conf: 
CelebornConf, workerSource: Abs
       shuffleKey: String,
       fileName: String,
       fileInfo: DiskFileInfo): Unit = {
-    committedFileInfos.computeIfAbsent(shuffleKey, newMapFunc).put(fileName, 
fileInfo)
+    committedFileInfos.computeIfAbsent(shuffleKey, 
diskFileInfoMapFunc).put(fileName, fileInfo)
   }
 
   def getActiveShuffleSize: Long = {

Reply via email to