Skip to content
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

Jump to bottom

Remove explicit SearchResponse references from org.elasticsearch.indices.DateMathIndexExpressionsIntegrationIT #102669

Merged
merged 1 commit into from
Nov 27, 2023
Merged

Remove explicit SearchResponse references from org.elasticsearch.indices.DateMathIndexExpressionsIntegrationIT #102669

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
148 changes: 79 additions & 69 deletions ...rnalClusterTest/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@
import org.elasticsearch.action.ActionRequestBuilder;
import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.DocWriteResponse;
import org.elasticsearch.action.admin.indices.settings.get.GetSettingsResponse;
import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
import org.elasticsearch.action.delete.DeleteResponse;
import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.action.get.MultiGetResponse;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.index.IndexNotFoundException;
Expand All @@ -29,8 +23,10 @@
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Locale;
import java.util.function.Consumer;

import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
Expand All @@ -51,21 +47,25 @@ public void setNow() {
* of failing when index resolution with `now` is one day off, this method wraps calls with the assumption that
* the day did not change during the test run.
*/
public <Q extends ActionRequest, R extends ActionResponse> R dateSensitiveGet(ActionRequestBuilder<Q, R> builder) {
public <Q extends ActionRequest, R extends ActionResponse> void dateSensitiveGet(
ActionRequestBuilder<Q, R> builder,
Consumer<R> consumer
) {
Runnable dayChangeAssumption = () -> assumeTrue(
"day changed between requests",
ZonedDateTime.now(ZoneOffset.UTC).getDayOfYear() == now.getDayOfYear()
);
R response;
try {
response = builder.get();
assertResponse(builder, response -> {
dayChangeAssumption.run();
consumer.accept(response);
});
} catch (IndexNotFoundException e) {
// index resolver throws this if it does not find the exact index due to day changes
dayChangeAssumption.run();
throw e;
}
dayChangeAssumption.run();
return response;

}

public void testIndexNameDateMathExpressions() {
Expand All @@ -74,10 +74,11 @@ public void testIndexNameDateMathExpressions() {
String index3 = ".marvel-" + DateTimeFormatter.ofPattern("yyyy.MM.dd", Locale.ROOT).format(now.minusDays(2));
createIndex(index1, index2, index3);

GetSettingsResponse getSettingsResponse = dateSensitiveGet(indicesAdmin().prepareGetSettings(index1, index2, index3));
assertEquals(index1, getSettingsResponse.getSetting(index1, IndexMetadata.SETTING_INDEX_PROVIDED_NAME));
assertEquals(index2, getSettingsResponse.getSetting(index2, IndexMetadata.SETTING_INDEX_PROVIDED_NAME));
assertEquals(index3, getSettingsResponse.getSetting(index3, IndexMetadata.SETTING_INDEX_PROVIDED_NAME));
dateSensitiveGet(indicesAdmin().prepareGetSettings(index1, index2, index3), response -> {
assertEquals(index1, response.getSetting(index1, IndexMetadata.SETTING_INDEX_PROVIDED_NAME));
assertEquals(index2, response.getSetting(index2, IndexMetadata.SETTING_INDEX_PROVIDED_NAME));
assertEquals(index3, response.getSetting(index3, IndexMetadata.SETTING_INDEX_PROVIDED_NAME));
});

String dateMathExp1 = "<.marvel-{now/d}>";
String dateMathExp2 = "<.marvel-{now/d-1d}>";
Expand All @@ -87,48 +88,55 @@ public void testIndexNameDateMathExpressions() {
prepareIndex(dateMathExp3).setId("3").setSource("{}", XContentType.JSON).get();
refresh();

SearchResponse searchResponse = dateSensitiveGet(prepareSearch(dateMathExp1, dateMathExp2, dateMathExp3));
assertHitCount(searchResponse, 3);
assertSearchHits(searchResponse, "1", "2", "3");

GetResponse getResponse = dateSensitiveGet(client().prepareGet(dateMathExp1, "1"));
assertThat(getResponse.isExists(), is(true));
assertThat(getResponse.getId(), equalTo("1"));

getResponse = dateSensitiveGet(client().prepareGet(dateMathExp2, "2"));
assertThat(getResponse.isExists(), is(true));
assertThat(getResponse.getId(), equalTo("2"));

getResponse = dateSensitiveGet(client().prepareGet(dateMathExp3, "3"));
assertThat(getResponse.isExists(), is(true));
assertThat(getResponse.getId(), equalTo("3"));

MultiGetResponse mgetResponse = dateSensitiveGet(
client().prepareMultiGet().add(dateMathExp1, "1").add(dateMathExp2, "2").add(dateMathExp3, "3")
);
assertThat(mgetResponse.getResponses()[0].getResponse().isExists(), is(true));
assertThat(mgetResponse.getResponses()[0].getResponse().getId(), equalTo("1"));
assertThat(mgetResponse.getResponses()[1].getResponse().isExists(), is(true));
assertThat(mgetResponse.getResponses()[1].getResponse().getId(), equalTo("2"));
assertThat(mgetResponse.getResponses()[2].getResponse().isExists(), is(true));
assertThat(mgetResponse.getResponses()[2].getResponse().getId(), equalTo("3"));

IndicesStatsResponse indicesStatsResponse = dateSensitiveGet(indicesAdmin().prepareStats(dateMathExp1, dateMathExp2, dateMathExp3));
assertThat(indicesStatsResponse.getIndex(index1), notNullValue());
assertThat(indicesStatsResponse.getIndex(index2), notNullValue());
assertThat(indicesStatsResponse.getIndex(index3), notNullValue());

DeleteResponse deleteResponse = dateSensitiveGet(client().prepareDelete(dateMathExp1, "1"));
assertEquals(DocWriteResponse.Result.DELETED, deleteResponse.getResult());
assertThat(deleteResponse.getId(), equalTo("1"));

deleteResponse = dateSensitiveGet(client().prepareDelete(dateMathExp2, "2"));
assertEquals(DocWriteResponse.Result.DELETED, deleteResponse.getResult());
assertThat(deleteResponse.getId(), equalTo("2"));

deleteResponse = dateSensitiveGet(client().prepareDelete(dateMathExp3, "3"));
assertEquals(DocWriteResponse.Result.DELETED, deleteResponse.getResult());
assertThat(deleteResponse.getId(), equalTo("3"));
dateSensitiveGet(prepareSearch(dateMathExp1, dateMathExp2, dateMathExp3), response -> {
assertHitCount(response, 3);
assertSearchHits(response, "1", "2", "3");
});

dateSensitiveGet(client().prepareGet(dateMathExp1, "1"), response -> {
assertThat(response.isExists(), is(true));
assertThat(response.getId(), equalTo("1"));
});

dateSensitiveGet(client().prepareGet(dateMathExp2, "2"), response -> {
assertThat(response.isExists(), is(true));
assertThat(response.getId(), equalTo("2"));
});

dateSensitiveGet(client().prepareGet(dateMathExp3, "3"), response -> {
assertThat(response.isExists(), is(true));
assertThat(response.getId(), equalTo("3"));
});

dateSensitiveGet(client().prepareMultiGet().add(dateMathExp1, "1").add(dateMathExp2, "2").add(dateMathExp3, "3"), response -> {
assertThat(response.getResponses()[0].getResponse().isExists(), is(true));
assertThat(response.getResponses()[0].getResponse().getId(), equalTo("1"));
assertThat(response.getResponses()[1].getResponse().isExists(), is(true));
assertThat(response.getResponses()[1].getResponse().getId(), equalTo("2"));
assertThat(response.getResponses()[2].getResponse().isExists(), is(true));
assertThat(response.getResponses()[2].getResponse().getId(), equalTo("3"));
});

dateSensitiveGet(indicesAdmin().prepareStats(dateMathExp1, dateMathExp2, dateMathExp3), response -> {
assertThat(response.getIndex(index1), notNullValue());
assertThat(response.getIndex(index2), notNullValue());
assertThat(response.getIndex(index3), notNullValue());
});

dateSensitiveGet(client().prepareDelete(dateMathExp1, "1"), response -> {
assertEquals(DocWriteResponse.Result.DELETED, response.getResult());
assertThat(response.getId(), equalTo("1"));
});

dateSensitiveGet(client().prepareDelete(dateMathExp2, "2"), response -> {
assertEquals(DocWriteResponse.Result.DELETED, response.getResult());
assertThat(response.getId(), equalTo("2"));
});

dateSensitiveGet(client().prepareDelete(dateMathExp3, "3"), response -> {
assertEquals(DocWriteResponse.Result.DELETED, response.getResult());
assertThat(response.getId(), equalTo("3"));
});
}

public void testAutoCreateIndexWithDateMathExpression() {
Expand All @@ -144,14 +152,16 @@ public void testAutoCreateIndexWithDateMathExpression() {
prepareIndex(dateMathExp3).setId("3").setSource("{}", XContentType.JSON).get();
refresh();

SearchResponse searchResponse = dateSensitiveGet(prepareSearch(dateMathExp1, dateMathExp2, dateMathExp3));
assertHitCount(searchResponse, 3);
assertSearchHits(searchResponse, "1", "2", "3");
dateSensitiveGet(prepareSearch(dateMathExp1, dateMathExp2, dateMathExp3), response -> {
assertHitCount(response, 3);
assertSearchHits(response, "1", "2", "3");
});

IndicesStatsResponse indicesStatsResponse = dateSensitiveGet(indicesAdmin().prepareStats(dateMathExp1, dateMathExp2, dateMathExp3));
assertThat(indicesStatsResponse.getIndex(index1), notNullValue());
assertThat(indicesStatsResponse.getIndex(index2), notNullValue());
assertThat(indicesStatsResponse.getIndex(index3), notNullValue());
dateSensitiveGet(indicesAdmin().prepareStats(dateMathExp1, dateMathExp2, dateMathExp3), response -> {
assertThat(response.getIndex(index1), notNullValue());
assertThat(response.getIndex(index2), notNullValue());
assertThat(response.getIndex(index3), notNullValue());
});
}

public void testCreateIndexWithDateMathExpression() {
Expand All @@ -164,15 +174,15 @@ public void testCreateIndexWithDateMathExpression() {
String dateMathExp3 = "<.marvel-{now/d-2d}>";
createIndex(dateMathExp1, dateMathExp2, dateMathExp3);

GetSettingsResponse getSettingsResponse = dateSensitiveGet(indicesAdmin().prepareGetSettings(index1, index2, index3));
assertEquals(dateMathExp1, getSettingsResponse.getSetting(index1, IndexMetadata.SETTING_INDEX_PROVIDED_NAME));
assertEquals(dateMathExp2, getSettingsResponse.getSetting(index2, IndexMetadata.SETTING_INDEX_PROVIDED_NAME));
assertEquals(dateMathExp3, getSettingsResponse.getSetting(index3, IndexMetadata.SETTING_INDEX_PROVIDED_NAME));
dateSensitiveGet(indicesAdmin().prepareGetSettings(index1, index2, index3), response -> {
assertEquals(dateMathExp1, response.getSetting(index1, IndexMetadata.SETTING_INDEX_PROVIDED_NAME));
assertEquals(dateMathExp2, response.getSetting(index2, IndexMetadata.SETTING_INDEX_PROVIDED_NAME));
assertEquals(dateMathExp3, response.getSetting(index3, IndexMetadata.SETTING_INDEX_PROVIDED_NAME));
});

ClusterState clusterState = clusterAdmin().prepareState().get().getState();
assertThat(clusterState.metadata().index(index1), notNullValue());
assertThat(clusterState.metadata().index(index2), notNullValue());
assertThat(clusterState.metadata().index(index3), notNullValue());
}

}
7 changes: 6 additions & 1 deletion test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.action.ActionFuture;
import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionRequestBuilder;
import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequestBuilder;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
Expand Down Expand Up @@ -355,7 +357,10 @@ public static void assertNoFailuresAndResponse(ActionFuture<SearchResponse> resp
}
}

public static void assertResponse(ActionRequestBuilder<?, SearchResponse> searchRequestBuilder, Consumer<SearchResponse> consumer) {
public static <Q extends ActionRequest, R extends ActionResponse> void assertResponse(
ActionRequestBuilder<Q, R> searchRequestBuilder,
Consumer<R> consumer
) {
var res = searchRequestBuilder.get();
try {
consumer.accept(res);
Expand Down