Use removeBlobs() for bulk-delete.

We should use removeBlobs() for bulk-delete. The change deletes blobs
en-masse. Further, we no longer will perform a HEAD on every blob, as
that's fairly expensive.

Fixes #38

Author: Timur Alperovich

src/main/java/com/bouncestorage/swiftproxy/v1/AccountResource.java

@@ -24,7 +24,9 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -151,33 +153,48 @@ public BulkDeleteResult bulkDelete(@NotNull @PathParam("account") String account
         }
 
         BulkDeleteResult result = new BulkDeleteResult();
+        Map<String, List<String>> removeBlobsMap = new HashMap<>();
+        List<String> deleteContainers = new ArrayList<>();
         for (String objectContainer : objects) {
+            if (objectContainer.startsWith("/")) {
+                objectContainer = objectContainer.substring(1);
+            }
+            int separatorIndex = objectContainer.indexOf('/');
+            if (separatorIndex < 0) {
+                deleteContainers.add(objectContainer.substring(1));
+                continue;
+            }
+            String container = objectContainer.substring(0, separatorIndex);
+            String object = objectContainer.substring(separatorIndex + 1);
+
+            if (!removeBlobsMap.containsKey(container)) {
+                removeBlobsMap.put(container, new ArrayList<>());
+            }
+            removeBlobsMap.get(container).add(object);
+        }
+
+        removeBlobsMap.forEach((container, blobList) ->  {
             try {
-                if (objectContainer.startsWith("/")) {
-                    objectContainer = objectContainer.substring(1);
-                }
-                int separatorIndex = objectContainer.indexOf('/');
-                if (separatorIndex < 0) {
-                    blobStore.deleteContainer(objectContainer.substring(1));
-                    result.numberDeleted += 1;
-                    continue;
-                }
-                String container = objectContainer.substring(0, separatorIndex);
-                String object = objectContainer.substring(separatorIndex + 1);
-
-                if (!blobStore.blobExists(container, object)) {
-                    result.numberNotFound += 1;
-                } else {
-                    blobStore.removeBlob(container, object);
-                    result.numberDeleted += 1;
-                }
+                blobStore.removeBlobs(container, blobList);
+                result.numberDeleted += blobList.size();
+            } catch (ContainerNotFoundException e) {
+                result.numberNotFound += blobList.size();
+            } catch (Exception e) {
+                logger.debug("Failed to remove blobs: " + e.getMessage(), e);
+                blobList.forEach(blob -> result.errors.add(container + "/" + blob));
+            }
+        });
+        deleteContainers.forEach(container -> {
+            try {
+                blobStore.deleteContainer(container);
+                result.numberDeleted += 1;
             } catch (ContainerNotFoundException e) {
                 result.numberNotFound += 1;
             } catch (Exception e) {
-                e.printStackTrace();
-                result.errors.add(objectContainer);
+                logger.debug("Failed to delete container " + container + ": " + e.getMessage(), e);
+                result.errors.add(container);
             }
-        }
+        });
 
         if (result.errors.isEmpty()) {
             result.responseStatus = Response.Status.OK.toString();