Skip to content

Add pipeline setup to index and create operations #587

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 2 commits into from
Jun 13, 2023
Merged

Add pipeline setup to index and create operations #587

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34640f3
Add pipeline setup to index and create operations
rgaray-disney May 26, 2023
f0cfc0a
Add requireAlias to copyProperties methods and add test to BulkIngester
renatogm24 Jun 9, 2023
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
14 changes: 12 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,16 @@ 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());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please add requireAlias that is also part of index operations?

Suggested change
builder.pipeline(op.pipeline());
builder.pipeline(op.pipeline());
builder.requireAlias(op.requireAlias());

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes sure, it is done.

}

private static void copyCreateProperties(CreateOperation<?> op, CreateOperation.Builder<?> builder) {
copyBaseProperties(op, builder);
builder.pipeline(op.pipeline());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here:

Suggested change
builder.pipeline(op.pipeline());
builder.pipeline(op.pipeline());
builder.requireAlias(op.requireAlias());

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes sure, it is done.

}

private static int size(String name, @Nullable Boolean value) {
if (value != null) {
return name.length() + 12; // 12 added chars for "name":"false",
Expand Down