kishoreg commented on a change in pull request #6002:
URL: https://github.com/apache/incubator-pinot/pull/6002#discussion_r486810483
##########
File path:
pinot-plugins/pinot-file-system/pinot-s3/src/main/java/org/apache/pinot/plugin/filesystem/S3PinotFS.java
##########
@@ -374,33 +375,39 @@ public long length(URI fileUri)
throws IOException {
try {
ImmutableList.Builder<String> builder = ImmutableList.builder();
+ String continuationToken = null;
+ boolean isDone = false;
String prefix = normalizeToDirectoryPrefix(fileUri);
-
- ListObjectsV2Response listObjectsV2Response;
- ListObjectsV2Request.Builder listObjectsV2RequestBuilder =
- ListObjectsV2Request.builder().bucket(fileUri.getHost());
-
- if (!prefix.equals(DELIMITER)) {
- listObjectsV2RequestBuilder =
listObjectsV2RequestBuilder.prefix(prefix);
- }
-
- if (!recursive) {
- listObjectsV2RequestBuilder =
listObjectsV2RequestBuilder.delimiter(DELIMITER);
- }
-
- ListObjectsV2Request listObjectsV2Request =
listObjectsV2RequestBuilder.build();
- listObjectsV2Response = _s3Client.listObjectsV2(listObjectsV2Request);
-
- listObjectsV2Response.contents().stream().forEach(object -> {
- //Only add files and not directories
- if (!object.key().equals(fileUri.getPath()) &&
!object.key().endsWith(DELIMITER)) {
- String fileKey = object.key();
- if (fileKey.startsWith(DELIMITER)) {
- fileKey = fileKey.substring(1);
- }
- builder.add(S3_SCHEME + fileUri.getHost() + DELIMITER + fileKey);
+ while(!isDone) {
+ ListObjectsV2Request.Builder listObjectsV2RequestBuilder =
+ ListObjectsV2Request.builder().bucket(fileUri.getHost());
+ if (!prefix.equals(DELIMITER)) {
+ listObjectsV2RequestBuilder =
listObjectsV2RequestBuilder.prefix(prefix);
+ }
+ if (!recursive) {
+ listObjectsV2RequestBuilder =
listObjectsV2RequestBuilder.delimiter(DELIMITER);
}
- });
+ if (continuationToken != null) {
+ listObjectsV2RequestBuilder.continuationToken(continuationToken);
+ }
+ ListObjectsV2Request listObjectsV2Request =
listObjectsV2RequestBuilder.build();
+ LOGGER.debug("Trying to send ListObjectsV2Request {}",
listObjectsV2Request);
+ ListObjectsV2Response listObjectsV2Response =
_s3Client.listObjectsV2(listObjectsV2Request);
+ LOGGER.debug("Getting ListObjectsV2Response: {}",
listObjectsV2Response);
+ List<S3Object> filesReturned = listObjectsV2Response.contents();
+ filesReturned.stream().forEach(object -> {
+ //Only add files and not directories
+ if (!object.key().equals(fileUri.getPath()) &&
!object.key().endsWith(DELIMITER)) {
+ String fileKey = object.key();
+ if (fileKey.startsWith(DELIMITER)) {
+ fileKey = fileKey.substring(1);
+ }
+ builder.add(S3_SCHEME + fileUri.getHost() + DELIMITER + fileKey);
+ }
+ });
+ isDone = !listObjectsV2Response.isTruncated();
+ continuationToken = listObjectsV2Response.nextContinuationToken();
+ }
return builder.build().toArray(new String[0]);
Review comment:
will be good to log the total number of files listed as info
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
