swamirishi commented on code in PR #7200:
URL: https://github.com/apache/ozone/pull/7200#discussion_r1765857568
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotMoveDeletedKeysResponse.java:
##########
@@ -224,35 +224,35 @@ public static RepeatedOmKeyInfo createRepeatedOmKeyInfo(
return result;
}
- private RepeatedOmKeyInfo createRepeatedOmKeyInfo(
- SnapshotMoveKeyInfos snapshotMoveKeyInfos,
- OMMetadataManager metadataManager) throws IOException {
+ public static RepeatedOmKeyInfo
createMergedRepeatedOmKeyInfoFromDeletedTableEntry(
+ SnapshotMoveKeyInfos snapshotMoveKeyInfos, OMMetadataManager
metadataManager) throws IOException {
String dbKey = snapshotMoveKeyInfos.getKey();
- List<KeyInfo> keyInfoList = snapshotMoveKeyInfos.getKeyInfosList();
+ List<OmKeyInfo> keyInfoList = new ArrayList<>();
+ for (KeyInfo info : snapshotMoveKeyInfos.getKeyInfosList()) {
+ OmKeyInfo fromProtobuf = OmKeyInfo.getFromProtobuf(info);
+ keyInfoList.add(fromProtobuf);
+ }
// When older version of keys are moved to the next snapshot's deletedTable
// The newer version might also be in the next snapshot's deletedTable and
// it might overwrite. This is to avoid that and also avoid having
- // orphans blocks.
+ // orphans blocks. Checking the last keyInfoList size omKeyInfo versions,
+ // this is to avoid redundant additions if the last n versions match.
RepeatedOmKeyInfo result = metadataManager.getDeletedTable().get(dbKey);
-
- for (KeyInfo keyInfo : keyInfoList) {
- OmKeyInfo omKeyInfo = OmKeyInfo.getFromProtobuf(keyInfo);
- if (result == null) {
- result = new RepeatedOmKeyInfo(omKeyInfo);
- } else if (!isSameAsLatestOmKeyInfo(omKeyInfo, result)) {
- result.addOmKeyInfo(omKeyInfo);
- }
+ if (result == null) {
+ result = new RepeatedOmKeyInfo(keyInfoList);
+ } else if (!isSameAsLatestOmKeyInfo(keyInfoList, result)) {
+ keyInfoList.forEach(result::addOmKeyInfo);
}
-
return result;
}
- private boolean isSameAsLatestOmKeyInfo(OmKeyInfo omKeyInfo,
- RepeatedOmKeyInfo result) {
+ private static boolean isSameAsLatestOmKeyInfo(List<OmKeyInfo> omKeyInfos,
Review Comment:
done
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/KeyDeletingService.java:
##########
@@ -92,6 +92,7 @@ public class KeyDeletingService extends
AbstractKeyDeletingService {
private final Map<String, Long> exclusiveReplicatedSizeMap;
private final Set<String> completedExclusiveSizeSet;
private final Map<String, String> snapshotSeekMap;
+ private boolean isRunningOnAOS;
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
