-
Notifications
You must be signed in to change notification settings - Fork 331
Refactor getBulkOperationForAction into BulkOperationFactory #6748
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.
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
dinujoh
merged 3 commits into
opensearch-project:main
from
dinujoh:feature/opensearch-bulk-operation-factory
Apr 13, 2026
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
131 changes: 131 additions & 0 deletions
131
...rc/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/BulkOperationFactory.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| * | ||
| */ | ||
|
|
||
| package org.opensearch.dataprepper.plugins.sink.opensearch; | ||
|
|
||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.opensearch.client.opensearch._types.VersionType; | ||
| import org.opensearch.client.opensearch.core.bulk.BulkOperation; | ||
| import org.opensearch.client.opensearch.core.bulk.CreateOperation; | ||
| import org.opensearch.client.opensearch.core.bulk.DeleteOperation; | ||
| import org.opensearch.client.opensearch.core.bulk.IndexOperation; | ||
| import org.opensearch.client.opensearch.core.bulk.UpdateOperation; | ||
| import org.opensearch.dataprepper.model.opensearch.OpenSearchBulkActions; | ||
| import org.opensearch.dataprepper.plugins.sink.opensearch.bulk.SerializedJson; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Optional; | ||
|
|
||
| public class BulkOperationFactory { | ||
|
|
||
| private final VersionType versionType; | ||
| private final ScriptManager scriptManager; | ||
| private final ObjectMapper objectMapper; | ||
| private final boolean usingDocumentFilters; | ||
|
|
||
| public BulkOperationFactory(final VersionType versionType, | ||
| final ScriptManager scriptManager, | ||
| final ObjectMapper objectMapper, | ||
| final boolean usingDocumentFilters) { | ||
| this.versionType = versionType; | ||
| this.scriptManager = scriptManager; | ||
| this.objectMapper = objectMapper; | ||
| this.usingDocumentFilters = usingDocumentFilters; | ||
| } | ||
|
|
||
| public BulkOperation create(final String action, | ||
| final SerializedJson document, | ||
| final Long version, | ||
| final String indexName, | ||
| final JsonNode jsonNode) { | ||
| final Optional<String> docId = document.getDocumentId(); | ||
| final Optional<String> routing = document.getRoutingField(); | ||
| final Optional<String> pipeline = document.getPipelineField(); | ||
|
|
||
| if (StringUtils.equals(action, OpenSearchBulkActions.CREATE.toString())) { | ||
| final CreateOperation.Builder<Object> builder = | ||
| new CreateOperation.Builder<>() | ||
| .index(indexName) | ||
| .document(document); | ||
| docId.ifPresent(builder::id); | ||
| routing.ifPresent(builder::routing); | ||
| pipeline.ifPresent(builder::pipeline); | ||
| return new BulkOperation.Builder().create(builder.build()).build(); | ||
| } | ||
|
|
||
| if (StringUtils.equals(action, OpenSearchBulkActions.UPDATE.toString()) || | ||
| StringUtils.equals(action, OpenSearchBulkActions.UPSERT.toString())) { | ||
| return createUpdateOperation(action, document, version, indexName, jsonNode, docId, routing); | ||
| } | ||
|
|
||
| if (StringUtils.equals(action, OpenSearchBulkActions.DELETE.toString())) { | ||
| final DeleteOperation.Builder builder = new DeleteOperation.Builder() | ||
| .index(indexName) | ||
| .versionType(versionType) | ||
| .version(version); | ||
| docId.ifPresent(builder::id); | ||
| routing.ifPresent(builder::routing); | ||
| return new BulkOperation.Builder().delete(builder.build()).build(); | ||
| } | ||
|
|
||
| // Default to "index" | ||
| final IndexOperation.Builder<Object> builder = new IndexOperation.Builder<>() | ||
| .index(indexName) | ||
| .document(document) | ||
| .version(version) | ||
| .versionType(versionType); | ||
| docId.ifPresent(builder::id); | ||
| routing.ifPresent(builder::routing); | ||
| pipeline.ifPresent(builder::pipeline); | ||
| return new BulkOperation.Builder().index(builder.build()).build(); | ||
| } | ||
|
|
||
| private BulkOperation createUpdateOperation(final String action, | ||
| final SerializedJson document, | ||
| final Long version, | ||
| final String indexName, | ||
| final JsonNode jsonNode, | ||
| final Optional<String> docId, | ||
| final Optional<String> routing) { | ||
| JsonNode filteredJsonNode = jsonNode; | ||
| try { | ||
| if (usingDocumentFilters) { | ||
| filteredJsonNode = objectMapper.reader().readTree(document.getSerializedJson()); | ||
| } | ||
| } catch (final IOException e) { | ||
| throw new RuntimeException( | ||
| String.format("An exception occurred while deserializing a document for the %s action: %s", action, e.getMessage())); | ||
| } | ||
|
|
||
| final boolean isUpsert = StringUtils.equals(action.toLowerCase(), OpenSearchBulkActions.UPSERT.toString()); | ||
| final UpdateOperation.Builder<Object> builder = new UpdateOperation.Builder<>() | ||
| .index(indexName) | ||
| .versionType(versionType) | ||
| .version(version); | ||
|
|
||
| if (scriptManager.isScriptEnabled()) { | ||
| builder.script(scriptManager.buildScript(filteredJsonNode, document.getResolvedScriptParameters().orElse(null))); | ||
| if (isUpsert) { | ||
| builder.upsert(filteredJsonNode); | ||
| builder.scriptedUpsert(true); | ||
| } | ||
| } else if (isUpsert) { | ||
| builder.document(filteredJsonNode).upsert(filteredJsonNode); | ||
| } else { | ||
| builder.document(filteredJsonNode); | ||
| } | ||
|
|
||
| docId.ifPresent(builder::id); | ||
| routing.ifPresent(builder::routing); | ||
| return new BulkOperation.Builder().update(builder.build()).build(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.