Skip to content

Commit cf6ad82

Browse files
nik9000elasticmachine
nik9000
and
elasticmachine
authored
Fix aggs test failures (backport of elastic#74750) (elastic#74775)
The tests for the debugging information in the filters aggregation where too specific for the kind of randomization we run with. They asserted that the indices contained only a single segment which is *usually* true, but our test randomization framework sometimes emit many segmented indices, just to exercise the code. That's a good thing. But the tests had a wrong assertion. This swaps the assertion from `equalTo(1)` to `greaterThanOrEqualTo(1)`. Closes elastic#74677 Co-authored-by: Elastic Machine <[email protected]>
1 parent ebe964c commit cf6ad82

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

‎server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java

+13-12
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
import static io.github.nik9000.mapmatcher.MapMatcher.matchesMap;
9090
import static org.hamcrest.Matchers.equalTo;
9191
import static org.hamcrest.Matchers.greaterThan;
92+
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
9293
import static org.hamcrest.Matchers.hasSize;
9394
import static org.hamcrest.Matchers.instanceOf;
9495
import static org.hamcrest.Matchers.nullValue;
@@ -411,7 +412,7 @@ public void testRangeFilter() throws IOException {
411412
matchesMap().entry("segments_with_doc_count_field", 0)
412413
.entry("segments_with_deleted_docs", 0)
413414
.entry("segments_collected", 0)
414-
.entry("segments_counted", 1)
415+
.entry("segments_counted", greaterThanOrEqualTo(1))
415416
.entry("filters", matchesList().item(matchesMap().entry("query", "test:[1577836800000 TO 1583020799999]")))
416417
)
417418
);
@@ -471,7 +472,7 @@ public void testMatchAll() throws IOException {
471472
debug,
472473
matchesMap().entry(
473474
"test",
474-
matchesMap().entry("segments_counted", 1)
475+
matchesMap().entry("segments_counted", greaterThanOrEqualTo(1))
475476
.entry("segments_collected", 0)
476477
.entry("segments_with_doc_count_field", 0)
477478
.entry("segments_with_deleted_docs", 0)
@@ -513,9 +514,9 @@ public void testMatchAllWithDocCount() throws IOException {
513514
debug,
514515
matchesMap().entry(
515516
"test",
516-
matchesMap().entry("segments_counted", 1)
517+
matchesMap().entry("segments_counted", greaterThanOrEqualTo(1))
517518
.entry("segments_collected", 0)
518-
.entry("segments_with_doc_count_field", 1)
519+
.entry("segments_with_doc_count_field", greaterThanOrEqualTo(1))
519520
.entry("segments_with_deleted_docs", 0)
520521
.entry(
521522
"filters",
@@ -583,7 +584,7 @@ public void onCache(ShardId shardId, Accountable accountable) {}
583584
aggregator.collectDebugInfo(debug::put);
584585
assertMap(
585586
debug,
586-
matchesMap().entry("segments_counted", 1)
587+
matchesMap().entry("segments_counted", greaterThanOrEqualTo(1))
587588
.entry("segments_collected", 0)
588589
.entry("segments_with_doc_count_field", 0)
589590
.entry("segments_with_deleted_docs", 0)
@@ -670,7 +671,7 @@ public void testMatchNoneFilter() throws IOException {
670671
matchesMap().entry("segments_with_doc_count_field", 0)
671672
.entry("segments_with_deleted_docs", 0)
672673
.entry("segments_collected", 0)
673-
.entry("segments_counted", 1)
674+
.entry("segments_counted", greaterThanOrEqualTo(1))
674675
.entry(
675676
"filters",
676677
matchesList().item(
@@ -707,7 +708,7 @@ public void testMatchNoneTopLevel() throws IOException {
707708
matchesMap().entry("segments_with_doc_count_field", 0)
708709
.entry("segments_with_deleted_docs", 0)
709710
.entry("segments_collected", 0)
710-
.entry("segments_counted", 1)
711+
.entry("segments_counted", greaterThanOrEqualTo(1))
711712
.entry(
712713
"filters",
713714
matchesList().item(
@@ -746,7 +747,7 @@ public void testTermFilter() throws IOException {
746747
matchesMap().entry("segments_with_doc_count_field", 0)
747748
.entry("segments_with_deleted_docs", 0)
748749
.entry("segments_collected", 0)
749-
.entry("segments_counted", 1)
750+
.entry("segments_counted", greaterThanOrEqualTo(1))
750751
.entry(
751752
"filters",
752753
matchesList().item(
@@ -787,7 +788,7 @@ public void testTermTopLevel() throws IOException {
787788
matchesMap().entry("segments_with_doc_count_field", 0)
788789
.entry("segments_with_deleted_docs", 0)
789790
.entry("segments_collected", 0)
790-
.entry("segments_counted", 1)
791+
.entry("segments_counted", greaterThanOrEqualTo(1))
791792
.entry(
792793
"filters",
793794
matchesList().item(
@@ -874,7 +875,7 @@ public void testSubAggs() throws IOException {
874875
"test",
875876
matchesMap().entry("segments_with_doc_count_field", 0)
876877
.entry("segments_with_deleted_docs", 0)
877-
.entry("segments_collected", 1)
878+
.entry("segments_collected", greaterThanOrEqualTo(1))
878879
.entry("segments_counted", 0)
879880
.entry(
880881
"filters",
@@ -952,7 +953,7 @@ public void testSubAggsManyDocs() throws IOException {
952953
"test",
953954
matchesMap().entry("segments_with_doc_count_field", 0)
954955
.entry("segments_with_deleted_docs", 0)
955-
.entry("segments_collected", 1)
956+
.entry("segments_collected", greaterThanOrEqualTo(1))
956957
.entry("segments_counted", 0)
957958
.entry("filters", hasSize(2))
958959
).entry("test.s", matchesMap()).entry("test.m", matchesMap())
@@ -1033,7 +1034,7 @@ public void testSubAggsManyFilters() throws IOException {
10331034
"test",
10341035
matchesMap().entry("segments_with_doc_count_field", 0)
10351036
.entry("segments_with_deleted_docs", 0)
1036-
.entry("segments_collected", 1)
1037+
.entry("segments_collected", greaterThanOrEqualTo(1))
10371038
.entry("segments_counted", 0)
10381039
.entry("filters", hasSize(buckets.size()))
10391040
).entry("test.s", matchesMap()).entry("test.m", matchesMap())

0 commit comments

Comments
 (0)