Skip to content

JAMES-3150 S3BlobStoreDAO listBlob paging #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chibenwa merged 1 commit into from
Sep 9, 2021
Merged

JAMES-3150 S3BlobStoreDAO listBlob paging #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions ...er/blob/blob-s3/src/main/java/org/apache/james/blob/objectstorage/aws/S3BlobStoreDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
import software.amazon.awssdk.services.s3.model.DeleteObjectsResponse;
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
import software.amazon.awssdk.services.s3.model.ListBucketsResponse;
import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
import software.amazon.awssdk.services.s3.model.NoSuchBucketException;
import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
import software.amazon.awssdk.services.s3.model.ObjectIdentifier;
Expand Down Expand Up @@ -282,14 +282,12 @@ private Mono<Void> deleteResolvedBucket(BucketName bucketName) {
}

private Mono<BucketName> emptyBucket(BucketName bucketName) {
return Mono.fromFuture(() -> client.listObjects(builder -> builder.bucket(bucketName.asString())))
return Flux.from(client.listObjectsV2Paginator(builder -> builder.bucket(bucketName.asString())))
.flatMap(response -> Flux.fromIterable(response.contents())
.window(EMPTY_BUCKET_BATCH_SIZE)
.flatMap(this::buildListForBatch, DEFAULT_CONCURRENCY)
.flatMap(identifiers -> deleteObjects(bucketName, identifiers), DEFAULT_CONCURRENCY)
.then(Mono.just(response)))
.flux()
.takeUntil(list -> !list.isTruncated())
.then(Mono.just(bucketName));
}

Expand Down Expand Up @@ -324,12 +322,11 @@ public Publisher<BucketName> listBuckets() {

@Override
public Publisher<BlobId> listBlobs(BucketName bucketName) {
return Mono.fromFuture(() -> client.listObjects(builder -> builder.bucket(bucketName.asString())))
.flux()
.takeUntil(list -> !list.isTruncated())
.flatMapIterable(ListObjectsResponse::contents)
return Flux.from(client.listObjectsV2Paginator(builder -> builder.bucket(bucketName.asString())))
.flatMapIterable(ListObjectsV2Response::contents)
.map(S3Object::key)
.map(blobIdFactory::from)
.onErrorResume(e -> e.getCause() instanceof NoSuchBucketException, e -> Flux.empty())
.onErrorResume(NoSuchBucketException.class, e -> Flux.empty());
}
}
22 changes: 22 additions & 0 deletions ...lob/blob-s3/src/test/java/org/apache/james/blob/objectstorage/aws/S3BlobStoreDAOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,23 @@
****************************************************************/
package org.apache.james.blob.objectstorage.aws;

import static org.apache.james.blob.api.BlobStoreDAOFixture.ELEVEN_KILOBYTES;
import static org.apache.james.blob.api.BlobStoreDAOFixture.TEST_BUCKET_NAME;
import static org.assertj.core.api.Assertions.assertThat;

import org.apache.james.blob.api.BlobStoreDAO;
import org.apache.james.blob.api.BlobStoreDAOContract;
import org.apache.james.blob.api.TestBlobId;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

import com.google.common.io.ByteSource;

import reactor.core.publisher.Flux;

@ExtendWith(DockerAwsS3Extension.class)
public class S3BlobStoreDAOTest implements BlobStoreDAOContract {
private static S3BlobStoreDAO testee;
Expand Down Expand Up @@ -60,4 +69,17 @@ static void tearDownClass() {
public BlobStoreDAO testee() {
return testee;
}

@Test
void listingManyBlobsShouldSucceedWhenExceedingPageSize() {
BlobStoreDAO store = testee();

final int count = 1500;
Flux.range(0, count)
.flatMap(i -> store.save(TEST_BUCKET_NAME, new TestBlobId("test-blob-id-" + i), ByteSource.wrap(ELEVEN_KILOBYTES)))
.blockLast();

assertThat(Flux.from(testee().listBlobs(TEST_BUCKET_NAME)).count().block())
.isEqualTo(count);
}
}