This is an automated email from the ASF dual-hosted git repository.
sarvekshayr 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 5c70970a7c8 HDDS-16257. Avoid the flatten-copy in
OmMetadataManagerImpl.getExpiredOpenKeys' hsync branch (#11116)
5c70970a7c8 is described below
commit 5c70970a7c82eba5d3e93ffadaf17ce428684b59
Author: Mark Tsai <[email protected]>
AuthorDate: Mon Aug 31 12:52:23 2026 +0800
HDDS-16257. Avoid the flatten-copy in
OmMetadataManagerImpl.getExpiredOpenKeys' hsync branch (#11116)
---
.../java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
index a3819bc2e9c..e4c4f2293a9 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
@@ -68,6 +68,7 @@
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Objects;
+import java.util.Optional;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -1484,7 +1485,7 @@ public ExpiredOpenKeys getExpiredOpenKeys(Duration
expireThreshold,
final String clientIdString
= dbOpenKeyName.substring(lastPrefix + 1);
- final boolean isHsync = java.util.Optional.of(openKeyInfo)
+ final boolean isHsync = Optional.of(openKeyInfo)
.map(WithMetadata::getMetadata)
.map(meta -> meta.get(OzoneConsts.HSYNC_CLIENT_ID))
.filter(id -> id.equals(clientIdString))
@@ -1509,10 +1510,11 @@ public ExpiredOpenKeys getExpiredOpenKeys(Duration
expireThreshold,
.setBucketName(info.getBucketName())
.setKeyName(openKeyInfo.getKeyName())
.setDataSize(info.getDataSize());
- java.util.Optional.ofNullable(info.getLatestVersionLocations())
- .map(OmKeyLocationInfoGroup::createLocationList)
+ Optional.ofNullable(info.getLatestVersionLocations())
+ .map(OmKeyLocationInfoGroup::getLocationLists)
.map(Collection::stream)
.orElseGet(Stream::empty)
+ .flatMap(List::stream)
.map(loc -> loc.getProtobuf(ClientVersion.CURRENT_VERSION))
.forEach(keyArgs::addKeyLocations);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
