void on setNormalisedBytesParsedOn

pgomulka · Jul 8, 2024 · 8529895 · 8529895
1 parent 444835c
commit 8529895
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/...sterTest/java/org/elasticsearch/plugins/internal/DocumentSizeObserverWithPipelinesIT.java b/...sterTest/java/org/elasticsearch/plugins/internal/DocumentSizeObserverWithPipelinesIT.java
@@ -139,8 +139,8 @@ public long normalisedBytesParsed() {
         }
 
         @Override
-        public IndexRequest setNormalisedBytesParsedOn(IndexRequest indexRequest) {
-            return indexRequest.setNormalisedBytesParsed(mapCounter);
+        public void setNormalisedBytesParsedOn(IndexRequest indexRequest) {
+            indexRequest.setNormalisedBytesParsed(mapCounter);
         }
     }
 

diff --git a/...c/internalClusterTest/java/org/elasticsearch/plugins/internal/DocumentSizeObserverIT.java b/...c/internalClusterTest/java/org/elasticsearch/plugins/internal/DocumentSizeObserverIT.java
@@ -183,8 +183,8 @@ public long normalisedBytesParsed() {
         }
 
         @Override
-        public IndexRequest setNormalisedBytesParsedOn(IndexRequest indexRequest) {
-            return indexRequest.setNormalisedBytesParsed(counter);
+        public void setNormalisedBytesParsedOn(IndexRequest indexRequest) {
+            indexRequest.setNormalisedBytesParsed(counter);
         }
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java b/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java
@@ -271,7 +271,7 @@ Result prepareUpdateScriptRequest(ShardId shardId, UpdateRequest request, GetRes
                     .waitForActiveShards(request.waitForActiveShards())
                     .timeout(request.timeout())
                     .setRefreshPolicy(request.getRefreshPolicy());
-                indexRequest = documentSizeObserver.setNormalisedBytesParsedOn(indexRequest);
+                documentSizeObserver.setNormalisedBytesParsedOn(indexRequest);
                 return new Result(indexRequest, DocWriteResponse.Result.UPDATED, updatedSourceAsMap, updateSourceContentType);
             }
             case DELETE -> {

diff --git a/server/src/main/java/org/elasticsearch/plugins/internal/DocumentSizeObserver.java b/server/src/main/java/org/elasticsearch/plugins/internal/DocumentSizeObserver.java
@@ -46,9 +46,7 @@ public long normalisedBytesParsed() {
      */
     long normalisedBytesParsed();
 
-    default IndexRequest setNormalisedBytesParsedOn(IndexRequest indexRequest) {
-        return indexRequest;
-    }
+    default void setNormalisedBytesParsedOn(IndexRequest indexRequest) {}
 
     default boolean isUpdateByScript() {
         return false;

diff --git a/server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java b/server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java
@@ -1189,9 +1189,9 @@ public long normalisedBytesParsed() {
                     }
 
                     @Override
-                    public IndexRequest setNormalisedBytesParsedOn(IndexRequest indexRequest) {
+                    public void setNormalisedBytesParsedOn(IndexRequest indexRequest) {
                         parsedValueWasUsed.incrementAndGet();
-                        return indexRequest.setNormalisedBytesParsed(0L);
+                        indexRequest.setNormalisedBytesParsed(0L);
                     }
                 };
             }