Skip to content

[HLRC] Send min_score as query string parameter to the count API #46829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martijnvg merged 1 commit into from
Sep 20, 2019
Merged

[HLRC] Send min_score as query string parameter to the count API #46829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,9 @@ static Request count(CountRequest countRequest) throws IOException {
if (countRequest.terminateAfter() != 0){
params.withTerminateAfter(countRequest.terminateAfter());
}
if (countRequest.minScore() != null){
params.putParam("min_score", String.valueOf(countRequest.minScore()));
}
request.addParameters(params.asMap());
request.setEntity(createEntity(countRequest.source(), REQUEST_BODY_CONTENT_TYPE));
return request;
Expand Down
5 changes: 3 additions & 2 deletions client/rest-high-level/src/main/java/org/elasticsearch/client/core/CountRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public final class CountRequest extends ActionRequest implements IndicesRequest.
private SearchSourceBuilder searchSourceBuilder;
private IndicesOptions indicesOptions = DEFAULT_INDICES_OPTIONS;
private int terminateAfter = SearchContext.DEFAULT_TERMINATE_AFTER;
private Float minScore;

public CountRequest() {
this.searchSourceBuilder = new SearchSourceBuilder();
Expand Down Expand Up @@ -158,11 +159,11 @@ public String[] indices() {
}

public Float minScore() {
return this.searchSourceBuilder.minScore();
return minScore;
}

public CountRequest minScore(Float minScore) {
this.searchSourceBuilder.minScore(minScore);
this.minScore = minScore;
return this;
}

Expand Down
6 changes: 5 additions & 1 deletion client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,10 +1191,14 @@ private static void setRandomCountParams(CountRequest countRequest,
countRequest.preference(randomAlphaOfLengthBetween(3, 10));
expectedParams.put("preference", countRequest.preference());
}
if (randomBoolean()){
if (randomBoolean()) {
countRequest.terminateAfter(randomIntBetween(0, Integer.MAX_VALUE));
expectedParams.put("terminate_after", String.valueOf(countRequest.terminateAfter()));
}
if (randomBoolean()) {
countRequest.minScore((float) randomIntBetween(1, 10));
expectedParams.put("min_score", String.valueOf(countRequest.minScore()));
}
}

public void testMultiSearch() throws IOException {
Expand Down