adoroszlai commented on code in PR #10045:
URL: https://github.com/apache/ozone/pull/10045#discussion_r3221175873
##########
hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/BucketEndpoint.java:
##########
@@ -103,161 +97,18 @@ public Response get(
}
@Override
- Response handleGetRequest(S3RequestContext context, String bucketName)
throws IOException, OS3Exception {
- final String continueToken =
queryParams().get(QueryParams.CONTINUATION_TOKEN);
- final String delimiter = queryParams().get(QueryParams.DELIMITER);
- final String encodingType = queryParams().get(QueryParams.ENCODING_TYPE);
- final String marker = queryParams().get(QueryParams.MARKER);
- int maxKeys = queryParams().getInt(QueryParams.MAX_KEYS, 1000);
- String prefix = queryParams().get(QueryParams.PREFIX, "");
- String startAfter = queryParams().get(QueryParams.START_AFTER);
-
- Iterator<? extends OzoneKey> ozoneKeyIterator = null;
- ContinueToken decodedToken = ContinueToken.decodeFromString(continueToken);
- OzoneBucket bucket = null;
-
+ Response handleGetRequest(S3RequestContext context, String bucketName)
+ throws IOException, OS3Exception {
try {
- maxKeys = validateMaxKeys(maxKeys);
-
- // Assign marker to startAfter. for the compatibility of aws api v1
- if (startAfter == null && marker != null) {
- startAfter = marker;
- }
-
- // If continuation token and start after both are provided, then we
- // ignore start After
- String prevKey = continueToken != null ? decodedToken.getLastKey()
- : startAfter;
-
- // If shallow is true, only list immediate children
- // delimited by OZONE_URI_DELIMITER
- boolean shallow = listKeysShallowEnabled
- && OZONE_URI_DELIMITER.equals(delimiter);
-
- bucket = context.getVolume().getBucket(bucketName);
- S3Owner.verifyBucketOwnerCondition(getHeaders(), bucketName,
bucket.getOwner());
-
- ozoneKeyIterator = bucket.listKeys(prefix, prevKey, shallow);
-
+ return BucketListing.fromQueryParams(context, this, bucketName)
+ .buildResponse();
} catch (OMException ex) {
getMetrics().updateGetBucketFailureStats(context.getStartNanos());
- if (ex.getResult() == ResultCodes.FILE_NOT_FOUND) {
- // File not found, continue and send normal response with 0 keyCount
- LOG.debug("Key Not found prefix: {}", prefix);
- } else {
- throw ex;
- }
+ throw ex;
Review Comment:
Since `FILE_NOT_FOUND` is handled within `BucketListing`, we don't need
separate `catch (OMException)` anymore.
--
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]
