Skip to content
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

Fix OpenSearchSink upsert operation #4178

Merged
merged 2 commits into from
Feb 23, 2024
Merged

Fix OpenSearchSink upsert operation #4178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4e868f
Fix opensearch upsert operation in Opensearch Sink
Feb 22, 2024
bef0045
Modified to to Stringutils.equals
Feb 22, 2024
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
36 changes: 34 additions & 2 deletions ...grationTest/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSinkIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ public void testBulkActionUpdateWithActions() throws IOException, InterruptedExc

@Test
public void testBulkActionUpdateWithDocumentRootKey() throws IOException, InterruptedException {
final String testIndexAlias = "test-alias-upd1";
final String testIndexAlias = "test-alias-update";
final String testTemplateFile = Objects.requireNonNull(
getClass().getClassLoader().getResource(TEST_TEMPLATE_BULK_FILE)).getFile();

Expand Down Expand Up @@ -960,9 +960,40 @@ public void testBulkActionUpdateWithDocumentRootKey() throws IOException, Interr
sink.shutdown();
}

@Test
public void testBulkActionUpsertWithActionsAndNoCreate() throws IOException, InterruptedException {
final String testIndexAlias = "test-alias-upsert-no-create2";
final String testTemplateFile = Objects.requireNonNull(
getClass().getClassLoader().getResource(TEST_TEMPLATE_BULK_FILE)).getFile();

final String testIdField = "someId";
final String testId = "foo";
List<Record<Event>> testRecords = Collections.singletonList(jsonStringToRecord(generateCustomRecordJson2(testIdField, testId, "key", "value")));

List<Map<String, Object>> aList = new ArrayList<>();
Map<String, Object> actionMap = new HashMap<>();
actionMap.put("type", OpenSearchBulkActions.UPSERT.toString());
aList.add(actionMap);

final PluginSetting pluginSetting = generatePluginSetting(null, testIndexAlias, testTemplateFile);
pluginSetting.getSettings().put(IndexConfiguration.DOCUMENT_ID_FIELD, testIdField);
pluginSetting.getSettings().put(IndexConfiguration.ACTIONS, aList);
OpenSearchSink sink = createObjectUnderTest(pluginSetting, true);

sink.output(testRecords);
List<Map<String, Object>> retSources = getSearchResponseDocSources(testIndexAlias);

assertThat(retSources.size(), equalTo(1));
Map<String, Object> source = retSources.get(0);
assertThat((String) source.get("key"), equalTo("value"));
assertThat((String) source.get(testIdField), equalTo(testId));
assertThat(getDocumentCount(testIndexAlias, "_id", testId), equalTo(Integer.valueOf(1)));
sink.shutdown();
}

@Test
public void testBulkActionUpsertWithActions() throws IOException, InterruptedException {
final String testIndexAlias = "test-alias-upd2";
final String testIndexAlias = "test-alias-upsert";
final String testTemplateFile = Objects.requireNonNull(
getClass().getClassLoader().getResource(TEST_TEMPLATE_BULK_FILE)).getFile();

Expand Down Expand Up @@ -1725,6 +1756,7 @@ private void wipeAllOpenSearchIndices() throws IOException {
.filter(Predicate.not(indexName -> indexName.startsWith(".opendistro_")))
.filter(Predicate.not(indexName -> indexName.startsWith(".opensearch-")))
.filter(Predicate.not(indexName -> indexName.startsWith(".opensearch_")))
.filter(Predicate.not(indexName -> indexName.startsWith(".ql")))
.filter(Predicate.not(indexName -> indexName.startsWith(".plugins-ml-config")))
.forEach(indexName -> {
try {
Expand Down
2 changes: 1 addition & 1 deletion ...arch/src/main/java/org/opensearch/dataprepper/plugins/sink/opensearch/OpenSearchSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ private BulkOperation getBulkOperationForAction(final String action,
}


final UpdateOperation.Builder<Object> updateOperationBuilder = (action.toLowerCase() == OpenSearchBulkActions.UPSERT.toString()) ?
final UpdateOperation.Builder<Object> updateOperationBuilder = (StringUtils.equals(action.toLowerCase(), OpenSearchBulkActions.UPSERT.toString())) ?
new UpdateOperation.Builder<>()
.index(indexName)
.document(filteredJsonNode)
Expand Down
Loading