Skip to content

Commit 34ea8f3

Browse files
drempapisdrempapis
authored
Search Queries in parallel assertHitcount - part 1 (#117467)
Update tests applying an optimization in assertions
1 parent e9d925e commit 34ea8f3

File tree

8 files changed

+99
-68
lines changed

8 files changed

+99
-68
lines changed

‎server/src/internalClusterTest/java/org/elasticsearch/cluster/NoMasterNodeIT.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,11 @@ public void testNoMasterActionsWriteMasterBlock() throws Exception {
261261
GetResponse getResponse = clientToMasterlessNode.prepareGet("test1", "1").get();
262262
assertExists(getResponse);
263263

264-
assertHitCount(clientToMasterlessNode.prepareSearch("test1").setAllowPartialSearchResults(true).setSize(0), 1L);
265-
266-
logger.info("--> here 3");
267-
assertHitCount(clientToMasterlessNode.prepareSearch("test1").setAllowPartialSearchResults(true), 1L);
264+
assertHitCount(
265+
1L,
266+
clientToMasterlessNode.prepareSearch("test1").setAllowPartialSearchResults(true).setSize(0),
267+
clientToMasterlessNode.prepareSearch("test1").setAllowPartialSearchResults(true)
268+
);
268269

269270
assertResponse(clientToMasterlessNode.prepareSearch("test2").setAllowPartialSearchResults(true).setSize(0), countResponse -> {
270271
assertThat(countResponse.getTotalShards(), equalTo(3));

‎server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,11 @@ public void testWildcardBehaviourSnapshotRestore() throws Exception {
398398
public void testAllMissingLenient() throws Exception {
399399
createIndex("test1");
400400
prepareIndex("test1").setId("1").setSource("k", "v").setRefreshPolicy(IMMEDIATE).get();
401-
assertHitCount(prepareSearch("test2").setIndicesOptions(IndicesOptions.lenientExpandOpen()).setQuery(matchAllQuery()), 0L);
402-
assertHitCount(prepareSearch("test2", "test3").setQuery(matchAllQuery()).setIndicesOptions(IndicesOptions.lenientExpandOpen()), 0L);
401+
assertHitCount(
402+
0L,
403+
prepareSearch("test2").setIndicesOptions(IndicesOptions.lenientExpandOpen()).setQuery(matchAllQuery()),
404+
prepareSearch("test2", "test3").setQuery(matchAllQuery()).setIndicesOptions(IndicesOptions.lenientExpandOpen())
405+
);
403406
// you should still be able to run empty searches without things blowing up
404407
assertHitCount(prepareSearch().setIndicesOptions(IndicesOptions.lenientExpandOpen()).setQuery(matchAllQuery()), 1L);
405408
}

‎server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ public void run() {
9898
finished.set(true);
9999
indexingThread.join();
100100
refresh("test");
101-
ElasticsearchAssertions.assertHitCount(prepareSearch("test").setTrackTotalHits(true), numAutoGenDocs.get());
102101
ElasticsearchAssertions.assertHitCount(
102+
numAutoGenDocs.get(),
103+
prepareSearch("test").setTrackTotalHits(true),
103104
prepareSearch("test").setTrackTotalHits(true)// extra paranoia ;)
104-
.setQuery(QueryBuilders.termQuery("auto", true)),
105-
numAutoGenDocs.get()
105+
.setQuery(QueryBuilders.termQuery("auto", true))
106106
);
107107
}
108108

‎server/src/internalClusterTest/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -500,9 +500,7 @@ public void testIndexTemplateWithAliases() throws Exception {
500500

501501
refresh();
502502

503-
assertHitCount(prepareSearch("test_index"), 5L);
504-
assertHitCount(prepareSearch("simple_alias"), 5L);
505-
assertHitCount(prepareSearch("templated_alias-test_index"), 5L);
503+
assertHitCount(5L, prepareSearch("test_index"), prepareSearch("simple_alias"), prepareSearch("templated_alias-test_index"));
506504

507505
assertResponse(prepareSearch("filtered_alias"), response -> {
508506
assertHitCount(response, 1L);
@@ -584,8 +582,7 @@ public void testIndexTemplateWithAliasesSource() {
584582
prepareIndex("test_index").setId("2").setSource("field", "value2").get();
585583
refresh();
586584

587-
assertHitCount(prepareSearch("test_index"), 2L);
588-
assertHitCount(prepareSearch("alias1"), 2L);
585+
assertHitCount(2L, prepareSearch("test_index"), prepareSearch("alias1"));
589586

590587
assertResponse(prepareSearch("alias2"), response -> {
591588
assertHitCount(response, 1L);

‎server/src/internalClusterTest/java/org/elasticsearch/search/nested/SimpleNestedIT.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import static org.hamcrest.Matchers.startsWith;
5454

5555
public class SimpleNestedIT extends ESIntegTestCase {
56+
5657
public void testSimpleNested() throws Exception {
5758
assertAcked(prepareCreate("test").setMapping("nested1", "type=nested"));
5859
ensureGreen();
@@ -87,21 +88,20 @@ public void testSimpleNested() throws Exception {
8788
// check the numDocs
8889
assertDocumentCount("test", 3);
8990

90-
assertHitCount(prepareSearch("test").setQuery(termQuery("n_field1", "n_value1_1")), 0L);
91-
92-
// search for something that matches the nested doc, and see that we don't find the nested doc
93-
assertHitCount(prepareSearch("test"), 1L);
94-
assertHitCount(prepareSearch("test").setQuery(termQuery("n_field1", "n_value1_1")), 0L);
91+
assertHitCount(
92+
0L,
93+
prepareSearch("test").setQuery(termQuery("n_field1", "n_value1_1")),
94+
prepareSearch("test").setQuery(termQuery("n_field1", "n_value1_1"))
95+
);
9596

96-
// now, do a nested query
97-
assertHitCountAndNoFailures(
97+
assertHitCount(
98+
1L,
99+
// search for something that matches the nested doc, and see that we don't find the nested doc
100+
prepareSearch("test"),
101+
// now, do a nested query
98102
prepareSearch("test").setQuery(nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1_1"), ScoreMode.Avg)),
99-
1L
100-
);
101-
assertHitCountAndNoFailures(
102103
prepareSearch("test").setQuery(nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1_1"), ScoreMode.Avg))
103-
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH),
104-
1L
104+
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
105105
);
106106

107107
// add another doc, one that would match if it was not nested...

‎server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,17 @@ public void testScrollAndUpdateIndex() throws Exception {
206206

207207
indicesAdmin().prepareRefresh().get();
208208

209-
assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 500);
210-
assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("message", "test")), 500);
211-
assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("message", "test")), 500);
212-
assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("message", "update")), 0);
213-
assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("message", "update")), 0);
209+
assertHitCount(
210+
500,
211+
prepareSearch().setSize(0).setQuery(matchAllQuery()),
212+
prepareSearch().setSize(0).setQuery(termQuery("message", "test")),
213+
prepareSearch().setSize(0).setQuery(termQuery("message", "test"))
214+
);
215+
assertHitCount(
216+
0,
217+
prepareSearch().setSize(0).setQuery(termQuery("message", "update")),
218+
prepareSearch().setSize(0).setQuery(termQuery("message", "update"))
219+
);
214220

215221
SearchResponse searchResponse = prepareSearch().setQuery(queryStringQuery("user:kimchy"))
216222
.setSize(35)
@@ -229,11 +235,17 @@ public void testScrollAndUpdateIndex() throws Exception {
229235
} while (searchResponse.getHits().getHits().length > 0);
230236

231237
indicesAdmin().prepareRefresh().get();
232-
assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 500);
233-
assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("message", "test")), 0);
234-
assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("message", "test")), 0);
235-
assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("message", "update")), 500);
236-
assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("message", "update")), 500);
238+
assertHitCount(
239+
500,
240+
prepareSearch().setSize(0).setQuery(matchAllQuery()),
241+
prepareSearch().setSize(0).setQuery(termQuery("message", "update")),
242+
prepareSearch().setSize(0).setQuery(termQuery("message", "update"))
243+
);
244+
assertHitCount(
245+
0,
246+
prepareSearch().setSize(0).setQuery(termQuery("message", "test")),
247+
prepareSearch().setSize(0).setQuery(termQuery("message", "test"))
248+
);
237249
} finally {
238250
clearScroll(searchResponse.getScrollId());
239251
searchResponse.decRef();

‎server/src/internalClusterTest/java/org/elasticsearch/search/simple/SimpleSearchIT.java‎

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,22 @@ public void testIpCidr() throws Exception {
147147
prepareIndex("test").setId("5").setSource("ip", "2001:db8::ff00:42:8329").get();
148148
refresh();
149149

150-
assertHitCount(prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "192.168.0.1"))), 1L);
151-
assertHitCount(prepareSearch().setQuery(queryStringQuery("ip: 192.168.0.1")), 1L);
152-
assertHitCount(prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "192.168.0.1/32"))), 1L);
150+
assertHitCount(prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "192.168.1.5/32"))), 0L);
151+
assertHitCount(
152+
1L,
153+
prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "192.168.0.1"))),
154+
prepareSearch().setQuery(queryStringQuery("ip: 192.168.0.1")),
155+
prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "192.168.0.1/32"))),
156+
prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "2001:db8::ff00:42:8329/128"))),
157+
prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "2001:db8::/64")))
158+
);
153159
assertHitCount(prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "192.168.0.0/24"))), 3L);
154-
assertHitCount(prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "192.0.0.0/8"))), 4L);
155-
assertHitCount(prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "0.0.0.0/0"))), 4L);
156-
assertHitCount(prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "2001:db8::ff00:42:8329/128"))), 1L);
157-
assertHitCount(prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "2001:db8::/64"))), 1L);
160+
assertHitCount(
161+
4L,
162+
prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "192.0.0.0/8"))),
163+
prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "0.0.0.0/0")))
164+
);
158165
assertHitCount(prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "::/0"))), 5L);
159-
assertHitCount(prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "192.168.1.5/32"))), 0L);
160166

