You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uniffle.apache.org by ck...@apache.org on 2023/01/16 08:45:08 UTC
[incubator-uniffle] branch master updated: [Minor] Improve readability by replacing lambda with method reference (#488)
This is an automated email from the ASF dual-hosted git repository.
ckj 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 de4162e1 [Minor] Improve readability by replacing lambda with method reference (#488)
de4162e1 is described below
commit de4162e11fc98c5d7d389e4613e3710ebf51226d
Author: 王杰 <34...@qq.com>
AuthorDate: Mon Jan 16 16:45:03 2023 +0800
[Minor] Improve readability by replacing lambda with method reference (#488)
### What changes were proposed in this pull request?
Improve readability by replacing lambda with method reference.
### Why are the changes needed?
Fixes #487
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Existing CI.
---
.../src/main/java/org/apache/spark/shuffle/RssShuffleManager.java | 2 +-
.../src/main/java/org/apache/spark/shuffle/RssShuffleManager.java | 2 +-
.../main/java/org/apache/spark/shuffle/reader/RssShuffleReader.java | 2 +-
.../java/org/apache/uniffle/client/impl/ShuffleWriteClientImpl.java | 4 +---
.../main/java/org/apache/uniffle/common/config/ConfigOptions.java | 2 +-
.../org/apache/uniffle/common/security/HadoopSecurityContext.java | 2 +-
.../java/org/apache/uniffle/coordinator/SimpleClusterManager.java | 2 +-
.../src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java | 6 +++---
.../java/org/apache/uniffle/storage/common/LocalStorageMeta.java | 6 +++---
9 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/client-spark/spark2/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java b/client-spark/spark2/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
index eea58970..c8c11ca6 100644
--- a/client-spark/spark2/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
+++ b/client-spark/spark2/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
@@ -360,7 +360,7 @@ public class RssShuffleManager implements ShuffleManager {
return new RssShuffleWriter(rssHandle.getAppId(), shuffleId, taskId, context.taskAttemptId(), bufferManager,
writeMetrics, this, sparkConf, shuffleWriteClient, rssHandle,
- (Function<String, Boolean>) tid -> markFailedTask(tid));
+ (Function<String, Boolean>) this::markFailedTask);
} else {
throw new RuntimeException("Unexpected ShuffleHandle:" + handle.getClass().getName());
}
diff --git a/client-spark/spark3/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java b/client-spark/spark3/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
index 3a6033ad..cabccb3b 100644
--- a/client-spark/spark3/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
+++ b/client-spark/spark3/src/main/java/org/apache/spark/shuffle/RssShuffleManager.java
@@ -376,7 +376,7 @@ public class RssShuffleManager implements ShuffleManager {
LOG.info("RssHandle appId {} shuffleId {} ", rssHandle.getAppId(), rssHandle.getShuffleId());
return new RssShuffleWriter(rssHandle.getAppId(), shuffleId, taskId, context.taskAttemptId(), bufferManager,
writeMetrics, this, sparkConf, shuffleWriteClient, rssHandle,
- (Function<String, Boolean>) tid -> markFailedTask(tid));
+ (Function<String, Boolean>) this::markFailedTask);
}
@Override
diff --git a/client-spark/spark3/src/main/java/org/apache/spark/shuffle/reader/RssShuffleReader.java b/client-spark/spark3/src/main/java/org/apache/spark/shuffle/reader/RssShuffleReader.java
index b810f611..88b2d0bb 100644
--- a/client-spark/spark3/src/main/java/org/apache/spark/shuffle/reader/RssShuffleReader.java
+++ b/client-spark/spark3/src/main/java/org/apache/spark/shuffle/reader/RssShuffleReader.java
@@ -231,7 +231,7 @@ public class RssShuffleReader<K, C> implements ShuffleReader<K, C> {
if (dataIterator != null) {
dataIterator.completion();
}
- iterator.forEachRemaining(ci -> ci.completion());
+ iterator.forEachRemaining(CompletionIterator::completion);
});
}
diff --git a/client/src/main/java/org/apache/uniffle/client/impl/ShuffleWriteClientImpl.java b/client/src/main/java/org/apache/uniffle/client/impl/ShuffleWriteClientImpl.java
index 60a775f0..06c81361 100644
--- a/client/src/main/java/org/apache/uniffle/client/impl/ShuffleWriteClientImpl.java
+++ b/client/src/main/java/org/apache/uniffle/client/impl/ShuffleWriteClientImpl.java
@@ -745,9 +745,7 @@ public class ShuffleWriteClientImpl implements ShuffleWriteClient {
return Collections.EMPTY_SET;
}
Set<ShuffleServerInfo> serverInfos = Sets.newHashSet();
- appServerMap.values().forEach((serverSet) -> {
- serverInfos.addAll(serverSet);
- });
+ appServerMap.values().forEach(serverInfos::addAll);
return serverInfos;
}
diff --git a/common/src/main/java/org/apache/uniffle/common/config/ConfigOptions.java b/common/src/main/java/org/apache/uniffle/common/config/ConfigOptions.java
index 8f00204e..1baef1d9 100644
--- a/common/src/main/java/org/apache/uniffle/common/config/ConfigOptions.java
+++ b/common/src/main/java/org/apache/uniffle/common/config/ConfigOptions.java
@@ -254,7 +254,7 @@ public class ConfigOptions {
return Collections.emptyList();
}
return Arrays.stream(trimmedVal.split(LIST_SPILTTER))
- .map(s -> atomicConverter.apply(s)).collect(Collectors.toList());
+ .map(atomicConverter::apply).collect(Collectors.toList());
}
};
}
diff --git a/common/src/main/java/org/apache/uniffle/common/security/HadoopSecurityContext.java b/common/src/main/java/org/apache/uniffle/common/security/HadoopSecurityContext.java
index 35c98f39..49083d36 100644
--- a/common/src/main/java/org/apache/uniffle/common/security/HadoopSecurityContext.java
+++ b/common/src/main/java/org/apache/uniffle/common/security/HadoopSecurityContext.java
@@ -111,7 +111,7 @@ public class HadoopSecurityContext implements SecurityContext {
}
private <T> T executeWithUgiWrapper(UserGroupInformation ugi, Callable<T> callable) throws Exception {
- return ugi.doAs((PrivilegedExceptionAction<T>) () -> callable.call());
+ return ugi.doAs((PrivilegedExceptionAction<T>) callable::call);
}
@Override
diff --git a/coordinator/src/main/java/org/apache/uniffle/coordinator/SimpleClusterManager.java b/coordinator/src/main/java/org/apache/uniffle/coordinator/SimpleClusterManager.java
index 34612e98..ae1f6d23 100644
--- a/coordinator/src/main/java/org/apache/uniffle/coordinator/SimpleClusterManager.java
+++ b/coordinator/src/main/java/org/apache/uniffle/coordinator/SimpleClusterManager.java
@@ -83,7 +83,7 @@ public class SimpleClusterManager implements ClusterManager {
periodicOutputIntervalTimes = conf.get(CoordinatorConf.COORDINATOR_NODES_PERIODIC_OUTPUT_INTERVAL_TIMES);
scheduledExecutorService.scheduleAtFixedRate(
- () -> nodesCheck(), heartbeatTimeout / 3,
+ this::nodesCheck, heartbeatTimeout / 3,
heartbeatTimeout / 3, TimeUnit.MILLISECONDS);
String excludeNodesPath = conf.getString(CoordinatorConf.COORDINATOR_EXCLUDE_NODES_FILE_PATH, "");
diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java b/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java
index cb9e8e3f..bd23e318 100644
--- a/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java
+++ b/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java
@@ -116,17 +116,17 @@ public class ShuffleTaskManager {
this.scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(
ThreadUtils.getThreadFactory("checkResource-%d"));
scheduledExecutorService.scheduleAtFixedRate(
- () -> preAllocatedBufferCheck(), preAllocationExpired / 2,
+ this::preAllocatedBufferCheck, preAllocationExpired / 2,
preAllocationExpired / 2, TimeUnit.MILLISECONDS);
this.expiredAppCleanupExecutorService = Executors.newSingleThreadScheduledExecutor(
ThreadUtils.getThreadFactory("expiredAppCleaner"));
expiredAppCleanupExecutorService.scheduleAtFixedRate(
- () -> checkResourceStatus(), appExpiredWithoutHB / 2,
+ this::checkResourceStatus, appExpiredWithoutHB / 2,
appExpiredWithoutHB / 2, TimeUnit.MILLISECONDS);
this.leakShuffleDataCheckExecutorService = Executors.newSingleThreadScheduledExecutor(
ThreadUtils.getThreadFactory("leakShuffleDataChecker"));
leakShuffleDataCheckExecutorService.scheduleAtFixedRate(
- () -> checkLeakShuffleData(), leakShuffleDataCheckInterval,
+ this::checkLeakShuffleData, leakShuffleDataCheckInterval,
leakShuffleDataCheckInterval, TimeUnit.MILLISECONDS);
if (triggerFlushInterval > 0) {
triggerFlushExecutorService = Executors.newSingleThreadScheduledExecutor(
diff --git a/storage/src/main/java/org/apache/uniffle/storage/common/LocalStorageMeta.java b/storage/src/main/java/org/apache/uniffle/storage/common/LocalStorageMeta.java
index 81fa6b02..dc57a0b6 100644
--- a/storage/src/main/java/org/apache/uniffle/storage/common/LocalStorageMeta.java
+++ b/storage/src/main/java/org/apache/uniffle/storage/common/LocalStorageMeta.java
@@ -112,7 +112,7 @@ public class LocalStorageMeta {
if (shuffleMeta != null) {
RoaringBitmap bitmap = shuffleMeta.partitionBitmap;
synchronized (bitmap) {
- partitions.forEach(p -> bitmap.add(p));
+ partitions.forEach(bitmap::add);
}
}
}
@@ -122,7 +122,7 @@ public class LocalStorageMeta {
if (shuffleMeta != null) {
RoaringBitmap bitmap = shuffleMeta.uploadedPartitionBitmap;
synchronized (bitmap) {
- partitions.forEach(p -> bitmap.add(p));
+ partitions.forEach(bitmap::add);
}
}
}
@@ -139,7 +139,7 @@ public class LocalStorageMeta {
if (shuffleMeta != null) {
RoaringBitmap bitmap = shuffleMeta.partitionBitmap;
synchronized (bitmap) {
- partitions.forEach(p -> bitmap.remove(p));
+ partitions.forEach(bitmap::remove);
}
}
}