Skip to content

fix(es): npe when applying scripted update on elasticsearch #15283

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

Merged
merged 3 commits into from
Nov 13, 2025
Merged

fix(es): npe when applying scripted update on elasticsearch #15283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
142e15c
fix(es): npe when applying scripted update on es
chakru-r Nov 12, 2025
c954b03
Merge branch 'master' into cr-oss-es-shim-npe
chakru-r Nov 12, 2025
c9353c9
Merge branch 'master' into cr-oss-es-shim-npe
chakru-r Nov 13, 2025
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
27 changes: 16 additions & 11 deletions ...java/com/linkedin/metadata/search/elasticsearch/client/shim/impl/Es8SearchClientShim.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1641,6 +1641,21 @@ protected void addToProcessor(BulkIngester<?> processor, DocWriteRequest<?> writ
if (writeRequest instanceof UpdateRequest) {
UpdateRequest update = (UpdateRequest) writeRequest;
Script script = convertScript(update.script());

@SuppressWarnings("rawtypes")
UpdateAction.Builder actionBuilder =
new UpdateAction.Builder()
.detectNoop(update.detectNoop())
.docAsUpsert(update.docAsUpsert())
.script(script)
.upsert(update.upsert());

// Only set doc if it exists (not present for script-only updates)
if (update.doc() != null) {
actionBuilder.doc(
XContentHelper.convertToMap(update.doc().source(), true, XContentType.JSON).v2());
}

operation =
new BulkOperation(
new UpdateOperation.Builder<>()
Expand All @@ -1651,17 +1666,7 @@ protected void addToProcessor(BulkIngester<?> processor, DocWriteRequest<?> writ
.requireAlias(writeRequest.isRequireAlias())
.index(writeRequest.index())
.routing(writeRequest.routing())
.action(
new UpdateAction.Builder<>()
.doc(
XContentHelper.convertToMap(
update.doc().source(), true, XContentType.JSON)
.v2())
.detectNoop(update.detectNoop())
.docAsUpsert(update.docAsUpsert())
.script(script)
.upsert(update.upsert())
.build())
.action(actionBuilder.build())
.build());
} else if (writeRequest instanceof DeleteRequest) {
DeleteRequest deleteRequest = (DeleteRequest) writeRequest;
Expand Down
2 changes: 2 additions & 0 deletions metadata-io/src/test/java/com/linkedin/metadata/search/update/ESWriteDAOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ public void testDeleteDocument() {
assertEquals(capturedRequest.id(), TEST_DOC_ID);
}

@Test
public void testApplyScriptUpdate() {
String scriptSource = "ctx._source.field = params.newValue";
Map<String, Object> scriptParams = new HashMap<>();
Expand All @@ -135,6 +136,7 @@ public void testApplyScriptUpdate() {
assertFalse(capturedRequest.detectNoop());
assertTrue(capturedRequest.scriptedUpsert());
assertEquals(NUM_RETRIES, capturedRequest.retryOnConflict());
assertNull(capturedRequest.doc()); // For scripted updates, this is null

// Verify script content and parameters
Script script = capturedRequest.script();
Expand Down
Loading