echonesis commented on code in PR #9286:
URL: https://github.com/apache/ozone/pull/9286#discussion_r2523673643
##########
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/BucketEndpoint.java:
##########
@@ -378,18 +391,53 @@ public Response listMultipartUploads(
result.setKeyMarker(keyMarker);
result.setUploadIdMarker(uploadIdMarker);
result.setNextKeyMarker(ozoneMultipartUploadList.getNextKeyMarker());
- result.setPrefix(prefix);
+ 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(
+ 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());
+
+ 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;
+ }
+ } else if (relativeKeyName.endsWith(delimiter)) {
+ result.addPrefix(EncodingTypeObject.createNullable(
+ prefix + relativeKeyName, encodingType));
+ } else {
+ result.addUpload(new ListMultipartUploadsResult.Upload(
+ upload.getKeyName(),
+ upload.getUploadId(),
+ upload.getCreationTime(),
+
S3StorageType.fromReplicationConfig(upload.getReplicationConfig())
Review Comment:
We could try to consolidate duplicate conditional fragments as L432-L436.
##########
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ListMultipartUploadsResult.java:
##########
@@ -49,8 +52,16 @@ public class ListMultipartUploadsResult {
@XmlElement(name = "NextKeyMarker")
private String nextKeyMarker;
+ @XmlJavaTypeAdapter(ObjectKeyNameAdapter.class)
@XmlElement(name = "Prefix")
- private String prefix;
+ private EncodingTypeObject prefix;
+
+ @XmlJavaTypeAdapter(ObjectKeyNameAdapter.class)
+ @XmlElement(name = "Delimiter")
+ private EncodingTypeObject delimiter;
+
+ @XmlElement(name = "EncodingType")
Review Comment:
According to [S3 ListMultipartUploads API
Reference](https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListMultipartUploads.html),
since **EncodingType** has been added, we could modify **KeyMarker** and
**NextKeyMarker** as well.
--
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]
