This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 949e43b3bea HDDS-16216. Avoid flatten-copy in
KeyInputStream.getBlockLocationInfo (#11099)
949e43b3bea is described below
commit 949e43b3beaa2dd1bc76cd5310f6ae330155a1cb
Author: ChenChen Lai <[email protected]>
AuthorDate: Tue Aug 25 22:35:06 2026 +0800
HDDS-16216. Avoid flatten-copy in KeyInputStream.getBlockLocationInfo
(#11099)
---
hadoop-ozone/client/pom.xml | 9 +++++----
.../hadoop/ozone/client/io/KeyInputStream.java | 20 ++++++++------------
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/hadoop-ozone/client/pom.xml b/hadoop-ozone/client/pom.xml
index 97e8bf56e1f..0437b65120f 100644
--- a/hadoop-ozone/client/pom.xml
+++ b/hadoop-ozone/client/pom.xml
@@ -43,10 +43,6 @@
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-collections4</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -102,6 +98,11 @@
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-client</artifactId>
diff --git
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyInputStream.java
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyInputStream.java
index da0830624fe..c11514f8fd4 100644
---
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyInputStream.java
+++
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/KeyInputStream.java
@@ -25,8 +25,6 @@
import java.util.List;
import java.util.Map;
import java.util.function.Function;
-import java.util.stream.Collectors;
-import org.apache.commons.collections4.CollectionUtils;
import org.apache.hadoop.hdds.client.BlockID;
import org.apache.hadoop.hdds.scm.OzoneClientConfig;
import org.apache.hadoop.hdds.scm.XceiverClientFactory;
@@ -108,17 +106,15 @@ private static List<BlockExtendedInputStream>
createStreams(
private static BlockLocationInfo getBlockLocationInfo(OmKeyInfo newKeyInfo,
BlockID blockID) {
- List<OmKeyLocationInfo> collect =
- newKeyInfo.getLatestVersionLocations()
- .createLocationList()
- .stream()
- .filter(l -> l.getBlockID().equals(blockID))
- .collect(Collectors.toList());
- if (CollectionUtils.isNotEmpty(collect)) {
- return collect.get(0);
- } else {
- return null;
+ for (List<OmKeyLocationInfo> locationList
+ : newKeyInfo.getLatestVersionLocations().getLocationLists()) {
+ for (OmKeyLocationInfo location : locationList) {
+ if (location.getBlockID().equals(blockID)) {
+ return location;
+ }
+ }
}
+ return null;
}
private static LengthInputStream getFromOmKeyInfo(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