161167
assertFailures(
162168
prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "0/0/0/0/0"))),
@@ -170,8 +176,11 @@ public void testSimpleId() {
170176

171177
prepareIndex("test").setId("XXX1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get();
172178
// id is not indexed, but lets see that we automatically convert to
173-
assertHitCount(prepareSearch().setQuery(QueryBuilders.termQuery("_id", "XXX1")), 1L);
174-
assertHitCount(prepareSearch().setQuery(QueryBuilders.queryStringQuery("_id:XXX1")), 1L);
179+
assertHitCount(
180+
1L,
181+
prepareSearch().setQuery(QueryBuilders.termQuery("_id", "XXX1")),
182+
prepareSearch().setQuery(QueryBuilders.queryStringQuery("_id:XXX1"))
183+
);
175184
}
176185

177186
public void testSimpleDateRange() throws Exception {
@@ -324,12 +333,12 @@ public void testLargeFromAndSizeSucceeds() throws Exception {
324333
createIndex("idx");
325334
indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON));
326335

327-
assertHitCount(prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) - 10), 1);
328-
assertHitCount(prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)), 1);
329336
assertHitCount(
337+
1,
338+
prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) - 10),
339+
prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)),
330340
prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) / 2)
331-
.setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) / 2 - 1),
332-
1
341+
.setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) / 2 - 1)
333342
);
334343
}
335344

