From 15fbbd43ce74c211f6878aee9fd24d872fed2815 Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Mon, 24 Sep 2012 14:03:57 +0200
Subject: [PATCH] Bulk Delete item when broadcast to all shard (lack of
 routing) might not be applied correctly closes #2285.

---
 .../action/bulk/TransportBulkAction.java            |  2 +-
 .../elasticsearch/action/delete/DeleteRequest.java  | 10 ++++++++++
 .../ShardReplicationOperationRequest.java           | 13 +++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java b/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java
index 8ec3837d5a5..d59ec2092ec 100644
--- a/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java
+++ b/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java
@@ -188,7 +188,7 @@ public class TransportBulkAction extends TransportAction<BulkRequest, BulkRespon
                             list = Lists.newArrayList();
                             requestsByShard.put(shardIt.shardId(), list);
                         }
-                        list.add(new BulkItemRequest(i, request));
+                        list.add(new BulkItemRequest(i, new DeleteRequest(deleteRequest)));
                     }
                 } else {
                     ShardId shardId = clusterService.operationRouting().deleteShards(clusterState, deleteRequest.index(), deleteRequest.type(), deleteRequest.id(), deleteRequest.routing()).shardId();
diff --git a/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java b/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java
index 74a4e8719ee..e8cf249973e 100644
--- a/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java
+++ b/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java
@@ -76,6 +76,16 @@ public class DeleteRequest extends ShardReplicationOperationRequest {
         this.id = id;
     }
 
+    public DeleteRequest(DeleteRequest request) {
+        super(request);
+        this.type = request.type();
+        this.id = request.id();
+        this.routing = request.routing();
+        this.refresh = request.refresh();
+        this.version = request.version();
+        this.versionType = request.versionType();
+    }
+
     public DeleteRequest() {
     }
 
diff --git a/src/main/java/org/elasticsearch/action/support/replication/ShardReplicationOperationRequest.java b/src/main/java/org/elasticsearch/action/support/replication/ShardReplicationOperationRequest.java
index 6d01a91a2bf..b0a30e8fc10 100644
--- a/src/main/java/org/elasticsearch/action/support/replication/ShardReplicationOperationRequest.java
+++ b/src/main/java/org/elasticsearch/action/support/replication/ShardReplicationOperationRequest.java
@@ -61,6 +61,19 @@ public abstract class ShardReplicationOperationRequest implements ActionRequest
         return this;
     }
 
+    protected ShardReplicationOperationRequest() {
+
+    }
+
+    public ShardReplicationOperationRequest(ShardReplicationOperationRequest request) {
+        this.timeout = request.timeout();
+        this.index = request.index();
+        this.threadedListener = request.threadedListener;
+        this.threadedOperation = request.threadedOperation;
+        this.replicationType = request.replicationType();
+        this.consistencyLevel = request.consistencyLevel();
+    }
+
     /**
      * Should the listener be called on a separate thread if needed.
      */