honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

no need for objectCount, we can use keys

This commit is contained in:
Shay Banon 2012-03-07 22:08:58 +02:00
parent bb222f0f7f
commit b9368e2fc2
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/elasticsearch/cloud/aws/blobstore/S3BlobStore.java
View File

@ -100,7 +100,6 @@ public class S3BlobStore extends AbstractComponent implements BlobStore {
ObjectListing prevListing = null; ObjectListing prevListing = null;
//From http://docs.amazonwebservices.com/AmazonS3/latest/dev/DeletingMultipleObjectsUsingJava.html //From http://docs.amazonwebservices.com/AmazonS3/latest/dev/DeletingMultipleObjectsUsingJava.html
//we can do at most 1K objects per delete //we can do at most 1K objects per delete
int objectCount = 0;
//We don't know the bucket name until first object listing //We don't know the bucket name until first object listing
DeleteObjectsRequest multiObjectDeleteRequest = null; DeleteObjectsRequest multiObjectDeleteRequest = null;
ArrayList<KeyVersion> keys = new ArrayList<KeyVersion>(); ArrayList<KeyVersion> keys = new ArrayList<KeyVersion>();
@ -113,15 +112,13 @@ public class S3BlobStore extends AbstractComponent implements BlobStore {
multiObjectDeleteRequest = new DeleteObjectsRequest(list.getBucketName()); multiObjectDeleteRequest = new DeleteObjectsRequest(list.getBucketName());
} }
for (S3ObjectSummary summary : list.getObjectSummaries()) { for (S3ObjectSummary summary : list.getObjectSummaries()) {
objectCount++;
keys.add(new KeyVersion(summary.getKey())); keys.add(new KeyVersion(summary.getKey()));
//Every 500 objects batch the delete request //Every 500 objects batch the delete request
if (objectCount > 500) { if (keys.size() > 500) {
multiObjectDeleteRequest.setKeys(keys); multiObjectDeleteRequest.setKeys(keys);
client.deleteObjects(multiObjectDeleteRequest); client.deleteObjects(multiObjectDeleteRequest);
multiObjectDeleteRequest = new DeleteObjectsRequest(list.getBucketName()); multiObjectDeleteRequest = new DeleteObjectsRequest(list.getBucketName());
keys.clear(); keys.clear();
objectCount = 0;
} }
} }
if (list.isTruncated()) { if (list.isTruncated()) {
@ -130,7 +127,7 @@ public class S3BlobStore extends AbstractComponent implements BlobStore {
break; break;
} }
} }
if (objectCount > 0) { if (!keys.isEmpty()) {
multiObjectDeleteRequest.setKeys(keys); multiObjectDeleteRequest.setKeys(keys);
client.deleteObjects(multiObjectDeleteRequest); client.deleteObjects(multiObjectDeleteRequest);
} }