This is an automated email from the ASF dual-hosted git repository.
dineshc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 0217fa4e8e HDDS-7834. Remove unnecessary streams (#4208)
0217fa4e8e is described below
commit 0217fa4e8e1aa4040383d61e7eb6e2524e57cac2
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Jan 25 16:57:11 2023 +0100
HDDS-7834. Remove unnecessary streams (#4208)
---
.../java/org/apache/hadoop/ozone/client/io/ECStreamTestUtil.java | 3 +--
.../hdds/scm/container/replication/ECContainerReplicaCount.java | 2 +-
.../hdds/scm/container/replication/LegacyReplicationManager.java | 8 +++-----
.../org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java | 4 +---
4 files changed, 6 insertions(+), 11 deletions(-)
diff --git
a/hadoop-hdds/client/src/test/java/org/apache/hadoop/ozone/client/io/ECStreamTestUtil.java
b/hadoop-hdds/client/src/test/java/org/apache/hadoop/ozone/client/io/ECStreamTestUtil.java
index 0e15d834a2..f4d40c811c 100644
---
a/hadoop-hdds/client/src/test/java/org/apache/hadoop/ozone/client/io/ECStreamTestUtil.java
+++
b/hadoop-hdds/client/src/test/java/org/apache/hadoop/ozone/client/io/ECStreamTestUtil.java
@@ -46,7 +46,6 @@ import java.util.Map;
import java.util.Set;
import java.util.SplittableRandom;
import java.util.function.Function;
-import java.util.stream.Collectors;
/**
* Utility class providing methods useful in EC tests.
@@ -230,7 +229,7 @@ public final class ECStreamTestUtil {
public synchronized
List<ECStreamTestUtil.TestBlockInputStream> getBlockStreams() {
- return blockStreams.values().stream().collect(Collectors.toList());
+ return new ArrayList<>(blockStreams.values());
}
public synchronized Set<Integer> getStreamIndexes() {
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ECContainerReplicaCount.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ECContainerReplicaCount.java
index 15108131d7..6bb6be7b6e 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ECContainerReplicaCount.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ECContainerReplicaCount.java
@@ -324,7 +324,7 @@ public class ECContainerReplicaCount implements
ContainerReplicaCount {
for (Integer i : decommissionIndexes.keySet()) {
missing.remove(i);
}
- return missing.stream().collect(Collectors.toList());
+ return new ArrayList<>(missing);
}
/**
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/LegacyReplicationManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/LegacyReplicationManager.java
index 3e3a34c0b4..debbc0d032 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/LegacyReplicationManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/LegacyReplicationManager.java
@@ -871,7 +871,7 @@ public class LegacyReplicationManager {
// check whether {Existing replicas + Target_Dn - Source_Dn}
// satisfies current placement policy
if (!isPolicySatisfiedAfterMove(cif, srcDn, targetDn,
- currentReplicas.stream().collect(Collectors.toList()))) {
+ new ArrayList<>(currentReplicas))) {
ret.complete(MoveResult.PLACEMENT_POLICY_NOT_SATISFIED);
return ret;
}
@@ -905,8 +905,7 @@ public class LegacyReplicationManager {
private boolean isPolicySatisfiedAfterMove(ContainerInfo cif,
DatanodeDetails srcDn, DatanodeDetails targetDn,
final List<ContainerReplica> replicas) {
- Set<ContainerReplica> movedReplicas =
- replicas.stream().collect(Collectors.toSet());
+ Set<ContainerReplica> movedReplicas = new HashSet<>(replicas);
movedReplicas.removeIf(r -> r.getDatanodeDetails().equals(srcDn));
movedReplicas.add(ContainerReplica.newBuilder()
.setDatanodeDetails(targetDn)
@@ -1368,8 +1367,7 @@ public class LegacyReplicationManager {
cif.getReplicationConfig().getRequiredNodes();
ContainerPlacementStatus currentCPS =
getPlacementStatus(replicaSet, replicationFactor);
- Set<ContainerReplica> newReplicaSet = replicaSet.
- stream().collect(Collectors.toSet());
+ Set<ContainerReplica> newReplicaSet = new HashSet<>(replicaSet);
newReplicaSet.removeIf(r -> r.getDatanodeDetails().equals(srcDn));
ContainerPlacementStatus newCPS =
getPlacementStatus(newReplicaSet, replicationFactor);
diff --git
a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java
b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java
index 764098451c..95c968b6b2 100644
---
a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java
+++
b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java
@@ -786,9 +786,7 @@ public class BasicRootedOzoneFileSystem extends FileSystem {
do {
tmpStatusList =
adapter.listStatus(pathToKey(f), false, startPath,
- numEntries, uri, workingDir, getUsername())
- .stream()
- .collect(Collectors.toList());
+ numEntries, uri, workingDir, getUsername());
if (!tmpStatusList.isEmpty()) {
if (startPath.isEmpty() || !statuses.getLast().getPath().toString()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
