Skip to content

terminateAfter added to the RequestConverter #46474

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 18, 2019
Merged

terminateAfter added to the RequestConverter #46474

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
7 changes: 7 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 @@ -498,6 +498,9 @@ static Request count(CountRequest countRequest) throws IOException {
params.withRouting(countRequest.routing());
params.withPreference(countRequest.preference());
params.withIndicesOptions(countRequest.indicesOptions());
if (countRequest.terminateAfter() != 0){
params.withTerminateAfter(countRequest.terminateAfter());
}
request.addParameters(params.asMap());
request.setEntity(createEntity(countRequest.source(), REQUEST_BODY_CONTENT_TYPE));
return request;
Expand Down Expand Up @@ -910,6 +913,10 @@ Params withStoredFields(String[] storedFields) {
return this;
}

Params withTerminateAfter(int terminateAfter){
return putParam("terminate_after", String.valueOf(terminateAfter));
}

Params withTimeout(TimeValue timeout) {
return putParam("timeout", timeout);
}
Expand Down
9 changes: 7 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 @@ -25,6 +25,7 @@
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.common.Strings;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.internal.SearchContext;

import java.util.Arrays;
import java.util.Objects;
Expand All @@ -42,6 +43,7 @@ public final class CountRequest extends ActionRequest implements IndicesRequest.
private String preference;
private SearchSourceBuilder searchSourceBuilder;
private IndicesOptions indicesOptions = DEFAULT_INDICES_OPTIONS;
private int terminateAfter = SearchContext.DEFAULT_TERMINATE_AFTER;

public CountRequest() {
this.searchSourceBuilder = new SearchSourceBuilder();
Expand Down Expand Up @@ -165,11 +167,14 @@ public CountRequest minScore(Float minScore) {
}

public int terminateAfter() {
return this.searchSourceBuilder.terminateAfter();
return this.terminateAfter;
}

public CountRequest terminateAfter(int terminateAfter) {
this.searchSourceBuilder.terminateAfter(terminateAfter);
if (terminateAfter < 0) {
throw new IllegalArgumentException("terminateAfter must be > 0");
}
this.terminateAfter = terminateAfter;
return this;
}

Expand Down
4 changes: 4 additions & 0 deletions 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,6 +1191,10 @@ private static void setRandomCountParams(CountRequest countRequest,
countRequest.preference(randomAlphaOfLengthBetween(3, 10));
expectedParams.put("preference", countRequest.preference());
}
if (randomBoolean()){
countRequest.terminateAfter(randomIntBetween(0, Integer.MAX_VALUE));
expectedParams.put("terminate_after", String.valueOf(countRequest.terminateAfter()));
}
}

public void testMultiSearch() throws IOException {
Expand Down