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.

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 bulk API ignores ingest pipeline for upsert #12883

Merged
merged 7 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Removed

### Fixed
- Fix bulk API ignores ingest pipeline for upsert ([#12883](https://github.com/opensearch-project/OpenSearch/pull/12883))
- Fix issue with feature flags where default value may not be honored ([#12849](https://github.com/opensearch-project/OpenSearch/pull/12849))

### Security
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,26 @@ teardown:

- is_false: _source.field1
- match: {_source.field2: value2}

# related issue: https://github.com/opensearch-project/OpenSearch/issues/12854
---
"Test bulk honors pipeline in update action with upsert":
- skip:
version: " - 2.99.99"
reason: "fixed in 3.0.0"

- do:
bulk:
refresh: true
body:
- '{"update": {"_index": "test_index", "_id": "test_id3", "pipeline": "pipeline1"}}'
- '{"upsert": {"f1": "v2", "f2": 47}, "doc": {"x": 1}}'

- match: { errors: false }
- match: { items.0.update.result: created }

- do:
get:
index: test_index
id: test_id3
- match: { _source: {"f1": "v2", "f2": 47, "field1": "value1"}}
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ public void parse(
}
IndexRequest upsertRequest = updateRequest.upsertRequest();
if (upsertRequest != null) {
upsertRequest.setPipeline(defaultPipeline);
upsertRequest.setPipeline(pipeline);
}

updateRequestConsumer.accept(updateRequest);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,13 @@ public void testUpdateRequest() throws IOException {
parser.parse(request, "foo", null, null, null, true, false, MediaTypeRegistry.JSON, req -> fail(), updateRequest -> {
assertFalse(updateRequest.isRequireAlias());
}, req -> fail());

request = new BytesArray(
"{ \"update\":{ \"_id\": \"bar\", \"require_alias\": false, \"pipeline\": \"testPipeline\" } }\n{\"upsert\": {\"x\": 1}}\n"
);
parser.parse(request, "foo", null, null, null, true, false, MediaTypeRegistry.JSON, req -> fail(), updateRequest -> {
assertEquals(updateRequest.upsertRequest().getPipeline(), "testPipeline");
}, req -> fail());
}

public void testBarfOnLackOfTrailingNewline() {
Expand Down
Loading