swamirishi commented on code in PR #9423:
URL: https://github.com/apache/ozone/pull/9423#discussion_r2586944177
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java:
##########
@@ -2295,15 +2296,36 @@ private <T extends WithParentObjectId> DeleteKeysResult
gatherSubPathsWithIterat
List<OmKeyInfo> keyInfos = new ArrayList<>();
String seekFileInDB = metadataManager.getOzonePathKey(volumeId, bucketId,
parentInfo.getObjectID(), "");
try (TableIterator<String, ? extends KeyValue<String, T>> iterator =
table.iterator(seekFileInDB)) {
- while (iterator.hasNext() && remainingNum > 0) {
+ String startKey = null;
+ String lastLoopExclusiveKey =
getLexicographicallyHigherString(seekFileInDB);
+ List<DeleteKeysResult.ExclusiveRange> keyRanges = new ArrayList<>();
+ boolean processedAllKeys = true;
+ while (iterator.hasNext()) {
Review Comment:
```suggestion
while (iterator.hasNext() && remainingNum > 0) {
```
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java:
##########
@@ -2295,15 +2296,36 @@ private <T extends WithParentObjectId> DeleteKeysResult
gatherSubPathsWithIterat
List<OmKeyInfo> keyInfos = new ArrayList<>();
String seekFileInDB = metadataManager.getOzonePathKey(volumeId, bucketId,
parentInfo.getObjectID(), "");
try (TableIterator<String, ? extends KeyValue<String, T>> iterator =
table.iterator(seekFileInDB)) {
- while (iterator.hasNext() && remainingNum > 0) {
+ String startKey = null;
+ String lastLoopExclusiveKey =
getLexicographicallyHigherString(seekFileInDB);
Review Comment:
```suggestion
```
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java:
##########
@@ -2295,15 +2296,36 @@ private <T extends WithParentObjectId> DeleteKeysResult
gatherSubPathsWithIterat
List<OmKeyInfo> keyInfos = new ArrayList<>();
String seekFileInDB = metadataManager.getOzonePathKey(volumeId, bucketId,
parentInfo.getObjectID(), "");
try (TableIterator<String, ? extends KeyValue<String, T>> iterator =
table.iterator(seekFileInDB)) {
- while (iterator.hasNext() && remainingNum > 0) {
+ String startKey = null;
+ String lastLoopExclusiveKey =
getLexicographicallyHigherString(seekFileInDB);
+ List<DeleteKeysResult.ExclusiveRange> keyRanges = new ArrayList<>();
+ boolean processedAllKeys = true;
+ while (iterator.hasNext()) {
KeyValue<String, T> entry = iterator.next();
KeyValue<String, OmKeyInfo> keyInfo =
deleteKeyTransformer.apply(entry);
+ String tableKey = entry.getKey();
+ if (remainingNum <= 0) {
+ lastLoopExclusiveKey = tableKey;
+ processedAllKeys = false;
+ break;
+ }
if (deleteKeyFilter.apply(keyInfo)) {
keyInfos.add(keyInfo.getValue());
remainingNum--;
+ if (startKey == null) {
+ startKey = tableKey;
+ }
+ } else {
+ if (startKey != null) {
+ keyRanges.add(new DeleteKeysResult.ExclusiveRange(startKey,
tableKey));
+ }
+ startKey = null;
}
}
- return new DeleteKeysResult(keyInfos, !iterator.hasNext());
+ if (startKey != null) {
+ keyRanges.add(new DeleteKeysResult.ExclusiveRange(startKey,
lastLoopExclusiveKey));
+ }
+ return new DeleteKeysResult(keyInfos, keyRanges, processedAllKeys);
Review Comment:
```suggestion
boolean processedAllKeys = iterator.hasNext();
if (startKey != null) {
keyRanges.add(new DeleteKeysResult.ExclusiveRange(startKey,
processedAllKeys ? getLexicographicallyHigherString(seekFileInDB) :
iterator.next().getKey()));
}
return new DeleteKeysResult(keyInfos, keyRanges, processedAllKeys);
```
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java:
##########
@@ -2295,15 +2296,36 @@ private <T extends WithParentObjectId> DeleteKeysResult
gatherSubPathsWithIterat
List<OmKeyInfo> keyInfos = new ArrayList<>();
String seekFileInDB = metadataManager.getOzonePathKey(volumeId, bucketId,
parentInfo.getObjectID(), "");
try (TableIterator<String, ? extends KeyValue<String, T>> iterator =
table.iterator(seekFileInDB)) {
- while (iterator.hasNext() && remainingNum > 0) {
+ String startKey = null;
+ String lastLoopExclusiveKey =
getLexicographicallyHigherString(seekFileInDB);
+ List<DeleteKeysResult.ExclusiveRange> keyRanges = new ArrayList<>();
+ boolean processedAllKeys = true;
+ while (iterator.hasNext()) {
KeyValue<String, T> entry = iterator.next();
KeyValue<String, OmKeyInfo> keyInfo =
deleteKeyTransformer.apply(entry);
+ String tableKey = entry.getKey();
Review Comment:
```suggestion
```
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java:
##########
@@ -467,6 +471,20 @@ private OzoneManagerProtocolProtos.PurgePathRequest
wrapPurgeRequest(
dir.getProtobuf(ClientVersion.CURRENT_VERSION));
}
+ if (dirExclusiveRanges != null) {
Review Comment:
do we need this null check?
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java:
##########
@@ -467,6 +471,20 @@ private OzoneManagerProtocolProtos.PurgePathRequest
wrapPurgeRequest(
dir.getProtobuf(ClientVersion.CURRENT_VERSION));
}
+ if (dirExclusiveRanges != null) {
Review Comment:
If it is null then there should be nothing to delete ideally. If it is null
it should be an illegalStateException.
##########
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMDirectoriesPurgeRequestAndResponse.java:
##########
@@ -195,9 +195,19 @@ private OMRequest createPurgeKeysRequest(String
fromSnapshot, String purgeDelete
private PurgePathRequest wrapPurgeRequest(
final long volumeId, final long bucketId, final String purgeDeletedDir,
final List<OmKeyInfo> purgeDeletedFiles, final List<OmKeyInfo>
markDirsAsDeleted) {
+ return wrapPurgeRequest(
Review Comment:
why is this needed?
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java:
##########
@@ -2295,15 +2296,36 @@ private <T extends WithParentObjectId> DeleteKeysResult
gatherSubPathsWithIterat
List<OmKeyInfo> keyInfos = new ArrayList<>();
String seekFileInDB = metadataManager.getOzonePathKey(volumeId, bucketId,
parentInfo.getObjectID(), "");
try (TableIterator<String, ? extends KeyValue<String, T>> iterator =
table.iterator(seekFileInDB)) {
- while (iterator.hasNext() && remainingNum > 0) {
+ String startKey = null;
+ String lastLoopExclusiveKey =
getLexicographicallyHigherString(seekFileInDB);
+ List<DeleteKeysResult.ExclusiveRange> keyRanges = new ArrayList<>();
+ boolean processedAllKeys = true;
+ while (iterator.hasNext()) {
KeyValue<String, T> entry = iterator.next();
KeyValue<String, OmKeyInfo> keyInfo =
deleteKeyTransformer.apply(entry);
+ String tableKey = entry.getKey();
+ if (remainingNum <= 0) {
+ lastLoopExclusiveKey = tableKey;
+ processedAllKeys = false;
+ break;
+ }
if (deleteKeyFilter.apply(keyInfo)) {
keyInfos.add(keyInfo.getValue());
remainingNum--;
+ if (startKey == null) {
+ startKey = tableKey;
Review Comment:
```suggestion
startKey = entry.getKey();
```
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java:
##########
@@ -2295,15 +2296,36 @@ private <T extends WithParentObjectId> DeleteKeysResult
gatherSubPathsWithIterat
List<OmKeyInfo> keyInfos = new ArrayList<>();
String seekFileInDB = metadataManager.getOzonePathKey(volumeId, bucketId,
parentInfo.getObjectID(), "");
try (TableIterator<String, ? extends KeyValue<String, T>> iterator =
table.iterator(seekFileInDB)) {
- while (iterator.hasNext() && remainingNum > 0) {
+ String startKey = null;
+ String lastLoopExclusiveKey =
getLexicographicallyHigherString(seekFileInDB);
+ List<DeleteKeysResult.ExclusiveRange> keyRanges = new ArrayList<>();
+ boolean processedAllKeys = true;
+ while (iterator.hasNext()) {
KeyValue<String, T> entry = iterator.next();
KeyValue<String, OmKeyInfo> keyInfo =
deleteKeyTransformer.apply(entry);
+ String tableKey = entry.getKey();
+ if (remainingNum <= 0) {
+ lastLoopExclusiveKey = tableKey;
+ processedAllKeys = false;
+ break;
+ }
Review Comment:
```suggestion
```
--
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]
