Skip to content

Commit 9bbea47

Browse files
iveraseiverase
authored
use #newIndexSearcher in all AggregatorTestCase implementations (#95796)
1 parent 251f923 commit 9bbea47

27 files changed

+77
-96
lines changed

‎modules/aggregations/src/test/java/org/elasticsearch/aggregations/bucket/histogram/AutoDateHistogramAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,7 @@ private void testSearchCase(
10301030
}
10311031

10321032
try (IndexReader indexReader = DirectoryReader.open(directory)) {
1033-
final IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
1033+
final IndexSearcher indexSearcher = newIndexSearcher(indexReader);
10341034

10351035
final AutoDateHistogramAggregationBuilder aggregationBuilder = new AutoDateHistogramAggregationBuilder("_name");
10361036
if (configure != null) {

‎modules/aggregations/src/test/java/org/elasticsearch/aggregations/pipeline/CumulativeSumAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ private void executeTestCase(
315315
}
316316

317317
try (IndexReader indexReader = DirectoryReader.open(directory)) {
318-
IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
318+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
319319

320320
DateFieldMapper.DateFieldType fieldType = new DateFieldMapper.DateFieldType(HISTO_FIELD);
321321
MappedFieldType valueFieldType = new NumberFieldMapper.NumberFieldType("value_field", NumberFieldMapper.NumberType.LONG);

‎modules/aggregations/src/test/java/org/elasticsearch/aggregations/pipeline/DerivativeAggregatorTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ public void testDerivDerivNPE() throws IOException {
667667
}
668668

669669
try (IndexReader indexReader = DirectoryReader.open(directory)) {
670-
IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
670+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
671671
searchAndReduce(indexSearcher, new AggTestConfig(aggBuilder).withQuery(query));
672672
}
673673
}
@@ -718,7 +718,7 @@ private void executeTestCase(
718718
}
719719

720720
try (IndexReader indexReader = DirectoryReader.open(directory)) {
721-
IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
721+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
722722

723723
DateFieldMapper.DateFieldType fieldType = new DateFieldMapper.DateFieldType(SINGLE_VALUED_FIELD_NAME);
724724
MappedFieldType valueFieldType = new NumberFieldMapper.NumberFieldType("value_field", NumberFieldMapper.NumberType.LONG);

‎modules/aggregations/src/test/java/org/elasticsearch/aggregations/pipeline/MovFnAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private void executeTestCase(Query query, DateHistogramAggregationBuilder aggBui
163163
}
164164

165165
try (IndexReader indexReader = DirectoryReader.open(directory)) {
166-
IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
166+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
167167

168168
DateFieldMapper.DateFieldType fieldType = new DateFieldMapper.DateFieldType(aggBuilder.field());
169169
MappedFieldType valueFieldType = new NumberFieldMapper.NumberFieldType("value_field", NumberFieldMapper.NumberType.LONG);

‎modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenToParentAggregatorTests.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void testNoDocs() throws IOException {
6666
indexWriter.close();
6767
IndexReader indexReader = DirectoryReader.open(directory);
6868

69-
testCase(new MatchAllDocsQuery(), newSearcher(indexReader, false, true), childrenToParent -> {
69+
testCase(new MatchAllDocsQuery(), newIndexSearcher(indexReader), childrenToParent -> {
7070
assertEquals(0, childrenToParent.getDocCount());
7171
Aggregation parentAggregation = childrenToParent.getAggregations().get("in_parent");
7272
assertEquals(0, childrenToParent.getDocCount());
@@ -89,8 +89,7 @@ public void testParentChild() throws IOException {
8989
DirectoryReader.open(directory),
9090
new ShardId(new Index("foo", "_na_"), 1)
9191
);
92-
// TODO set "maybeWrap" to true for IndexSearcher once #23338 is resolved
93-
IndexSearcher indexSearcher = newSearcher(indexReader, false, true);
92+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
9493

9594
// verify with all documents
9695
testCase(new MatchAllDocsQuery(), indexSearcher, parent -> {
@@ -157,8 +156,7 @@ public void testParentChildTerms() throws IOException {
157156
DirectoryReader.open(directory),
158157
new ShardId(new Index("foo", "_na_"), 1)
159158
);
160-
// TODO set "maybeWrap" to true for IndexSearcher once #23338 is resolved
161-
IndexSearcher indexSearcher = newSearcher(indexReader, false, true);
159+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
162160

163161
// verify a terms-aggregation inside the parent-aggregation
164162
testCaseTerms(new MatchAllDocsQuery(), indexSearcher, parent -> {
@@ -201,8 +199,7 @@ public void testTermsParentChildTerms() throws IOException {
201199
DirectoryReader.open(directory),
202200
new ShardId(new Index("foo", "_na_"), 1)
203201
);
204-
// TODO set "maybeWrap" to true for IndexSearcher once #23338 is resolved
205-
IndexSearcher indexSearcher = newSearcher(indexReader, false, true);
202+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
206203

207204
// verify a terms-aggregation inside the parent-aggregation which itself is inside a
208205
// terms-aggregation on the child-documents

‎modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void testNoDocs() throws IOException {
7272
indexWriter.close();
7373
IndexReader indexReader = DirectoryReader.open(directory);
7474

75-
testCase(new MatchAllDocsQuery(), newSearcher(indexReader, false, true), parentToChild -> {
75+
testCase(new MatchAllDocsQuery(), newIndexSearcher(indexReader), parentToChild -> {
7676
assertEquals(0, parentToChild.getDocCount());
7777
assertEquals(Double.POSITIVE_INFINITY, ((Min) parentToChild.getAggregations().get("in_child")).value(), Double.MIN_VALUE);
7878
});
@@ -91,8 +91,7 @@ public void testParentChild() throws IOException {
9191
DirectoryReader.open(directory),
9292
new ShardId(new Index("foo", "_na_"), 1)
9393
);
94-
// TODO set "maybeWrap" to true for IndexSearcher once #23338 is resolved
95-
IndexSearcher indexSearcher = newSearcher(indexReader, false, true);
94+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
9695

9796
testCase(new MatchAllDocsQuery(), indexSearcher, child -> {
9897
int expectedTotalChildren = 0;
@@ -134,7 +133,7 @@ public void testParentChildAsSubAgg() throws IOException {
134133
new ShardId(new Index("foo", "_na_"), 1)
135134
)
136135
) {
137-
IndexSearcher indexSearcher = newSearcher(indexReader, false, true);
136+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
138137

139138
AggregationBuilder request = new TermsAggregationBuilder("t").field("kwd")
140139
.subAggregation(
@@ -190,7 +189,7 @@ public void testBestDeferringCollectorWithSubAggOfChildrenAggNeedingScores() thr
190189
) {
191190
// maybeWrap should be false here, in ValueSource.java we sometimes cast to DirectoryReader and
192191
// these casts can then fail if the maybeWrap is true.
193-
var indexSearcher = newSearcher(indexReader, false, true);
192+
var indexSearcher = newIndexSearcher(indexReader);
194193
// invalid usage,
195194
{
196195
var aggregationBuilder = new ChildrenAggregationBuilder("_name1", CHILD_TYPE);

‎server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3104,7 +3104,7 @@ public void testParentFactoryValidation() throws Exception {
31043104
indexWriter.addDocument(document);
31053105
}
31063106
try (IndexReader indexReader = DirectoryReader.open(directory)) {
3107-
IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
3107+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
31083108
try (
31093109
AggregationContext context = createAggregationContext(
31103110
indexSearcher,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void testEmpty() throws Exception {
106106
RandomIndexWriter indexWriter = new RandomIndexWriter(random(), directory);
107107
indexWriter.close();
108108
IndexReader indexReader = DirectoryReader.open(directory);
109-
IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
109+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
110110
int numFilters = randomIntBetween(1, 10);
111111
QueryBuilder[] filters = new QueryBuilder[numFilters];
112112
for (int i = 0; i < filters.length; i++) {
@@ -198,7 +198,7 @@ public void testKeyedFilter() throws Exception {
198198
indexWriter.close();
199199

200200
IndexReader indexReader = DirectoryReader.open(directory);
201-
IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
201+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
202202

203203
FiltersAggregator.KeyedFilter[] keys = new FiltersAggregator.KeyedFilter[6];
204204
keys[0] = new FiltersAggregator.KeyedFilter("foobar", QueryBuilders.termQuery("field", "foobar"));
@@ -246,7 +246,7 @@ public void testRandom() throws Exception {
246246
indexWriter.close();
247247

248248
IndexReader indexReader = DirectoryReader.open(directory);
249-
IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
249+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
250250
try {
251251
int numFilters = randomIntBetween(1, 10);
252252
QueryBuilder[] filters = new QueryBuilder[numFilters];

‎server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1171,7 +1171,7 @@ private void testSearchCase(
11711171
}
11721172

11731173
try (IndexReader indexReader = DirectoryReader.open(directory)) {
1174-
IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
1174+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
11751175

11761176
DateHistogramAggregationBuilder aggregationBuilder = new DateHistogramAggregationBuilder("_name");
11771177
if (configure != null) {

‎server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ private void testCase(
10821082
indexWriter.close();
10831083

10841084
try (IndexReader indexReader = DirectoryReader.open(directory)) {
1085-
IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
1085+
IndexSearcher indexSearcher = newIndexSearcher(indexReader);
10861086

10871087
InternalDateHistogram histogram = searchAndReduce(
10881088
indexSearcher,

‎server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ private void testSearchCase(
610610
}
611611

612612
try (IndexReader indexReader = DirectoryReader.open(directory)) {
613-
final IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
613+
final IndexSearcher indexSearcher = newIndexSearcher(indexReader);
614614

615615
final VariableWidthHistogramAggregationBuilder aggregationBuilder = new VariableWidthHistogramAggregationBuilder("_name");
616616
if (configure != null) {

‎server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ private void testCase(
322322
}
323323

324324
try (IndexReader indexReader = DirectoryReader.open(directory)) {
325-
final IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
325+
final IndexSearcher indexSearcher = newIndexSearcher(indexReader);
326326
final MappedFieldType[] fieldTypesArray = fieldTypes.toArray(new MappedFieldType[0]);
327327
final InternalMissing missing = searchAndReduce(
328328
indexSearcher,

‎server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public void testNoDocs() throws IOException {
147147
nestedBuilder.subAggregation(maxAgg);
148148
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG);
149149

150-
InternalNested nested = searchAndReduce(newSearcher(indexReader, false, true), new AggTestConfig(nestedBuilder, fieldType));
150+
InternalNested nested = searchAndReduce(newIndexSearcher(indexReader), new AggTestConfig(nestedBuilder, fieldType));
151151

152152
assertEquals(NESTED_AGG, nested.getName());
153153
assertEquals(0, nested.getDocCount());
@@ -190,7 +190,7 @@ public void testSingleNestingMax() throws IOException {
190190
nestedBuilder.subAggregation(maxAgg);
191191
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG);
192192

193-
InternalNested nested = searchAndReduce(newSearcher(indexReader, false, true), new AggTestConfig(nestedBuilder, fieldType));
193+
InternalNested nested = searchAndReduce(newIndexSearcher(indexReader), new AggTestConfig(nestedBuilder, fieldType));
194194
assertEquals(expectedNestedDocs, nested.getDocCount());
195195

196196
assertEquals(NESTED_AGG, nested.getName());
@@ -240,7 +240,7 @@ public void testDoubleNestingMax() throws IOException {
240240

241241
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG);
242242

243-
InternalNested nested = searchAndReduce(newSearcher(indexReader, false, true), new AggTestConfig(nestedBuilder, fieldType));
243+
InternalNested nested = searchAndReduce(newIndexSearcher(indexReader), new AggTestConfig(nestedBuilder, fieldType));
244244
assertEquals(expectedNestedDocs, nested.getDocCount());
245245

246246
assertEquals(NESTED_AGG, nested.getName());
@@ -291,7 +291,7 @@ public void testOrphanedDocs() throws IOException {
291291
nestedBuilder.subAggregation(sumAgg);
292292
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG);
293293

294-
InternalNested nested = searchAndReduce(newSearcher(indexReader, false, true), new AggTestConfig(nestedBuilder, fieldType));
294+
InternalNested nested = searchAndReduce(newIndexSearcher(indexReader), new AggTestConfig(nestedBuilder, fieldType));
295295
assertEquals(expectedNestedDocs, nested.getDocCount());
296296

297297
assertEquals(NESTED_AGG, nested.getName());
@@ -372,7 +372,7 @@ public void testResetRootDocId() throws Exception {
372372
bq.add(new TermQuery(new Term(IdFieldMapper.NAME, Uid.encodeId("2"))), BooleanClause.Occur.MUST_NOT);
373373

374374
InternalNested nested = searchAndReduce(
375-
newSearcher(indexReader, false, true),
375+
newIndexSearcher(indexReader),
376376
new AggTestConfig(nestedBuilder, fieldType).withQuery(new ConstantScoreQuery(bq.build()))
377377
);
378378

@@ -411,10 +411,7 @@ public void testNestedOrdering() throws IOException {
411411
nestedBuilder.subAggregation(maxAgg);
412412
termsBuilder.subAggregation(nestedBuilder);
413413

414-
Terms terms = searchAndReduce(
415-
newSearcher(indexReader, false, true),
416-
new AggTestConfig(termsBuilder, fieldType1, fieldType2)
417-
);
414+
Terms terms = searchAndReduce(newIndexSearcher(indexReader), new AggTestConfig(termsBuilder, fieldType1, fieldType2));
418415

419416
assertEquals(7, terms.getBuckets().size());
420417
assertEquals("authors", terms.getName());
@@ -463,7 +460,7 @@ public void testNestedOrdering() throws IOException {
463460
nestedBuilder.subAggregation(maxAgg);
464461
termsBuilder.subAggregation(nestedBuilder);
465462

466-
terms = searchAndReduce(newSearcher(indexReader, false, true), new AggTestConfig(termsBuilder, fieldType1, fieldType2));
463+
terms = searchAndReduce(newIndexSearcher(indexReader), new AggTestConfig(termsBuilder, fieldType1, fieldType2));
467464

468465
assertEquals(7, terms.getBuckets().size());
469466
assertEquals("authors", terms.getName());
@@ -550,7 +547,7 @@ public void testNestedOrdering_random() throws IOException {
550547
termsBuilder.subAggregation(nestedBuilder);
551548

552549
AggTestConfig aggTestConfig = new AggTestConfig(termsBuilder, fieldType1, fieldType2);
553-
Terms terms = searchAndReduce(newSearcher(indexReader, false, true), aggTestConfig);
550+
Terms terms = searchAndReduce(newIndexSearcher(indexReader), aggTestConfig);
554551

555552
assertEquals(books.size(), terms.getBuckets().size());
556553
assertEquals("authors", terms.getName());
@@ -646,7 +643,7 @@ public void testPreGetChildLeafCollectors() throws IOException {
646643
MappedFieldType fieldType2 = new KeywordFieldMapper.KeywordFieldType("value");
647644

648645
Filter filter = searchAndReduce(
649-
newSearcher(indexReader, false, true),
646+
newIndexSearcher(indexReader),
650647
new AggTestConfig(filterAggregationBuilder, fieldType1, fieldType2).withQuery(
651648
Queries.newNonNestedFilter(Version.CURRENT)
652649
)
@@ -709,8 +706,8 @@ public void testFieldAlias() throws IOException {
709706
max(MAX_AGG_NAME).field(VALUE_FIELD_NAME + "-alias")
710707
);
711708

712-
InternalNested nested = searchAndReduce(newSearcher(indexReader, false, true), new AggTestConfig(agg, fieldType));
713-
Nested aliasNested = searchAndReduce(newSearcher(indexReader, false, true), new AggTestConfig(aliasAgg, fieldType));
709+
InternalNested nested = searchAndReduce(newIndexSearcher(indexReader), new AggTestConfig(agg, fieldType));
710+
Nested aliasNested = searchAndReduce(newIndexSearcher(indexReader), new AggTestConfig(aliasAgg, fieldType));
714711

715712
assertEquals(nested, aliasNested);
716713
assertEquals(expectedNestedDocs, nested.getDocCount());
@@ -758,7 +755,7 @@ public void testNestedWithPipeline() throws IOException {
758755

759756
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG);
760757

761-
InternalNested nested = searchAndReduce(newSearcher(indexReader, false, true), new AggTestConfig(nestedBuilder, fieldType));
758+
InternalNested nested = searchAndReduce(newIndexSearcher(indexReader), new AggTestConfig(nestedBuilder, fieldType));
762759

763760
assertEquals(expectedNestedDocs, nested.getDocCount());
764761
assertEquals(NESTED_AGG, nested.getName());

‎server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void testNoDocs() throws IOException {
7373
reverseNestedBuilder.subAggregation(maxAgg);
7474
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG);
7575

76-
Nested nested = searchAndReduce(newSearcher(indexReader, false, true), new AggTestConfig(nestedBuilder, fieldType));
76+
Nested nested = searchAndReduce(newIndexSearcher(indexReader), new AggTestConfig(nestedBuilder, fieldType));
7777
ReverseNested reverseNested = (ReverseNested) ((InternalAggregation) nested).getProperty(REVERSE_AGG_NAME);
7878
assertEquals(REVERSE_AGG_NAME, reverseNested.getName());
7979
assertEquals(0, reverseNested.getDocCount());
@@ -126,7 +126,7 @@ public void testMaxFromParentDocs() throws IOException {
126126
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG);
127127

128128
AggTestConfig aggTestConfig = new AggTestConfig(nestedBuilder, fieldType);
129-
Nested nested = searchAndReduce(newSearcher(indexReader, false, true), aggTestConfig);
129+
Nested nested = searchAndReduce(newIndexSearcher(indexReader), aggTestConfig);
130130
assertEquals(expectedNestedDocs, nested.getDocCount());
131131

132132
ReverseNested reverseNested = (ReverseNested) ((InternalAggregation) nested).getProperty(REVERSE_AGG_NAME);
@@ -185,8 +185,8 @@ public void testFieldAlias() throws IOException {
185185
reverseNested(REVERSE_AGG_NAME).subAggregation(aliasMaxAgg)
186186
);
187187

188-
Nested nested = searchAndReduce(newSearcher(indexReader, false, true), new AggTestConfig(agg, fieldType));
189-
Nested aliasNested = searchAndReduce(newSearcher(indexReader, false, true), new AggTestConfig(aliasAgg, fieldType));
188+
Nested nested = searchAndReduce(newIndexSearcher(indexReader), new AggTestConfig(agg, fieldType));
189+
Nested aliasNested = searchAndReduce(newIndexSearcher(indexReader), new AggTestConfig(aliasAgg, fieldType));
190190

191191
ReverseNested reverseNested = nested.getAggregations().get(REVERSE_AGG_NAME);
192192
ReverseNested aliasReverseNested = aliasNested.getAggregations().get(REVERSE_AGG_NAME);

0 commit comments

Comments
 (0)