@@ -340,12 +349,12 @@ public void testTooLargeFromAndSizeOkBySetting() throws Exception {
340349
).get();
341350
indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON));
342351

343-
assertHitCount(prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)), 1);
344-
assertHitCount(prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) + 1), 1);
345352
assertHitCount(
353+
1,
354+
prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)),
355+
prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) + 1),
346356
prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY))
347-
.setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)),
348-
1
357+
.setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY))
349358
);
350359
}
351360

@@ -358,25 +367,25 @@ public void testTooLargeFromAndSizeOkByDynamicSetting() throws Exception {
358367
);
359368
indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON));
360369

361-
assertHitCount(prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)), 1);
362-
assertHitCount(prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) + 1), 1);
363370
assertHitCount(
371+
1,
372+
prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)),
373+
prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) + 1),
364374
prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY))
365-
.setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)),
366-
1
375+
.setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY))
367376
);
368377
}
369378

370379
public void testTooLargeFromAndSizeBackwardsCompatibilityRecommendation() throws Exception {
371380
prepareCreate("idx").setSettings(Settings.builder().put(IndexSettings.MAX_RESULT_WINDOW_SETTING.getKey(), Integer.MAX_VALUE)).get();
372381
indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON));
373382

