honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-23 21:38:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add slices to delete and update by query in HLRC (#48420)

Browse Source 
The slices param was missing from both delete by query and update by
query in the HLRC request converters. This commit fixes the omission.
This commit is contained in:
Michael Basnight 2019-10-25 15:22:44 -05:00
parent 1dd7ab830c
commit 5228956ecc
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -586,7 +586,8 @@ final class RequestConverters {
.withWaitForActiveShards(deleteByQueryRequest.getWaitForActiveShards())
.withRequestsPerSecond(deleteByQueryRequest.getRequestsPerSecond())
.withIndicesOptions(deleteByQueryRequest.indicesOptions())
.withWaitForCompletion(waitForCompletion);
.withWaitForCompletion(waitForCompletion)
.withSlices(deleteByQueryRequest.getSlices());
if (deleteByQueryRequest.isAbortOnVersionConflict() == false) {
params.putParam("conflicts", "proceed");
}
@ -615,7 +616,8 @@ final class RequestConverters {
.withTimeout(updateByQueryRequest.getTimeout())
.withWaitForActiveShards(updateByQueryRequest.getWaitForActiveShards())
.withRequestsPerSecond(updateByQueryRequest.getRequestsPerSecond())
.withIndicesOptions(updateByQueryRequest.indicesOptions());
.withIndicesOptions(updateByQueryRequest.indicesOptions())
.withSlices(updateByQueryRequest.getSlices());
if (updateByQueryRequest.isAbortOnVersionConflict() == false) {
params.putParam("conflicts", "proceed");
}

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

@ -522,6 +522,13 @@ public class RequestConvertersTests extends ESTestCase {
if (randomBoolean()) {
updateByQueryRequest.setScript(new Script("ctx._source.last = \"lastname\""));
}
if (randomBoolean()) {
int slices = randomIntBetween(0, 4);
expectedParams.put("slices", Integer.toString(slices));
updateByQueryRequest.setSlices(slices);
} else {
expectedParams.put("slices", "1");
}
setRandomIndicesOptions(updateByQueryRequest::setIndicesOptions, updateByQueryRequest::indicesOptions, expectedParams);
setRandomTimeout(updateByQueryRequest::setTimeout, ReplicationRequest.DEFAULT_TIMEOUT, expectedParams);
Request request = RequestConverters.updateByQuery(updateByQueryRequest);
@ -580,6 +587,13 @@ public class RequestConvertersTests extends ESTestCase {
} else {
expectedParams.put("requests_per_second", "-1");
}
if (randomBoolean()) {
int slices = randomIntBetween(0, 4);
expectedParams.put("slices", Integer.toString(slices));
deleteByQueryRequest.setSlices(slices);
} else {
expectedParams.put("slices", "1");
}
setRandomIndicesOptions(deleteByQueryRequest::setIndicesOptions, deleteByQueryRequest::indicesOptions, expectedParams);
setRandomTimeout(deleteByQueryRequest::setTimeout, ReplicationRequest.DEFAULT_TIMEOUT, expectedParams);
expectedParams.put("wait_for_completion", Boolean.TRUE.toString());