A dropped IndexRequest should return an IndexResponse, not an UpdateR…

…esponse
romseygeek · Sep 28, 2023 · b357de4 · b357de4
1 parent a698f4d
commit b357de4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java b/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java
@@ -26,13 +26,13 @@
 import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
 import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
 import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.action.ingest.IngestActionForwarder;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.action.support.WriteResponse;
 import org.elasticsearch.action.support.replication.ReplicationResponse;
 import org.elasticsearch.action.update.UpdateRequest;
-import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.ClusterStateObserver;
@@ -936,7 +936,7 @@ synchronized void markItemAsDropped(int slot) {
                 BulkItemResponse.success(
                     slot,
                     indexRequest.opType(),
-                    new UpdateResponse(
+                    new IndexResponse(
                         new ShardId(indexRequest.index(), IndexMetadata.INDEX_UUID_NA_VALUE, 0),
                         id,
                         SequenceNumbers.UNASSIGNED_SEQ_NO,

diff --git a/server/src/main/java/org/elasticsearch/action/index/IndexResponse.java b/server/src/main/java/org/elasticsearch/action/index/IndexResponse.java
@@ -39,12 +39,12 @@ public IndexResponse(ShardId shardId, String id, long seqNo, long primaryTerm, l
         this(shardId, id, seqNo, primaryTerm, version, created ? Result.CREATED : Result.UPDATED);
     }
 
-    private IndexResponse(ShardId shardId, String id, long seqNo, long primaryTerm, long version, Result result) {
-        super(shardId, id, seqNo, primaryTerm, version, assertCreatedOrUpdated(result));
+    public IndexResponse(ShardId shardId, String id, long seqNo, long primaryTerm, long version, Result result) {
+        super(shardId, id, seqNo, primaryTerm, version, assertCreatedOrUpdatedOrNoop(result));
     }
 
-    private static Result assertCreatedOrUpdated(Result result) {
-        assert result == Result.CREATED || result == Result.UPDATED;
+    private static Result assertCreatedOrUpdatedOrNoop(Result result) {
+        assert result == Result.CREATED || result == Result.UPDATED || result == Result.NOOP;
         return result;
     }