Skip to content
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

Refactor storage batches to use StorageBatchRequest and BatchResult #952

Merged
merged 2 commits into from
May 20, 2016
Merged

Refactor storage batches to use StorageBatchRequest and BatchResult #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ceb59f
Refactor storage batches to use StorageBatchRequest and BatchResult
mziccard Apr 22, 2016
e9dbb7c
Limit batch size (storage performs better if the batches are split)
mziccard Apr 27, 2016
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
131 changes: 0 additions & 131 deletions gcloud-java-storage/src/main/java/com/google/cloud/storage/BatchRequest.java
View file
Open in desktop

This file was deleted.

162 changes: 0 additions & 162 deletions gcloud-java-storage/src/main/java/com/google/cloud/storage/BatchResponse.java
View file
Open in desktop

This file was deleted.

38 changes: 23 additions & 15 deletions gcloud-java-storage/src/main/java/com/google/cloud/storage/Bucket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,15 @@
import com.google.cloud.storage.Storage.BucketTargetOption;
import com.google.cloud.storage.spi.StorageRpc;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;

import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Set;
Expand Down Expand Up @@ -609,19 +608,28 @@ public Blob get(String blob, BlobGetOption... options) {
* @throws StorageException upon failure
*/
public List<Blob> get(String blobName1, String blobName2, String... blobNames) {
BatchRequest.Builder batch = BatchRequest.builder();
batch.get(name(), blobName1);
batch.get(name(), blobName2);
for (String name : blobNames) {
batch.get(name(), name);
}
List<Blob> blobs = new ArrayList<>(blobNames.length);
BatchResponse response = storage.submit(batch.build());
for (BatchResponse.Result<Blob> result : response.gets()) {
BlobInfo blobInfo = result.get();
blobs.add(blobInfo != null ? new Blob(storage, new BlobInfo.BuilderImpl(blobInfo)) : null);
}
return Collections.unmodifiableList(blobs);
List<BlobId> blobIds = Lists.newArrayListWithCapacity(blobNames.length + 2);
blobIds.add(BlobId.of(name(), blobName1));
blobIds.add(BlobId.of(name(), blobName2));
for (String blobName : blobNames) {
blobIds.add(BlobId.of(name(), blobName));
}
return storage.get(blobIds);
}

/**
* Returns a list of requested blobs in this bucket. Blobs that do not exist are null.
*
* @param blobNames blobs to get
* @return an immutable list of {@code Blob} objects
* @throws StorageException upon failure
*/
public List<Blob> get(Iterable<String> blobNames) {
ImmutableList.Builder<BlobId> builder = ImmutableList.builder();
for (String blobName : blobNames) {
builder.add(BlobId.of(name(), blobName));
}
return storage.get(builder.build());
}

/**
Expand Down
Loading