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

ingest: support default pipelines + bulk upserts #36618

Merged
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
review: nits
jakelandis committed Dec 17, 2018

Unverified

This user has not yet uploaded their public signing key.
commit 4bf560a52c363eb9253c3450ee0821313f02c5b6
Original file line number Diff line number Diff line change
@@ -124,11 +124,11 @@ teardown:
refresh: true
body: |
{"update":{"_id":"6","_index":"test","_type":"test"}}
{"script":{"source":"ctx._source.ran_script = true"},"upsert":{"bytes_source_field":"1kb"}}
{"script":"ctx._source.ran_script = true","upsert":{"bytes_source_field":"1kb"}}
{"update":{"_id":"7","_index":"test","_type":"test"}}
{"doc":{"bytes_source_field":"2kb"}, "doc_as_upsert":true}
{"update":{"_id":"8","_index":"test","_type":"test"}}
{"script":{"source":"ctx._source.ran_script = true"},"upsert":{"bytes_source_field":"3kb"}, "scripted_upsert" : true}
{"script": "ctx._source.ran_script = true","upsert":{"bytes_source_field":"3kb"}, "scripted_upsert" : true}

- do:
mget:
Original file line number Diff line number Diff line change
@@ -584,7 +584,6 @@ void processBulkIndexIngestRequest(Task task, BulkRequest original, ActionListen
indexRequest -> bulkRequestModifier.markCurrentItemAsDropped());
}


static final class BulkRequestModifier implements Iterator<DocWriteRequest<?>> {

final BulkRequest bulkRequest;
Original file line number Diff line number Diff line change
@@ -152,6 +152,5 @@ public void testGetIndexWriteRequest() throws Exception {

UpdateRequest badUpsertRequest = new UpdateRequest("index", "type", "id1");
assertNull(TransportBulkAction.getIndexWriteRequest(badUpsertRequest));

}
}