This is an automated email from the ASF dual-hosted git repository.
roryqi 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 fce4bb6 [MINOR][IMPROVEMENT] Remove useless server id from
`StorageManagerFactory#createStorageManager`
fce4bb6 is described below
commit fce4bb6fe48fe7db16037714bef3e47063698398
Author: Binjie Yang <[email protected]>
AuthorDate: Wed Aug 3 15:36:55 2022 +0800
[MINOR][IMPROVEMENT] Remove useless server id from
`StorageManagerFactory#createStorageManager`
### What changes were proposed in this pull request?
Remove `StorageManagerFactory#createStorageManager` useless server id
### Why are the changes needed?
Clean code.
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Unit test
---
.../main/java/org/apache/uniffle/server/ShuffleServer.java | 2 +-
.../apache/uniffle/server/storage/StorageManagerFactory.java | 2 +-
.../org/apache/uniffle/server/ShuffleFlushManagerTest.java | 12 ++++++------
.../uniffle/server/buffer/ShuffleBufferManagerTest.java | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java
b/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java
index 0cae0cf..4194bb0 100644
--- a/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java
+++ b/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java
@@ -144,7 +144,7 @@ public class ShuffleServer {
jettyServer = new JettyServer(shuffleServerConf);
registerMetrics();
- storageManager =
StorageManagerFactory.getInstance().createStorageManager(id, shuffleServerConf);
+ storageManager =
StorageManagerFactory.getInstance().createStorageManager(shuffleServerConf);
storageManager.start();
diff --git
a/server/src/main/java/org/apache/uniffle/server/storage/StorageManagerFactory.java
b/server/src/main/java/org/apache/uniffle/server/storage/StorageManagerFactory.java
index b461acc..209a9de 100644
---
a/server/src/main/java/org/apache/uniffle/server/storage/StorageManagerFactory.java
+++
b/server/src/main/java/org/apache/uniffle/server/storage/StorageManagerFactory.java
@@ -30,7 +30,7 @@ public class StorageManagerFactory {
return LazyHolder.INSTANCE;
}
- public StorageManager createStorageManager(String serverId,
ShuffleServerConf conf) {
+ public StorageManager createStorageManager(ShuffleServerConf conf) {
StorageType type =
StorageType.valueOf(conf.get(ShuffleServerConf.RSS_STORAGE_TYPE));
if (StorageType.LOCALFILE.equals(type) ||
StorageType.MEMORY_LOCALFILE.equals(type)) {
return new LocalStorageManager(conf);
diff --git
a/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerTest.java
b/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerTest.java
index 2da9b4e..d137d5f 100644
---
a/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerTest.java
+++
b/server/src/test/java/org/apache/uniffle/server/ShuffleFlushManagerTest.java
@@ -86,7 +86,7 @@ public class ShuffleFlushManagerTest extends HdfsTestBase {
shuffleServerConf.setString("rss.server.hadoop.dfs.replication", "2");
shuffleServerConf.setString("rss.server.hadoop.a.b", "value");
StorageManager storageManager =
-
StorageManagerFactory.getInstance().createStorageManager("shuffleServerId",
shuffleServerConf);
+
StorageManagerFactory.getInstance().createStorageManager(shuffleServerConf);
ShuffleFlushManager manager =
new ShuffleFlushManager(shuffleServerConf, "shuffleServerId", null,
storageManager);
assertEquals("2", manager.getHadoopConf().get("dfs.replication"));
@@ -97,7 +97,7 @@ public class ShuffleFlushManagerTest extends HdfsTestBase {
public void writeTest() throws Exception {
String appId = "writeTest_appId";
StorageManager storageManager =
-
StorageManagerFactory.getInstance().createStorageManager("shuffleServerId",
shuffleServerConf);
+
StorageManagerFactory.getInstance().createStorageManager(shuffleServerConf);
storageManager.registerRemoteStorage(appId, remoteStorage);
storageManager.registerRemoteStorage(appId, remoteStorage);
String storageHost = "localhost";
@@ -145,7 +145,7 @@ public class ShuffleFlushManagerTest extends HdfsTestBase {
public void complexWriteTest() throws Exception {
shuffleServerConf.setString("rss.server.flush.handler.expired", "3");
StorageManager storageManager =
-
StorageManagerFactory.getInstance().createStorageManager("shuffleServerId",
shuffleServerConf);
+
StorageManagerFactory.getInstance().createStorageManager(shuffleServerConf);
String appId = "complexWriteTest_appId";
storageManager.registerRemoteStorage(appId, remoteStorage);
List<ShufflePartitionedBlock> expectedBlocks = Lists.newArrayList();
@@ -183,7 +183,7 @@ public class ShuffleFlushManagerTest extends HdfsTestBase {
@Test
public void clearTest() throws Exception {
StorageManager storageManager =
-
StorageManagerFactory.getInstance().createStorageManager("shuffleServerId",
shuffleServerConf);
+
StorageManagerFactory.getInstance().createStorageManager(shuffleServerConf);
String appId1 = "complexWriteTest_appId1";
String appId2 = "complexWriteTest_appId2";
storageManager.registerRemoteStorage(appId1, remoteStorage);
@@ -240,7 +240,7 @@ public class ShuffleFlushManagerTest extends HdfsTestBase {
serverConf.setString(ShuffleServerConf.RSS_STORAGE_TYPE,
StorageType.LOCALFILE.name());
serverConf.setLong(ShuffleServerConf.DISK_CAPACITY, 1024L * 1024L * 1024L);
StorageManager storageManager =
-
StorageManagerFactory.getInstance().createStorageManager("shuffleServerId",
serverConf);
+ StorageManagerFactory.getInstance().createStorageManager(serverConf);
ShuffleFlushManager manager =
new ShuffleFlushManager(serverConf, "shuffleServerId", null,
storageManager);
ShuffleDataFlushEvent event1 =
@@ -385,7 +385,7 @@ public class ShuffleFlushManagerTest extends HdfsTestBase {
shuffleServerConf.set(ShuffleServerConf.DISK_CAPACITY, 100L);
shuffleServerConf.set(ShuffleServerConf.PENDING_EVENT_TIMEOUT_SEC, 5L);
StorageManager storageManager =
-
StorageManagerFactory.getInstance().createStorageManager("shuffleServerId",
shuffleServerConf);
+
StorageManagerFactory.getInstance().createStorageManager(shuffleServerConf);
ShuffleFlushManager manager =
new ShuffleFlushManager(shuffleServerConf, "shuffleServerId", null,
storageManager);
ShuffleDataFlushEvent event = new ShuffleDataFlushEvent(1, "1", 1, 1,1,
100, null, null, null);
diff --git
a/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java
b/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java
index 6815161..ecd4d43 100644
---
a/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java
+++
b/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferManagerTest.java
@@ -329,7 +329,7 @@ public class ShuffleBufferManagerTest extends
BufferTestBase {
@Test
public void bufferSizeTest() throws Exception {
ShuffleServer mockShuffleServer = mock(ShuffleServer.class);
- StorageManager storageManager =
StorageManagerFactory.getInstance().createStorageManager("serverId", conf);
+ StorageManager storageManager =
StorageManagerFactory.getInstance().createStorageManager(conf);
ShuffleFlushManager shuffleFlushManager = new ShuffleFlushManager(conf,
"serverId", mockShuffleServer, storageManager);
shuffleBufferManager = new ShuffleBufferManager(conf, shuffleFlushManager);
