Skip to content

Commit ddedb94

Browse files
author
Christoph Büscher
authored
Add unsupported parameters to HLRC search request (#53745)
Currently we don't send values for the `pre_filter_shard_size` and `max_concurrent_shard_requests` SearchRequest parameters over http when using the High Level Rest Client. This change adds these parameters to the RequestConverters and tests.
1 parent 03caeaa commit ddedb94

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,8 @@ private static void addSearchRequestParams(Params params, SearchRequest searchRe
410410
params.withIndicesOptions(searchRequest.indicesOptions());
411411
params.putParam("search_type", searchRequest.searchType().name().toLowerCase(Locale.ROOT));
412412
params.putParam("ccs_minimize_roundtrips", Boolean.toString(searchRequest.isCcsMinimizeRoundtrips()));
413+
params.putParam("pre_filter_shard_size", Integer.toString(searchRequest.getPreFilterShardSize()));
414+
params.putParam("max_concurrent_shard_requests", Integer.toString(searchRequest.getMaxConcurrentShardRequests()));
413415
if (searchRequest.requestCache() != null) {
414416
params.putParam("request_cache", Boolean.toString(searchRequest.requestCache()));
415417
}

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

+8
Original file line numberDiff line numberDiff line change
@@ -1857,6 +1857,14 @@ private static void setRandomSearchParams(SearchRequest searchRequest,
18571857
searchRequest.setCcsMinimizeRoundtrips(randomBoolean());
18581858
}
18591859
expectedParams.put("ccs_minimize_roundtrips", Boolean.toString(searchRequest.isCcsMinimizeRoundtrips()));
1860+
if (randomBoolean()) {
1861+
searchRequest.setMaxConcurrentShardRequests(randomIntBetween(1, Integer.MAX_VALUE));
1862+
}
1863+
expectedParams.put("max_concurrent_shard_requests", Integer.toString(searchRequest.getMaxConcurrentShardRequests()));
1864+
if (randomBoolean()) {
1865+
searchRequest.setPreFilterShardSize(randomIntBetween(2, Integer.MAX_VALUE));
1866+
}
1867+
expectedParams.put("pre_filter_shard_size", Integer.toString(searchRequest.getPreFilterShardSize()));
18601868
}
18611869

18621870
static void setRandomIndicesOptions(Consumer<IndicesOptions> setter, Supplier<IndicesOptions> getter,

0 commit comments

Comments
 (0)