Skip to content

[8.8] Add pipeline setup to index and create operations (#587) #594

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 1 commit into from
Jun 13, 2023
Merged

[8.8] Add pipeline setup to index and create operations (#587) #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions ...lient/src/main/java/co/elastic/clients/elasticsearch/_helpers/bulk/IngesterOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ private static IngesterOperation createOperation(BulkOperation operation, JsonpM
BinaryData binaryDoc = BinaryData.of(create.document(), mapper);
size += binaryDoc.size();
newOperation = BulkOperation.of(bo -> bo.create(idx -> {
copyBaseProperties(create, idx);
copyCreateProperties(create, idx);
return idx.document(binaryDoc);
}));
}
Expand All @@ -102,7 +102,7 @@ private static IngesterOperation indexOperation(BulkOperation operation, JsonpMa
BinaryData binaryDoc = BinaryData.of(index.document(), mapper);
size += binaryDoc.size();
newOperation = BulkOperation.of(bo -> bo.index(idx -> {
copyBaseProperties(index, idx);
copyIndexProperties(index, idx);
return idx.document(binaryDoc);
}));
}
Expand Down Expand Up @@ -154,6 +154,18 @@ private static void copyBaseProperties(BulkOperationBase op, BulkOperationBase.A
.versionType(op.versionType());
}

private static void copyIndexProperties(IndexOperation<?> op, IndexOperation.Builder<?> builder) {
copyBaseProperties(op, builder);
builder.pipeline(op.pipeline());
builder.requireAlias(op.requireAlias());
}

private static void copyCreateProperties(CreateOperation<?> op, CreateOperation.Builder<?> builder) {
copyBaseProperties(op, builder);
builder.pipeline(op.pipeline());
builder.requireAlias(op.requireAlias());
}

private static int size(String name, @Nullable Boolean value) {
if (value != null) {
return name.length() + 12; // 12 added chars for "name":"false",
Expand Down
23 changes: 23 additions & 0 deletions ...client/src/test/java/co/elastic/clients/elasticsearch/_helpers/bulk/BulkIngesterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import co.elastic.clients.elasticsearch.core.bulk.OperationType;
import co.elastic.clients.elasticsearch.end_to_end.RequestTest;
import co.elastic.clients.json.JsonpMapper;
import co.elastic.clients.json.JsonpUtils;
import co.elastic.clients.json.SimpleJsonpMapper;
import co.elastic.clients.transport.ElasticsearchTransport;
import co.elastic.clients.transport.Endpoint;
Expand Down Expand Up @@ -358,6 +359,28 @@ public void beforeBulk(long executionId, BulkRequest request, List<Void> context
assertEquals("bar", storedRequest.get().routing());
}

@Test
public void pipelineTest() {
String json = "{\"create\":{\"_id\":\"some_id\",\"_index\":\"some_idx\",\"pipeline\":\"pipe\",\"require_alias\":true}}";
JsonpMapper mapper = new SimpleJsonpMapper();

BulkOperation create = BulkOperation.of(o -> o.create(c -> c
.pipeline("pipe")
.requireAlias(true)
.index("some_idx")
.id("some_id")
.document("Some doc")
));

String createStr = JsonpUtils.toJsonString(create, mapper);
assertEquals(json, createStr);

BulkOperation create1 = IngesterOperation.of(create, mapper).operation();

String create1Str = JsonpUtils.toJsonString(create1, mapper);
assertEquals(json, create1Str);
}

@Test
public void endToEndTest() throws Exception {
String index = "bulk-ingester-test";
Expand Down