Skip to content

Commit 011db5e

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 c6853be commit 011db5e

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
@@ -416,6 +416,8 @@ private static void addSearchRequestParams(Params params, SearchRequest searchRe
416416
params.withIndicesOptions(searchRequest.indicesOptions());
417417
params.putParam("search_type", searchRequest.searchType().name().toLowerCase(Locale.ROOT));
418418
params.putParam("ccs_minimize_roundtrips", Boolean.toString(searchRequest.isCcsMinimizeRoundtrips()));
419+
params.putParam("pre_filter_shard_size", Integer.toString(searchRequest.getPreFilterShardSize()));
420+
params.putParam("max_concurrent_shard_requests", Integer.toString(searchRequest.getMaxConcurrentShardRequests()));
419421
if (searchRequest.requestCache() != null) {
420422
params.putParam("request_cache", Boolean.toString(searchRequest.requestCache()));
421423
}

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

+8
Original file line numberDiff line numberDiff line change
@@ -1985,6 +1985,14 @@ private static void setRandomSearchParams(SearchRequest searchRequest,
19851985
searchRequest.setCcsMinimizeRoundtrips(randomBoolean());
19861986
}
19871987
expectedParams.put("ccs_minimize_roundtrips", Boolean.toString(searchRequest.isCcsMinimizeRoundtrips()));
1988+
if (randomBoolean()) {
1989+
searchRequest.setMaxConcurrentShardRequests(randomIntBetween(1, Integer.MAX_VALUE));
1990+
}
1991+
expectedParams.put("max_concurrent_shard_requests", Integer.toString(searchRequest.getMaxConcurrentShardRequests()));
1992+
if (randomBoolean()) {
1993+
searchRequest.setPreFilterShardSize(randomIntBetween(2, Integer.MAX_VALUE));
1994+
}
1995+
expectedParams.put("pre_filter_shard_size", Integer.toString(searchRequest.getPreFilterShardSize()));
19881996
}
19891997

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

0 commit comments

Comments
 (0)