[incubator-uniffle] branch master updated: [Minor] Trivial code improvements (#7)

[ro...@apache.org]

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 1cb0e02  [Minor] Trivial code improvements (#7)
1cb0e02 is described below

commit 1cb0e026dc884910275a7070be24f53fbaa5a8e7
Author: Zhen Wang <64...@qq.com>
AuthorDate: Sat Jul 2 14:14:40 2022 +0800

    [Minor] Trivial code improvements (#7)
    
    ### What changes were proposed in this pull request?
    Trivial code improvements
    
    ### Why are the changes needed?
    code improvements
    
    ### Does this PR introduce _any_ user-facing change?
    No
    
    ### How was this patch tested?
    No
---
 .../tencent/rss/coordinator/PartitionBalanceAssignmentStrategy.java  | 2 +-
 .../java/com/tencent/rss/server/storage/LocalStorageManager.java     | 2 +-
 .../java/com/tencent/rss/server/storage/SingleStorageManager.java    | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/coordinator/src/main/java/com/tencent/rss/coordinator/PartitionBalanceAssignmentStrategy.java b/coordinator/src/main/java/com/tencent/rss/coordinator/PartitionBalanceAssignmentStrategy.java
index a44e2a9..e5a1a19 100644
--- a/coordinator/src/main/java/com/tencent/rss/coordinator/PartitionBalanceAssignmentStrategy.java
+++ b/coordinator/src/main/java/com/tencent/rss/coordinator/PartitionBalanceAssignmentStrategy.java
@@ -121,7 +121,7 @@ public class PartitionBalanceAssignmentStrategy implements AssignmentStrategy {
           for (int rc = 0; rc < replica; rc++) {
             ServerNode node =  candidatesNodes.get(idx);
             idx = CoordinatorUtils.nextIdx(idx,  candidatesNodes.size());
-            serverToPartitions.get(node).incrementPartitionNum();;
+            serverToPartitions.get(node).incrementPartitionNum();
             assignNodes.add(node);
           }
           assignments.put(range, assignNodes);
diff --git a/server/src/main/java/com/tencent/rss/server/storage/LocalStorageManager.java b/server/src/main/java/com/tencent/rss/server/storage/LocalStorageManager.java
index 987b9dd..2a3fec1 100644
--- a/server/src/main/java/com/tencent/rss/server/storage/LocalStorageManager.java
+++ b/server/src/main/java/com/tencent/rss/server/storage/LocalStorageManager.java
@@ -162,7 +162,7 @@ public class LocalStorageManager extends SingleStorageManager {
     if (unCorruptedStorages.isEmpty()) {
       throw new RuntimeException("No enough storages");
     }
-    return  unCorruptedStorages.get(ShuffleStorageUtils.getStorageIndex(
+    return unCorruptedStorages.get(ShuffleStorageUtils.getStorageIndex(
         unCorruptedStorages.size(),
         appId,
         shuffleId,
diff --git a/server/src/main/java/com/tencent/rss/server/storage/SingleStorageManager.java b/server/src/main/java/com/tencent/rss/server/storage/SingleStorageManager.java
index d2da5ef..171a8b5 100644
--- a/server/src/main/java/com/tencent/rss/server/storage/SingleStorageManager.java
+++ b/server/src/main/java/com/tencent/rss/server/storage/SingleStorageManager.java
@@ -53,8 +53,7 @@ public abstract class SingleStorageManager implements StorageManager {
 
   @Override
   public boolean write(Storage storage, ShuffleWriteHandler handler, ShuffleDataFlushEvent event) {
-    String shuffleKey = RssUtils.generateShuffleKey(
-        event.getAppId(), event.getShuffleId());
+    String shuffleKey = RssUtils.generateShuffleKey(event.getAppId(), event.getShuffleId());
     storage.createMetadataIfNotExist(shuffleKey);
 
     boolean locked = storage.lockShuffleShared(shuffleKey);
@@ -76,7 +75,7 @@ public abstract class SingleStorageManager implements StorageManager {
       ShuffleServerMetrics.counterWriteException.inc();
       Uninterruptibles.sleepUninterruptibly(1000, TimeUnit.MILLISECONDS);
     } finally {
-      storage.unlockShuffleShared(RssUtils.generateShuffleKey(event.getAppId(), event.getShuffleId()));
+      storage.unlockShuffleShared(shuffleKey);
     }
     return false;
   }