Skip to content

Commit d2a4c70

Browse files
drempapisdrempapis
authored
Search Queries in parallel - part 3 (#117149)
Update IT tests grouping assertResponses
1 parent 9dcd975 commit d2a4c70

File tree

5 files changed

+175
-384
lines changed

5 files changed

+175
-384
lines changed

‎server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java‎

Lines changed: 18 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
6666
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailuresAndResponse;
6767
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse;
68+
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponses;
6869
import static org.hamcrest.Matchers.containsInAnyOrder;
6970
import static org.hamcrest.Matchers.containsString;
7071
import static org.hamcrest.Matchers.emptyArray;
@@ -262,27 +263,16 @@ public void testSearchingFilteringAliasesSingleIndex() throws Exception {
262263
.setRefreshPolicy(RefreshPolicy.IMMEDIATE)
263264
).actionGet();
264265

265-
logger.info("--> checking single filtering alias search");
266-
assertResponse(
266+
assertResponses(
267+
searchResponse -> assertHits(searchResponse.getHits(), "1"),
267268
prepareSearch("foos").setQuery(QueryBuilders.matchAllQuery()),
268-
searchResponse -> assertHits(searchResponse.getHits(), "1")
269-
);
270-
271-
logger.info("--> checking single filtering alias wildcard search");
272-
assertResponse(
273-
prepareSearch("fo*").setQuery(QueryBuilders.matchAllQuery()),
274-
searchResponse -> assertHits(searchResponse.getHits(), "1")
269+
prepareSearch("fo*").setQuery(QueryBuilders.matchAllQuery())
275270
);
276271

277-
assertResponse(
272+
assertResponses(
273+
searchResponse -> assertHits(searchResponse.getHits(), "1", "2", "3"),
278274
prepareSearch("tests").setQuery(QueryBuilders.matchAllQuery()),
279-
searchResponse -> assertHits(searchResponse.getHits(), "1", "2", "3")
280-
);
281-
282-
logger.info("--> checking single filtering alias search with sort");
283-
assertResponse(
284-
prepareSearch("tests").setQuery(QueryBuilders.matchAllQuery()).addSort("_index", SortOrder.ASC),
285-
searchResponse -> assertHits(searchResponse.getHits(), "1", "2", "3")
275+
prepareSearch("tests").setQuery(QueryBuilders.matchAllQuery()).addSort("_index", SortOrder.ASC)
286276
);
287277

288278
logger.info("--> checking single filtering alias search with global facets");
@@ -323,28 +313,12 @@ public void testSearchingFilteringAliasesSingleIndex() throws Exception {
323313
searchResponse -> assertHits(searchResponse.getHits(), "1", "2")
324314
);
325315

326-
logger.info("--> checking single non-filtering alias search");
327-
assertResponse(
316+
assertResponses(
317+
searchResponse -> assertHits(searchResponse.getHits(), "1", "2", "3", "4"),
328318
prepareSearch("alias1").setQuery(QueryBuilders.matchAllQuery()),
329-
searchResponse -> assertHits(searchResponse.getHits(), "1", "2", "3", "4")
330-
);
331-
332-
logger.info("--> checking non-filtering alias and filtering alias search");
333-
assertResponse(
334319
prepareSearch("alias1", "foos").setQuery(QueryBuilders.matchAllQuery()),
335-
searchResponse -> assertHits(searchResponse.getHits(), "1", "2", "3", "4")
336-
);
337-
338-
logger.info("--> checking index and filtering alias search");
339-
assertResponse(
340320
prepareSearch("test", "foos").setQuery(QueryBuilders.matchAllQuery()),
341-
searchResponse -> assertHits(searchResponse.getHits(), "1", "2", "3", "4")
342-
);
343-
344-
logger.info("--> checking index and alias wildcard search");
345-
assertResponse(
346-
prepareSearch("te*", "fo*").setQuery(QueryBuilders.matchAllQuery()),
347-
searchResponse -> assertHits(searchResponse.getHits(), "1", "2", "3", "4")
321+
prepareSearch("te*", "fo*").setQuery(QueryBuilders.matchAllQuery())
348322
);
349323
}
350324

@@ -506,11 +480,11 @@ public void testSearchingFilteringAliasesMultipleIndices() throws Exception {
506480
prepareSearch("filter23", "filter13").setQuery(QueryBuilders.matchAllQuery()),
507481
searchResponse -> assertHits(searchResponse.getHits(), "21", "31", "13", "33")
508482
);
509-
assertResponse(
483+
assertResponses(
484+
searchResponse -> assertThat(searchResponse.getHits().getTotalHits().value(), equalTo(4L)),
510485
prepareSearch("filter23", "filter13").setSize(0).setQuery(QueryBuilders.matchAllQuery()),
511-
searchResponse -> assertThat(searchResponse.getHits().getTotalHits().value(), equalTo(4L))
486+
prepareSearch("filter13", "filter1").setSize(0).setQuery(QueryBuilders.matchAllQuery())
512487
);
513-
514488
assertResponse(
515489
prepareSearch("filter23", "filter1").setQuery(QueryBuilders.matchAllQuery()),
516490
searchResponse -> assertHits(searchResponse.getHits(), "21", "31", "11", "12", "13")
@@ -519,16 +493,10 @@ public void testSearchingFilteringAliasesMultipleIndices() throws Exception {
519493
prepareSearch("filter23", "filter1").setSize(0).setQuery(QueryBuilders.matchAllQuery()),
520494
searchResponse -> assertThat(searchResponse.getHits().getTotalHits().value(), equalTo(5L))
521495
);
522-
523496
assertResponse(
524497
prepareSearch("filter13", "filter1").setQuery(QueryBuilders.matchAllQuery()),
525498
searchResponse -> assertHits(searchResponse.getHits(), "11", "12", "13", "33")
526499
);
527-
assertResponse(
528-
prepareSearch("filter13", "filter1").setSize(0).setQuery(QueryBuilders.matchAllQuery()),
529-
searchResponse -> assertThat(searchResponse.getHits().getTotalHits().value(), equalTo(4L))
530-
);
531-
532500
assertResponse(
533501
prepareSearch("filter13", "filter1", "filter23").setQuery(QueryBuilders.matchAllQuery()),
534502
searchResponse -> assertHits(searchResponse.getHits(), "11", "12", "13", "21", "31", "33")
@@ -537,7 +505,6 @@ public void testSearchingFilteringAliasesMultipleIndices() throws Exception {
537505
prepareSearch("filter13", "filter1", "filter23").setSize(0).setQuery(QueryBuilders.matchAllQuery()),
538506
searchResponse -> assertThat(searchResponse.getHits().getTotalHits().value(), equalTo(6L))
539507
);
540-
541508
assertResponse(
542509
prepareSearch("filter23", "filter13", "test2").setQuery(QueryBuilders.matchAllQuery()),
543510
searchResponse -> assertHits(searchResponse.getHits(), "21", "22", "23", "31", "13", "33")
@@ -546,7 +513,6 @@ public void testSearchingFilteringAliasesMultipleIndices() throws Exception {
546513
prepareSearch("filter23", "filter13", "test2").setSize(0).setQuery(QueryBuilders.matchAllQuery()),
547514
searchResponse -> assertThat(searchResponse.getHits().getTotalHits().value(), equalTo(6L))
548515
);
549-
550516
assertResponse(
551517
prepareSearch("filter23", "filter13", "test1", "test2").setQuery(QueryBuilders.matchAllQuery()),
552518
searchResponse -> assertHits(searchResponse.getHits(), "11", "12", "13", "21", "22", "23", "31", "33")
@@ -1325,17 +1291,13 @@ public void testIndexingAndQueryingHiddenAliases() throws Exception {
13251291
searchResponse -> assertHits(searchResponse.getHits(), "2", "3")
13261292
);
13271293

1328-
// Ensure that all docs can be gotten through the alias
1329-
assertResponse(
1294+
assertResponses(
1295+
searchResponse -> assertHits(searchResponse.getHits(), "1", "2", "3"),
1296+
// Ensure that all docs can be gotten through the alias
13301297
prepareSearch(alias).setQuery(QueryBuilders.matchAllQuery()),
1331-
searchResponse -> assertHits(searchResponse.getHits(), "1", "2", "3")
1332-
);
1333-
1334-
// And querying using a wildcard with indices options set to expand hidden
1335-
assertResponse(
1298+
// And querying using a wildcard with indices options set to expand hidden
13361299
prepareSearch("alias*").setQuery(QueryBuilders.matchAllQuery())
1337-
.setIndicesOptions(IndicesOptions.fromOptions(false, false, true, false, true, true, true, false, false)),
1338-
searchResponse -> assertHits(searchResponse.getHits(), "1", "2", "3")
1300+
.setIndicesOptions(IndicesOptions.fromOptions(false, false, true, false, true, true, true, false, false))
13391301
);
13401302

13411303
// And that querying the alias with a wildcard and no expand options fails

‎server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java‎

Lines changed: 35 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import static org.elasticsearch.index.query.QueryBuilders.wrapperQuery;
3434
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
3535
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse;
36+
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponses;
3637
import static org.hamcrest.Matchers.equalTo;
3738
import static org.hamcrest.Matchers.greaterThan;
3839
import static org.hamcrest.Matchers.hasKey;
@@ -105,54 +106,32 @@ public void testSimpleMatchedQueryFromTopLevelFilter() throws Exception {
105106
prepareIndex("test").setId("3").setSource("name", "test").get();
106107
refresh();
107108

108-
assertResponse(
109+
assertResponses(response -> {
110+
assertHitCount(response, 3L);
111+
for (SearchHit hit : response.getHits()) {
112+
if (hit.getId().equals("1")) {
113+
assertThat(hit.getMatchedQueriesAndScores().size(), equalTo(2));
114+
assertThat(hit.getMatchedQueriesAndScores(), hasKey("name"));
115+
assertThat(hit.getMatchedQueryScore("name"), greaterThan(0f));
116+
assertThat(hit.getMatchedQueriesAndScores(), hasKey("title"));
117+
assertThat(hit.getMatchedQueryScore("title"), greaterThan(0f));
118+
} else if (hit.getId().equals("2") || hit.getId().equals("3")) {
119+
assertThat(hit.getMatchedQueriesAndScores().size(), equalTo(1));
120+
assertThat(hit.getMatchedQueriesAndScores(), hasKey("name"));
121+
assertThat(hit.getMatchedQueryScore("name"), greaterThan(0f));
122+
} else {
123+
fail("Unexpected document returned with id " + hit.getId());
124+
}
125+
}
126+
},
109127
prepareSearch().setQuery(matchAllQuery())
110128
.setPostFilter(
111129
boolQuery().should(termQuery("name", "test").queryName("name")).should(termQuery("title", "title1").queryName("title"))
112130
),
113-
response -> {
114-
assertHitCount(response, 3L);
115-
for (SearchHit hit : response.getHits()) {
116-
if (hit.getId().equals("1")) {
117-
assertThat(hit.getMatchedQueriesAndScores().size(), equalTo(2));
118-
assertThat(hit.getMatchedQueriesAndScores(), hasKey("name"));
119-
assertThat(hit.getMatchedQueryScore("name"), greaterThan(0f));
120-
assertThat(hit.getMatchedQueriesAndScores(), hasKey("title"));
121-
assertThat(hit.getMatchedQueryScore("title"), greaterThan(0f));
122-
} else if (hit.getId().equals("2") || hit.getId().equals("3")) {
123-
assertThat(hit.getMatchedQueriesAndScores().size(), equalTo(1));
124-
assertThat(hit.getMatchedQueriesAndScores(), hasKey("name"));
125-
assertThat(hit.getMatchedQueryScore("name"), greaterThan(0f));
126-
} else {
127-
fail("Unexpected document returned with id " + hit.getId());
128-
}
129-
}
130-
}
131-
);
132-
133-
assertResponse(
134131
prepareSearch().setQuery(matchAllQuery())
135132
.setPostFilter(
136133
boolQuery().should(termQuery("name", "test").queryName("name")).should(termQuery("title", "title1").queryName("title"))
137-
),
138-
response -> {
139-
assertHitCount(response, 3L);
140-
for (SearchHit hit : response.getHits()) {
141-
if (hit.getId().equals("1")) {
142-
assertThat(hit.getMatchedQueriesAndScores().size(), equalTo(2));
143-
assertThat(hit.getMatchedQueriesAndScores(), hasKey("name"));
144-
assertThat(hit.getMatchedQueryScore("name"), greaterThan(0f));
145-
assertThat(hit.getMatchedQueriesAndScores(), hasKey("title"));
146-
assertThat(hit.getMatchedQueryScore("title"), greaterThan(0f));
147-
} else if (hit.getId().equals("2") || hit.getId().equals("3")) {
148-
assertThat(hit.getMatchedQueriesAndScores().size(), equalTo(1));
149-
assertThat(hit.getMatchedQueriesAndScores(), hasKey("name"));
150-
assertThat(hit.getMatchedQueryScore("name"), greaterThan(0f));
151-
} else {
152-
fail("Unexpected document returned with id " + hit.getId());
153-
}
154-
}
155-
}
134+
)
156135
);
157136
}
158137

@@ -165,43 +144,25 @@ public void testSimpleMatchedQueryFromTopLevelFilterAndFilteredQuery() throws Ex
165144
prepareIndex("test").setId("3").setSource("name", "test", "title", "title3").get();
166145
refresh();
167146

168-
assertResponse(
147+
assertResponses(response -> {
148+
assertHitCount(response, 3L);
149+
for (SearchHit hit : response.getHits()) {
150+
if (hit.getId().equals("1") || hit.getId().equals("2") || hit.getId().equals("3")) {
151+
assertThat(hit.getMatchedQueriesAndScores().size(), equalTo(2));
152+
assertThat(hit.getMatchedQueriesAndScores(), hasKey("name"));
153+
assertThat(hit.getMatchedQueryScore("name"), greaterThan(0f));
154+
assertThat(hit.getMatchedQueriesAndScores(), hasKey("title"));
155+
assertThat(hit.getMatchedQueryScore("title"), greaterThan(0f));
156+
} else {
157+
fail("Unexpected document returned with id " + hit.getId());
158+
}
159+
}
160+
},
169161
prepareSearch().setQuery(
170162
boolQuery().must(matchAllQuery()).filter(termsQuery("title", "title1", "title2", "title3").queryName("title"))
171163
).setPostFilter(termQuery("name", "test").queryName("name")),
172-
response -> {
173-
assertHitCount(response, 3L);
174-
for (SearchHit hit : response.getHits()) {
175-
if (hit.getId().equals("1") || hit.getId().equals("2") || hit.getId().equals("3")) {
176-
assertThat(hit.getMatchedQueriesAndScores().size(), equalTo(2));
177-
assertThat(hit.getMatchedQueriesAndScores(), hasKey("name"));
178-
assertThat(hit.getMatchedQueryScore("name"), greaterThan(0f));
179-
assertThat(hit.getMatchedQueriesAndScores(), hasKey("title"));
180-
assertThat(hit.getMatchedQueryScore("title"), greaterThan(0f));
181-
} else {
182-
fail("Unexpected document returned with id " + hit.getId());
183-
}
184-
}
185-
}
186-
);
187-
188-
assertResponse(
189164
prepareSearch().setQuery(termsQuery("title", "title1", "title2", "title3").queryName("title"))
190-
.setPostFilter(matchQuery("name", "test").queryName("name")),
191-
response -> {
192-
assertHitCount(response, 3L);
193-
for (SearchHit hit : response.getHits()) {
194-
if (hit.getId().equals("1") || hit.getId().equals("2") || hit.getId().equals("3")) {
195-
assertThat(hit.getMatchedQueriesAndScores().size(), equalTo(2));
196-
assertThat(hit.getMatchedQueriesAndScores(), hasKey("name"));
197-
assertThat(hit.getMatchedQueryScore("name"), greaterThan(0f));
198-
assertThat(hit.getMatchedQueriesAndScores(), hasKey("title"));
199-
assertThat(hit.getMatchedQueryScore("title"), greaterThan(0f));
200-
} else {
201-
fail("Unexpected document returned with id " + hit.getId());
202-
}
203-
}
204-
}
165+
.setPostFilter(matchQuery("name", "test").queryName("name"))
205166
);
206167
}
207168

0 commit comments

Comments
 (0)