0lai0 commented on code in PR #9286:
URL: https://github.com/apache/ozone/pull/9286#discussion_r2553752513
##########
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/BucketEndpoint.java:
##########
@@ -375,21 +384,55 @@ public Response listMultipartUploads(
ListMultipartUploadsResult result = new ListMultipartUploadsResult();
result.setBucket(bucketName);
- result.setKeyMarker(keyMarker);
+ result.setKeyMarker(EncodingTypeObject.createNullable(keyMarker,
encodingType));
result.setUploadIdMarker(uploadIdMarker);
- result.setNextKeyMarker(ozoneMultipartUploadList.getNextKeyMarker());
- result.setPrefix(prefix);
+ result.setNextKeyMarker(EncodingTypeObject.createNullable(
+ ozoneMultipartUploadList.getNextKeyMarker(), encodingType));
+ result.setPrefix(EncodingTypeObject.createNullable(prefix,
encodingType));
+ result.setDelimiter(EncodingTypeObject.createNullable(delimiter,
encodingType));
+ result.setEncodingType(encodingType);
result.setNextUploadIdMarker(ozoneMultipartUploadList.getNextUploadIdMarker());
result.setMaxUploads(maxUploads);
result.setTruncated(ozoneMultipartUploadList.isTruncated());
- ozoneMultipartUploadList.getUploads().forEach(upload -> result.addUpload(
- new ListMultipartUploadsResult.Upload(
- upload.getKeyName(),
+ String prevDir = null;
+ for (OzoneMultipartUpload upload :
ozoneMultipartUploadList.getUploads()) {
+ String keyName = upload.getKeyName();
+ if (bucket.getBucketLayout().isFileSystemOptimized() &&
+ StringUtils.isNotEmpty(prefix) &&
+ !keyName.startsWith(prefix)) {
+ continue;
+ }
+ String relativeKeyName = keyName.substring(prefix.length());
+
+ boolean addedAsPrefix = false;
+ if (!StringUtils.isEmpty(delimiter)) {
+ int depth = StringUtils.countMatches(relativeKeyName, delimiter);
+ if (depth > 0) {
+ String dirName = relativeKeyName.substring(0,
relativeKeyName.indexOf(delimiter));
+ if (!dirName.equals(prevDir)) {
+ result.addPrefix(EncodingTypeObject.createNullable(
+ prefix + dirName + delimiter, encodingType));
+ prevDir = dirName;
+ addedAsPrefix = true;
+ }
+ } else if (relativeKeyName.endsWith(delimiter)) {
+ result.addPrefix(EncodingTypeObject.createNullable(
+ prefix + relativeKeyName, encodingType));
+ addedAsPrefix = true;
+ }
+ }
+
+ if (!addedAsPrefix) {
+ result.addUpload(new ListMultipartUploadsResult.Upload(
Review Comment:
But I wasn't 100% sure about this part. Does this implementation look
correct ? If I still get incorrect way , could you provide some guidance?
Thank you so much.
--
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]
