You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uniffle.apache.org by ro...@apache.org on 2022/09/16 09:18:02 UTC

[incubator-uniffle] branch master updated: [MINOR] Fix warnings reported by lgtm (#223)

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 a775ea4e [MINOR] Fix warnings reported by lgtm (#223)
a775ea4e is described below

commit a775ea4e3c8d3ee69a57a380acdcea37f8d99bff
Author: Kaijie Chen <ck...@apache.org>
AuthorDate: Fri Sep 16 17:17:57 2022 +0800

    [MINOR] Fix warnings reported by lgtm (#223)
    
    ### What changes were proposed in this pull request?
    
    Fix warnings reported by lgtm.
    
    ### Why are the changes needed?
    
    https://lgtm.com/projects/g/apache/incubator-uniffle/?mode=list
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    By CI.
---
 .../apache/uniffle/client/impl/grpc/ShuffleServerGrpcClient.java    | 2 +-
 .../main/java/org/apache/uniffle/server/LocalStorageChecker.java    | 6 +++---
 .../main/java/org/apache/uniffle/server/buffer/ShuffleBuffer.java   | 4 ++--
 .../java/org/apache/uniffle/server/buffer/ShuffleBufferManager.java | 2 +-
 .../java/org/apache/uniffle/storage/util/ShuffleStorageUtils.java   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/internal-client/src/main/java/org/apache/uniffle/client/impl/grpc/ShuffleServerGrpcClient.java b/internal-client/src/main/java/org/apache/uniffle/client/impl/grpc/ShuffleServerGrpcClient.java
index bfebd622..07658246 100644
--- a/internal-client/src/main/java/org/apache/uniffle/client/impl/grpc/ShuffleServerGrpcClient.java
+++ b/internal-client/src/main/java/org/apache/uniffle/client/impl/grpc/ShuffleServerGrpcClient.java
@@ -190,7 +190,7 @@ public class ShuffleServerGrpcClient extends GrpcClient implements ShuffleServer
       }
       try {
         long backoffTime =
-            Math.min(retryIntervalMax, backOffBase * (1 << Math.min(retry, 16)) + random.nextInt(backOffBase));
+            Math.min(retryIntervalMax, backOffBase * (1L << Math.min(retry, 16)) + random.nextInt(backOffBase));
         Thread.sleep(backoffTime);
       } catch (Exception e) {
         LOG.warn("Exception happened when require pre allocation from " + host + ":" + port, e);
diff --git a/server/src/main/java/org/apache/uniffle/server/LocalStorageChecker.java b/server/src/main/java/org/apache/uniffle/server/LocalStorageChecker.java
index 81ccfe24..fc9475dd 100644
--- a/server/src/main/java/org/apache/uniffle/server/LocalStorageChecker.java
+++ b/server/src/main/java/org/apache/uniffle/server/LocalStorageChecker.java
@@ -66,8 +66,8 @@ public class LocalStorageChecker extends Checker {
   @Override
   public boolean checkIsHealthy() {
     int num = 0;
-    Long totalSpace = 0L;
-    Long usedSpace = 0L;
+    long totalSpace = 0L;
+    long usedSpace = 0L;
     int corruptedDirs = 0;
 
     for (StorageInfo storageInfo : storageInfos) {
@@ -89,7 +89,7 @@ public class LocalStorageChecker extends Checker {
     ShuffleServerMetrics.gaugeLocalStorageUsedSpace.set(usedSpace);
     ShuffleServerMetrics.gaugeLocalStorageTotalDirsNum.set(storageInfos.size());
     ShuffleServerMetrics.gaugeLocalStorageCorruptedDirsNum.set(corruptedDirs);
-    ShuffleServerMetrics.gaugeLocalStorageUsedSpaceRatio.set(usedSpace.doubleValue() / totalSpace.doubleValue());
+    ShuffleServerMetrics.gaugeLocalStorageUsedSpaceRatio.set(usedSpace * 1.0 / totalSpace);
 
     if (storageInfos.isEmpty()) {
       if (isHealthy) {
diff --git a/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBuffer.java b/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBuffer.java
index 5cc054c5..b251113f 100644
--- a/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBuffer.java
+++ b/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBuffer.java
@@ -55,8 +55,8 @@ public class ShuffleBuffer {
     this.inFlushBlockMap = Maps.newConcurrentMap();
   }
 
-  public int append(ShufflePartitionedData data) {
-    int mSize = 0;
+  public long append(ShufflePartitionedData data) {
+    long mSize = 0;
 
     synchronized (this) {
       for (ShufflePartitionedBlock block : data.getBlockList()) {
diff --git a/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferManager.java b/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferManager.java
index b4d55c07..2e3d09d4 100644
--- a/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferManager.java
+++ b/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferManager.java
@@ -112,7 +112,7 @@ public class ShuffleBufferManager {
     }
 
     ShuffleBuffer buffer = entry.getValue();
-    int size = buffer.append(spd);
+    long size = buffer.append(spd);
     updateSize(size, isPreAllocated);
     updateShuffleSize(appId, shuffleId, size);
     synchronized (this) {
diff --git a/storage/src/main/java/org/apache/uniffle/storage/util/ShuffleStorageUtils.java b/storage/src/main/java/org/apache/uniffle/storage/util/ShuffleStorageUtils.java
index 4d0cf17b..7deda234 100644
--- a/storage/src/main/java/org/apache/uniffle/storage/util/ShuffleStorageUtils.java
+++ b/storage/src/main/java/org/apache/uniffle/storage/util/ShuffleStorageUtils.java
@@ -206,7 +206,7 @@ public class ShuffleStorageUtils {
 
   // index file header is $PartitionNum | [($PartitionId | $PartitionFileLength | $PartitionDataFileLength), ] | $CRC
   public static long getIndexFileHeaderLen(int partitionNum) {
-    return 4 + (4 + 8 + 8) * partitionNum + 8;
+    return 4 + (4 + 8 + 8) * (long) partitionNum + 8;
   }
 
   public static int getHeaderCrcLen() {