Skip to content

Commit 5228956

Browse files
committed
Add slices to delete and update by query in HLRC (#48420)
The slices param was missing from both delete by query and update by query in the HLRC request converters. This commit fixes the omission.
1 parent 1dd7ab8 commit 5228956

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,8 @@ private static Request prepareDeleteByQueryRequest(DeleteByQueryRequest deleteBy
586586
.withWaitForActiveShards(deleteByQueryRequest.getWaitForActiveShards())
587587
.withRequestsPerSecond(deleteByQueryRequest.getRequestsPerSecond())
588588
.withIndicesOptions(deleteByQueryRequest.indicesOptions())
589-
.withWaitForCompletion(waitForCompletion);
589+
.withWaitForCompletion(waitForCompletion)
590+
.withSlices(deleteByQueryRequest.getSlices());
590591
if (deleteByQueryRequest.isAbortOnVersionConflict() == false) {
591592
params.putParam("conflicts", "proceed");
592593
}
@@ -615,7 +616,8 @@ static Request updateByQuery(UpdateByQueryRequest updateByQueryRequest) throws I
615616
.withTimeout(updateByQueryRequest.getTimeout())
616617
.withWaitForActiveShards(updateByQueryRequest.getWaitForActiveShards())
617618
.withRequestsPerSecond(updateByQueryRequest.getRequestsPerSecond())
618-
.withIndicesOptions(updateByQueryRequest.indicesOptions());
619+
.withIndicesOptions(updateByQueryRequest.indicesOptions())
620+
.withSlices(updateByQueryRequest.getSlices());
619621
if (updateByQueryRequest.isAbortOnVersionConflict() == false) {
620622
params.putParam("conflicts", "proceed");
621623
}

client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,13 @@ public void testUpdateByQuery() throws IOException {
522522
if (randomBoolean()) {
523523
updateByQueryRequest.setScript(new Script("ctx._source.last = \"lastname\""));
524524
}
525+
if (randomBoolean()) {
526+
int slices = randomIntBetween(0, 4);
527+
expectedParams.put("slices", Integer.toString(slices));
528+
updateByQueryRequest.setSlices(slices);
529+
} else {
530+
expectedParams.put("slices", "1");
531+
}
525532
setRandomIndicesOptions(updateByQueryRequest::setIndicesOptions, updateByQueryRequest::indicesOptions, expectedParams);
526533
setRandomTimeout(updateByQueryRequest::setTimeout, ReplicationRequest.DEFAULT_TIMEOUT, expectedParams);
527534
Request request = RequestConverters.updateByQuery(updateByQueryRequest);
@@ -580,6 +587,13 @@ public void testDeleteByQuery() throws IOException {
580587
} else {
581588
expectedParams.put("requests_per_second", "-1");
582589
}
590+
if (randomBoolean()) {
591+
int slices = randomIntBetween(0, 4);
592+
expectedParams.put("slices", Integer.toString(slices));
593+
deleteByQueryRequest.setSlices(slices);
594+
} else {
595+
expectedParams.put("slices", "1");
596+
}
583597
setRandomIndicesOptions(deleteByQueryRequest::setIndicesOptions, deleteByQueryRequest::indicesOptions, expectedParams);
584598
setRandomTimeout(deleteByQueryRequest::setTimeout, ReplicationRequest.DEFAULT_TIMEOUT, expectedParams);
585599
expectedParams.put("wait_for_completion", Boolean.TRUE.toString());

0 commit comments

Comments
 (0)