Skip to content

Commit 9a328c2

Browse files
author
Christoph Büscher
committed
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 0e2e06b commit 9a328c2

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
@@ -426,6 +426,8 @@ private static void addSearchRequestParams(Params params, SearchRequest searchRe
426426
params.withIndicesOptions(searchRequest.indicesOptions());
427427
params.putParam("search_type", searchRequest.searchType().name().toLowerCase(Locale.ROOT));
428428
params.putParam("ccs_minimize_roundtrips", Boolean.toString(searchRequest.isCcsMinimizeRoundtrips()));
429+
params.putParam("pre_filter_shard_size", Integer.toString(searchRequest.getPreFilterShardSize()));
430+
params.putParam("max_concurrent_shard_requests", Integer.toString(searchRequest.getMaxConcurrentShardRequests()));
429431
if (searchRequest.requestCache() != null) {
430432
params.putParam("request_cache", Boolean.toString(searchRequest.requestCache()));
431433
}

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

+8
Original file line numberDiff line numberDiff line change
@@ -2023,6 +2023,14 @@ private static void setRandomSearchParams(SearchRequest searchRequest,
20232023
searchRequest.setCcsMinimizeRoundtrips(randomBoolean());
20242024
}
20252025
expectedParams.put("ccs_minimize_roundtrips", Boolean.toString(searchRequest.isCcsMinimizeRoundtrips()));
2026+
if (randomBoolean()) {
2027+
searchRequest.setMaxConcurrentShardRequests(randomIntBetween(1, Integer.MAX_VALUE));
2028+
}
2029+
expectedParams.put("max_concurrent_shard_requests", Integer.toString(searchRequest.getMaxConcurrentShardRequests()));
2030+
if (randomBoolean()) {
2031+
searchRequest.setPreFilterShardSize(randomIntBetween(2, Integer.MAX_VALUE));
2032+
}
2033+
expectedParams.put("pre_filter_shard_size", Integer.toString(searchRequest.getPreFilterShardSize()));
20262034
}
20272035

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

0 commit comments

Comments
 (0)