github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 15:17:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

Force typed keys in the HLRC get async search (#78992) (#79245)

Browse source 
This change ensures that the HLRC can parse the search response
that the get async search returns.
The aggregations must be typed by keys but the param to enable this
mode was missing.

Closes #77608
This commit is contained in:
Jim Ferenczi 2021-10-15 16:06:54 +02:00 • committed by GitHub
parent fbf216ab82
commit 34b3a9a144
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/rest-high-level/src/main/java/org/elasticsearch/client/AsyncSearchRequestConverters.java
View file

@ -77,6 +77,7 @@ final class AsyncSearchRequestConverters {
.build();
Request request = new Request(HttpGet.METHOD_NAME, endpoint);
Params params = new RequestConverters.Params();
params.putParam(RestSearchAction.TYPED_KEYS_PARAM, "true");
if (asyncSearchRequest.getKeepAlive() != null) {
params.putParam("keep_alive", asyncSearchRequest.getKeepAlive().getStringRep());
}

3
client/rest-high-level/src/test/java/org/elasticsearch/client/AsyncSearchRequestConvertersTests.java
View file

@ -37,6 +37,7 @@ public class AsyncSearchRequestConvertersTests extends ESTestCase {
SearchSourceBuilder searchSourceBuilder = createTestSearchSourceBuilder();
SubmitAsyncSearchRequest submitRequest = new SubmitAsyncSearchRequest(searchSourceBuilder, indices);
expectedParams.put(RestSearchAction.TYPED_KEYS_PARAM, "true");
// the following parameters might be overwritten by random ones later,
// but we need to set these since they are the default we send over http
setRandomSearchParams(submitRequest, expectedParams);
@ -72,7 +73,6 @@ public class AsyncSearchRequestConvertersTests extends ESTestCase {
}
private static void setRandomSearchParams(SubmitAsyncSearchRequest request, Map<String, String> expectedParams) {
expectedParams.put(RestSearchAction.TYPED_KEYS_PARAM, "true");
if (randomBoolean()) {
request.setRouting(randomAlphaOfLengthBetween(3, 10));
expectedParams.put("routing", request.getRouting());
@ -107,6 +107,7 @@ public class AsyncSearchRequestConvertersTests extends ESTestCase {
String id = randomAlphaOfLengthBetween(5, 10);
Map<String, String> expectedParams = new HashMap<>();
GetAsyncSearchRequest submitRequest = new GetAsyncSearchRequest(id);
expectedParams.put(RestSearchAction.TYPED_KEYS_PARAM, "true");
if (randomBoolean()) {
TimeValue keepAlive = TimeValue.parseTimeValue(randomTimeValue(), "test");
submitRequest.setKeepAlive(keepAlive);

52
client/rest-high-level/src/test/java/org/elasticsearch/client/asyncsearch/AsyncSearchIT.java
View file

@ -8,47 +8,77 @@
package org.elasticsearch.client.asyncsearch;
import org.elasticsearch.action.bulk.BulkRequest;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.support.WriteRequest;
import org.elasticsearch.client.ESRestHighLevelClientTestCase;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.core.AcknowledgedResponse;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.search.aggregations.AggregationBuilders;
import org.elasticsearch.search.aggregations.bucket.terms.ParsedStringTerms;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.xcontent.XContentType;
import java.io.IOException;
import java.util.Collections;
import static org.hamcrest.Matchers.equalTo;
public class AsyncSearchIT extends ESRestHighLevelClientTestCase {
public void testAsyncSearch() throws IOException {
String index = "test-index";
createIndex(index, Settings.EMPTY);
BulkRequest bulkRequest = new BulkRequest()
.add(new IndexRequest(index).id("1").source(Collections.singletonMap("foo", "bar"), XContentType.JSON))
.add(new IndexRequest(index).id("2").source(Collections.singletonMap("foo", "bar2"), XContentType.JSON))
.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
assertEquals(
RestStatus.OK,
highLevelClient().bulk(
bulkRequest,
RequestOptions.DEFAULT
).status()
);
SearchSourceBuilder sourceBuilder = new SearchSourceBuilder().query(QueryBuilders.matchAllQuery());
SearchSourceBuilder sourceBuilder = new SearchSourceBuilder()
.query(QueryBuilders.matchAllQuery())
.aggregation(AggregationBuilders.terms("1").field("foo.keyword"));
SubmitAsyncSearchRequest submitRequest = new SubmitAsyncSearchRequest(sourceBuilder, index);
submitRequest.setKeepOnCompletion(true);
submitRequest.setWaitForCompletionTimeout(TimeValue.MAX_VALUE);
AsyncSearchResponse submitResponse = highLevelClient().asyncSearch().submit(submitRequest, RequestOptions.DEFAULT);
assertNotNull(submitResponse.getId());
assertFalse(submitResponse.isRunning());
assertFalse(submitResponse.isPartial());
assertTrue(submitResponse.getStartTime() > 0);
assertTrue(submitResponse.getExpirationTime() > 0);
assertNotNull(submitResponse.getSearchResponse());
if (submitResponse.isRunning() == false) {
assertFalse(submitResponse.isPartial());
} else {
assertTrue(submitResponse.isPartial());
}
assertThat(submitResponse.getSearchResponse().getHits().getTotalHits().value, equalTo(2L));
ParsedStringTerms terms = submitResponse.getSearchResponse().getAggregations().get("1");
assertThat(terms.getBuckets().size(), equalTo(2));
assertThat(terms.getBuckets().get(0).getKeyAsString(), equalTo("bar"));
assertThat(terms.getBuckets().get(0).getDocCount(), equalTo(1L));
assertThat(terms.getBuckets().get(1).getKeyAsString(), equalTo("bar2"));
assertThat(terms.getBuckets().get(1).getDocCount(), equalTo(1L));
GetAsyncSearchRequest getRequest = new GetAsyncSearchRequest(submitResponse.getId());
AsyncSearchResponse getResponse = highLevelClient().asyncSearch().get(getRequest, RequestOptions.DEFAULT);
while (getResponse.isRunning()) {
getResponse = highLevelClient().asyncSearch().get(getRequest, RequestOptions.DEFAULT);
}
assertFalse(getResponse.isRunning());
assertFalse(getResponse.isPartial());
assertTrue(getResponse.getStartTime() > 0);
assertTrue(getResponse.getExpirationTime() > 0);
assertNotNull(getResponse.getSearchResponse());
assertThat(getResponse.getSearchResponse().getHits().getTotalHits().value, equalTo(2L));
terms = getResponse.getSearchResponse().getAggregations().get("1");
assertThat(terms.getBuckets().size(), equalTo(2));
assertThat(terms.getBuckets().get(0).getKeyAsString(), equalTo("bar"));
assertThat(terms.getBuckets().get(0).getDocCount(), equalTo(1L));
assertThat(terms.getBuckets().get(1).getKeyAsString(), equalTo("bar2"));
assertThat(terms.getBuckets().get(1).getDocCount(), equalTo(1L));
DeleteAsyncSearchRequest deleteRequest = new DeleteAsyncSearchRequest(submitResponse.getId());
AcknowledgedResponse deleteAsyncSearchResponse = highLevelClient().asyncSearch().delete(deleteRequest,