Skip to content

Fix: Include script params in BulkRequest size calculation #19127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −8
Open

Fix: Include script params in BulkRequest size calculation #19127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions server/src/main/java/org/opensearch/action/bulk/BulkRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,12 @@
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
import org.opensearch.core.xcontent.MediaType;
import org.opensearch.script.Script;
import org.opensearch.search.fetch.subphase.FetchSourceContext;
import org.opensearch.transport.client.Client;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.*;

import static org.opensearch.action.ValidateActions.addValidationError;

Expand Down Expand Up @@ -198,8 +194,10 @@ BulkRequest internalAdd(UpdateRequest request) {
if (request.upsertRequest() != null) {
sizeInBytes += request.upsertRequest().source().length();
}
if (request.script() != null) {
sizeInBytes += request.script().getIdOrCode().length() * 2;
Script script = request.script();
if (script != null) {
sizeInBytes += (long) script.getIdOrCode().length() * 2L;
sizeInBytes += script.getParams().toString().length();
}
indices.add(request.index());
return this;
Expand Down
24 changes: 24 additions & 0 deletions server/src/test/java/org/opensearch/action/bulk/BulkRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import org.opensearch.core.xcontent.MediaTypeRegistry;
import org.opensearch.core.xcontent.XContentBuilder;
import org.opensearch.script.Script;
import org.opensearch.script.ScriptType;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.transport.client.Requests;

Expand Down Expand Up @@ -423,4 +424,27 @@ public void testBulkTerminatedByNewline() throws Exception {
);
assertEquals(3, bulkRequestWithNewLine.numberOfActions());
}

public void testScriptParamsAreIncludedInSize() {
BulkRequest bulkRequest = new BulkRequest();

UpdateRequest requestWithEmptyParams = new UpdateRequest("index", "id1");
requestWithEmptyParams.script(
new Script(ScriptType.INLINE, Script.DEFAULT_SCRIPT_LANG, "test script", Collections.emptyMap())
);
bulkRequest.add(requestWithEmptyParams);
long sizeWithEmptyParams = bulkRequest.estimatedSizeInBytes();

UpdateRequest requestWithParams = new UpdateRequest("index", "id2");
Map<String, Object> params = new HashMap<>();
params.put("param1", "test_value");
requestWithParams.script(
new Script(ScriptType.INLINE, Script.DEFAULT_SCRIPT_LANG, "test script", params)
);
bulkRequest.add(requestWithParams);
long sizeWithParams = bulkRequest.estimatedSizeInBytes();

assertTrue(sizeWithParams > sizeWithEmptyParams);
assertTrue(sizeWithParams - sizeWithEmptyParams >= params.toString().length());
}
}
Loading