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

Fix composite test 

Our test for early termination would break if we made many small
segments because none of them would be large enough to trigger the early
termination. This makes sure have only a single segment for these test,
making sure we terminate early.

Closes #62769
This commit is contained in:
Nik Everett 2020-11-30 15:37:45 -05:00 committed by Martijn van Groningen
parent 80b8b23b8d
commit eb9d44d0cf
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java
View File

@ -2133,7 +2133,7 @@ public class CompositeAggregatorTests extends AggregatorTestCase {
)
);
executeTestCase(true, new TermQuery(new Term("foo", "bar")),
executeTestCase(true, true, new TermQuery(new Term("foo", "bar")),
dataset,
() ->
new CompositeAggregationBuilder("name",
@ -2153,7 +2153,7 @@ public class CompositeAggregatorTests extends AggregatorTestCase {
);
// source field and index sorting config have different order
executeTestCase(true, new TermQuery(new Term("foo", "bar")),
executeTestCase(true, true, new TermQuery(new Term("foo", "bar")),
dataset,
() ->
new CompositeAggregationBuilder("name",
@ -2190,7 +2190,7 @@ public class CompositeAggregatorTests extends AggregatorTestCase {
);
for (SortOrder order : SortOrder.values()) {
executeTestCase(true, new MatchAllDocsQuery(),
executeTestCase(false, true, new MatchAllDocsQuery(),
dataset,
() ->
new CompositeAggregationBuilder("name",
@ -2213,7 +2213,7 @@ public class CompositeAggregatorTests extends AggregatorTestCase {
}
);
executeTestCase(true, new MatchAllDocsQuery(),
executeTestCase(false, true, new MatchAllDocsQuery(),
dataset,
() ->
new CompositeAggregationBuilder("name",
@ -2243,12 +2243,13 @@ public class CompositeAggregatorTests extends AggregatorTestCase {
Supplier<CompositeAggregationBuilder> create,
Consumer<InternalComposite> verify) throws IOException {
for (Query query : queries) {
executeTestCase(false, query, dataset, create, verify);
executeTestCase(true, query, dataset, create, verify);
executeTestCase(false, false, query, dataset, create, verify);
executeTestCase(false, true, query, dataset, create, verify);
}
}
private void executeTestCase(boolean useIndexSort,
private void executeTestCase(boolean forceMerge,
boolean useIndexSort,
Query query,
List<Map<String, List<Object>>> dataset,
Supplier<CompositeAggregationBuilder> create,
@ -2273,18 +2274,21 @@ public class CompositeAggregatorTests extends AggregatorTestCase {
indexWriter.addDocument(document);
id++;
}
if (rarely()) {
if (forceMerge || rarely()) {
// forceMerge randomly or if the collector-per-leaf testing stuff would break the tests.
indexWriter.forceMerge(1);
}
if (dataset.size() > 0) {
int numDeletes = randomIntBetween(1, 25);
for (int i = 0; i < numDeletes; i++) {
id = randomIntBetween(0, dataset.size() - 1);
indexWriter.deleteDocuments(new Term("id", Integer.toString(id)));
document.clear();
addToDocument(id, document, dataset.get(id));
indexWriter.addDocument(document);
} else {
if (dataset.size() > 0) {
int numDeletes = randomIntBetween(1, 25);
for (int i = 0; i < numDeletes; i++) {
id = randomIntBetween(0, dataset.size() - 1);
indexWriter.deleteDocuments(new Term("id", Integer.toString(id)));
document.clear();
addToDocument(id, document, dataset.get(id));
indexWriter.addDocument(document);
}
}
}
}
try (IndexReader indexReader = DirectoryReader.open(directory)) {