Skip to content

Commit 27c1902

Browse files
authored
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 93ecb9b commit 27c1902

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,8 @@ private static Request prepareDeleteByQueryRequest(DeleteByQueryRequest deleteBy
567567
.withWaitForActiveShards(deleteByQueryRequest.getWaitForActiveShards())
568568
.withRequestsPerSecond(deleteByQueryRequest.getRequestsPerSecond())
569569
.withIndicesOptions(deleteByQueryRequest.indicesOptions())
570-
.withWaitForCompletion(waitForCompletion);
570+
.withWaitForCompletion(waitForCompletion)
571+
.withSlices(deleteByQueryRequest.getSlices());
571572
if (deleteByQueryRequest.isAbortOnVersionConflict() == false) {
572573
params.putParam("conflicts", "proceed");
573574
}
@@ -595,7 +596,8 @@ static Request updateByQuery(UpdateByQueryRequest updateByQueryRequest) throws I
595596
.withTimeout(updateByQueryRequest.getTimeout())
596597
.withWaitForActiveShards(updateByQueryRequest.getWaitForActiveShards())
597598
.withRequestsPerSecond(updateByQueryRequest.getRequestsPerSecond())
598-
.withIndicesOptions(updateByQueryRequest.indicesOptions());
599+
.withIndicesOptions(updateByQueryRequest.indicesOptions())
600+
.withSlices(updateByQueryRequest.getSlices());
599601
if (updateByQueryRequest.isAbortOnVersionConflict() == false) {
600602
params.putParam("conflicts", "proceed");
601603
}

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

+14
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,13 @@ public void testUpdateByQuery() throws IOException {
459459
if (randomBoolean()) {
460460
updateByQueryRequest.setScript(new Script("ctx._source.last = \"lastname\""));
461461
}
462+
if (randomBoolean()) {
463+
int slices = randomIntBetween(0, 4);
464+
expectedParams.put("slices", Integer.toString(slices));
465+
updateByQueryRequest.setSlices(slices);
466+
} else {
467+
expectedParams.put("slices", "1");
468+
}
462469
setRandomIndicesOptions(updateByQueryRequest::setIndicesOptions, updateByQueryRequest::indicesOptions, expectedParams);
463470
setRandomTimeout(updateByQueryRequest::setTimeout, ReplicationRequest.DEFAULT_TIMEOUT, expectedParams);
464471
Request request = RequestConverters.updateByQuery(updateByQueryRequest);
@@ -508,6 +515,13 @@ public void testDeleteByQuery() throws IOException {
508515
} else {
509516
expectedParams.put("requests_per_second", "-1");
510517
}
518+
if (randomBoolean()) {
519+
int slices = randomIntBetween(0, 4);
520+
expectedParams.put("slices", Integer.toString(slices));
521+
deleteByQueryRequest.setSlices(slices);
522+
} else {
523+
expectedParams.put("slices", "1");
524+
}
511525
setRandomIndicesOptions(deleteByQueryRequest::setIndicesOptions, deleteByQueryRequest::indicesOptions, expectedParams);
512526
setRandomTimeout(deleteByQueryRequest::setTimeout, ReplicationRequest.DEFAULT_TIMEOUT, expectedParams);
513527
expectedParams.put("wait_for_completion", Boolean.TRUE.toString());

0 commit comments

Comments
 (0)