honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Async search response: output start and expiration time as time fields (#54084) 

This commits makes start_time and expiration_time time fields, so that their date variant will be printed out when human readable output is requested.
This commit is contained in:
Luca Cavanna 2020-03-24 17:01:07 +01:00
parent 0330bef409
commit 3c67762f1b
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
x-pack/plugin/async-search/src/test/java/org/elasticsearch/xpack/search/AsyncSearchResponseTests.java
View File

@ -10,10 +10,15 @@ import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.Version;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.ShardSearchFailure;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentElasticsearchExtension;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.search.SearchModule;
import org.elasticsearch.search.internal.InternalSearchResponse;
import org.elasticsearch.test.ESTestCase;
@ -25,6 +30,8 @@ import org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig;
import org.junit.Before;
import java.io.IOException;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import static java.util.Collections.emptyList;
@ -127,4 +134,36 @@ public class AsyncSearchResponseTests extends ESTestCase {
assertEquals(expected.getStartTime(), actual.getStartTime());
assertEquals(expected.getExpirationTime(), actual.getExpirationTime());
}
public void testToXContent() throws IOException {
Date date = new Date();
AsyncSearchResponse asyncSearchResponse = new AsyncSearchResponse("id", true, true, date.getTime(), date.getTime());
try ( XContentBuilder builder = XContentBuilder.builder(XContentType.JSON.xContent())) {
builder.prettyPrint();
asyncSearchResponse.toXContent(builder, ToXContent.EMPTY_PARAMS);
assertEquals("{\n" +
" \"id\" : \"id\",\n" +
" \"is_partial\" : true,\n" +
" \"is_running\" : true,\n" +
" \"start_time_in_millis\" : " + date.getTime() + ",\n" +
" \"expiration_time_in_millis\" : " + date.getTime() + "\n" +
"}", Strings.toString(builder));
}
try ( XContentBuilder builder = XContentBuilder.builder(XContentType.JSON.xContent())) {
builder.prettyPrint();
builder.humanReadable(true);
asyncSearchResponse.toXContent(builder, new ToXContent.MapParams(Collections.singletonMap("human", "true")));
assertEquals("{\n" +
" \"id\" : \"id\",\n" +
" \"is_partial\" : true,\n" +
" \"is_running\" : true,\n" +
" \"start_time\" : \"" + XContentElasticsearchExtension.DEFAULT_DATE_PRINTER.print(date.getTime()) + "\",\n" +
" \"start_time_in_millis\" : " + date.getTime() + ",\n" +
" \"expiration_time\" : \"" + XContentElasticsearchExtension.DEFAULT_DATE_PRINTER.print(date.getTime()) + "\",\n" +
" \"expiration_time_in_millis\" : " + date.getTime() + "\n" +
"}", Strings.toString(builder));
}
}
}

4
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/search/action/AsyncSearchResponse.java
View File

@ -177,8 +177,8 @@ public class AsyncSearchResponse extends ActionResponse implements StatusToXCont
}
builder.field("is_partial", isPartial);
builder.field("is_running", isRunning);
builder.field("start_time_in_millis", startTimeMillis);
builder.field("expiration_time_in_millis", expirationTimeMillis);
builder.timeField("start_time_in_millis", "start_time", startTimeMillis);
builder.timeField("expiration_time_in_millis", "expiration_time", expirationTimeMillis);
if (searchResponse != null) {
builder.field("response");