374-
assertHitCount(prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 10), 1);
375-
assertHitCount(prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 10), 1);
376383
assertHitCount(
384+
1,
385+
prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 10),
386+
prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 10),
377387
prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 10)
378-
.setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 10),
379-
1
388+
.setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 10)
380389
);
381390
}
382391

‎server/src/internalClusterTest/java/org/elasticsearch/snapshots/RestoreSnapshotIT.java‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -678,9 +678,12 @@ public void testChangeSettingsOnRestore() throws Exception {
678678
indexRandom(true, builders);
679679
flushAndRefresh();
680680

681-
assertHitCount(client.prepareSearch("test-idx").setSize(0).setQuery(matchQuery("field1", "foo")), numdocs);
681+
assertHitCount(
682+
numdocs,
683+
client.prepareSearch("test-idx").setSize(0).setQuery(matchQuery("field1", "foo")),
684+
client.prepareSearch("test-idx").setSize(0).setQuery(matchQuery("field1", "bar"))
685+
);
682686
assertHitCount(client.prepareSearch("test-idx").setSize(0).setQuery(matchQuery("field1", "Foo")), 0);
683-
assertHitCount(client.prepareSearch("test-idx").setSize(0).setQuery(matchQuery("field1", "bar")), numdocs);
684687

685688
createSnapshot("test-repo", "test-snap", Collections.singletonList("test-idx"));
686689

@@ -736,8 +739,11 @@ public void testChangeSettingsOnRestore() throws Exception {
736739
assertThat(getSettingsResponse.getSetting("test-idx", SETTING_NUMBER_OF_SHARDS), equalTo("" + numberOfShards));
737740
assertThat(getSettingsResponse.getSetting("test-idx", "index.analysis.analyzer.my_analyzer.type"), equalTo("standard"));
738741

739-
assertHitCount(client.prepareSearch("test-idx").setSize(0).setQuery(matchQuery("field1", "Foo")), numdocs);
740-
assertHitCount(client.prepareSearch("test-idx").setSize(0).setQuery(matchQuery("field1", "bar")), numdocs);
742+
assertHitCount(
743+
numdocs,
744+
client.prepareSearch("test-idx").setSize(0).setQuery(matchQuery("field1", "Foo")),
745+
client.prepareSearch("test-idx").setSize(0).setQuery(matchQuery("field1", "bar"))
746+
);
741747

742748
logger.info("--> delete the index and recreate it while deleting all index settings");
743749
cluster().wipeIndices("test-idx");
@@ -758,8 +764,11 @@ public void testChangeSettingsOnRestore() throws Exception {
758764
// Make sure that number of shards didn't change
759765
assertThat(getSettingsResponse.getSetting("test-idx", SETTING_NUMBER_OF_SHARDS), equalTo("" + numberOfShards));
760766

761-
assertHitCount(client.prepareSearch("test-idx").setSize(0).setQuery(matchQuery("field1", "Foo")), numdocs);
762-
assertHitCount(client.prepareSearch("test-idx").setSize(0).setQuery(matchQuery("field1", "bar")), numdocs);
767+
assertHitCount(
768+
numdocs,
769+
client.prepareSearch("test-idx").setSize(0).setQuery(matchQuery("field1", "Foo")),
770+
client.prepareSearch("test-idx").setSize(0).setQuery(matchQuery("field1", "bar"))
771+
);
763772
}
764773

765774
public void testRestoreChangeIndexMode() {

0 commit comments

Comments
 (0)