Rename classname and method name

apache · Nov 22, 2024 · 2588c02 · 2588c02
1 parent 817a5d4
commit 2588c02
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java b/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java
@@ -844,7 +844,7 @@ public ShuffleIndexResult getShuffleIndex(
     int[] range =
         ShuffleStorageUtils.getPartitionRange(partitionId, partitionNumPerRange, partitionNum);
     Storage storage =
-        storageManager.selectStorageForIndex(
+        storageManager.selectStorageById(
             new ShuffleDataReadEvent(appId, shuffleId, partitionId, range[0]));
     if (storage == null) {
       throw new FileNotFoundException("No such data in current storage manager.");

diff --git a/server/src/main/java/org/apache/uniffle/server/storage/HybridStorageManager.java b/server/src/main/java/org/apache/uniffle/server/storage/HybridStorageManager.java
@@ -116,8 +116,8 @@ public Storage selectStorage(ShuffleDataReadEvent event) {
   }
 
   @Override
-  public Storage selectStorageForIndex(ShuffleDataReadEvent event) {
-    return warmStorageManager.selectStorageForIndex(event);
+  public Storage selectStorageById(ShuffleDataReadEvent event) {
+    return warmStorageManager.selectStorageById(event);
   }
 
   @Override

diff --git a/server/src/main/java/org/apache/uniffle/server/storage/MultiPartLocalStorageManager.java b/server/src/main/java/org/apache/uniffle/server/storage/MultiPartLocalStorageManager.java
@@ -28,7 +28,7 @@
 import org.apache.uniffle.server.ShuffleDataFlushEvent;
 import org.apache.uniffle.server.ShuffleDataReadEvent;
 import org.apache.uniffle.server.ShuffleServerConf;
-import org.apache.uniffle.storage.common.CompositeStorage;
+import org.apache.uniffle.storage.common.CompositeReadingViewStorage;
 import org.apache.uniffle.storage.common.LocalStorage;
 import org.apache.uniffle.storage.common.Storage;
 import org.apache.uniffle.storage.util.ShuffleStorageUtils;
@@ -38,7 +38,7 @@ public class MultiPartLocalStorageManager extends LocalStorageManager {
   // id -> storage
   private final Map<Integer, LocalStorage> idToStorages;
 
-  private final CompositeStorage compositeStorage;
+  private final CompositeReadingViewStorage compositeStorage;
 
   public MultiPartLocalStorageManager(ShuffleServerConf conf) {
     super(conf);
@@ -47,7 +47,7 @@ public MultiPartLocalStorageManager(ShuffleServerConf conf) {
       idToStorages.put(storage.getId(), storage);
     }
 
-    compositeStorage = new CompositeStorage(getStorages());
+    compositeStorage = new CompositeReadingViewStorage(getStorages());
   }
 
   @Override
@@ -106,14 +106,13 @@ public Storage selectStorage(ShuffleDataReadEvent event) {
       return getStorages().get(0);
     }
 
-    // Use higher 8 bit to storage the storage id, and use lower 56 bit to storage the offset.
     int storageId = event.getStorageId();
     // TODO(baoloongmao): check AOOB exception
     return idToStorages.get(storageId);
   }
 
   @Override
-  public Storage selectStorageForIndex(ShuffleDataReadEvent event) {
+  public Storage selectStorageById(ShuffleDataReadEvent event) {
     return compositeStorage;
   }
 }
diff --git a/server/src/main/java/org/apache/uniffle/server/storage/StorageManager.java b/server/src/main/java/org/apache/uniffle/server/storage/StorageManager.java
@@ -36,7 +36,7 @@ public interface StorageManager {
 
   Storage selectStorage(ShuffleDataReadEvent event);
 
-  default Storage selectStorageForIndex(ShuffleDataReadEvent event) {
+  default Storage selectStorageById(ShuffleDataReadEvent event) {
     return selectStorage(event);
   }
 

diff --git a/...ffle/storage/common/CompositeStorage.java → ...e/common/CompositeReadingViewStorage.java b/...ffle/storage/common/CompositeStorage.java → ...e/common/CompositeReadingViewStorage.java
@@ -30,12 +30,13 @@
 import org.apache.uniffle.storage.request.CreateShuffleReadHandlerRequest;
 import org.apache.uniffle.storage.request.CreateShuffleWriteHandlerRequest;
 
-public class CompositeStorage extends AbstractStorage {
+public class CompositeReadingViewStorage extends AbstractStorage {
 
-  private static final Logger LOG = LoggerFactory.getLogger(CompositeStorage.class);
+  private static final Logger LOG = LoggerFactory.getLogger(
+      CompositeReadingViewStorage.class);
   private final List<LocalStorage> localStorages;
 
-  public CompositeStorage(List<LocalStorage> localStorages) {
+  public CompositeReadingViewStorage(List<LocalStorage> localStorages) {
     super();
     this.localStorages = localStorages;
   }