diff --git a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java b/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java index 024e81feec2c1..01ca9e1f3ceee 100644 --- a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java +++ b/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java @@ -13,7 +13,6 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.NumericUtils; @@ -41,7 +40,7 @@ public void testNoData() throws Exception { MatrixStatsAggregationBuilder aggBuilder = new MatrixStatsAggregationBuilder("my_agg").fields( Collections.singletonList("field") ); - InternalMatrixStats stats = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, ft); + InternalMatrixStats stats = searchAndReduce(new AggTestConfig(searcher, aggBuilder, ft)); assertNull(stats.getStats()); assertEquals(0L, stats.getDocCount()); } @@ -60,7 +59,7 @@ public void testUnmapped() throws Exception { MatrixStatsAggregationBuilder aggBuilder = new MatrixStatsAggregationBuilder("my_agg").fields( Collections.singletonList("bogus") ); - InternalMatrixStats stats = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, ft); + InternalMatrixStats stats = searchAndReduce(new AggTestConfig(searcher, aggBuilder, ft)); assertNull(stats.getStats()); assertEquals(0L, stats.getDocCount()); } @@ -95,7 +94,7 @@ public void testTwoFields() throws Exception { MatrixStatsAggregationBuilder aggBuilder = new MatrixStatsAggregationBuilder("my_agg").fields( Arrays.asList(fieldA, fieldB) ); - InternalMatrixStats stats = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, ftA, ftB); + InternalMatrixStats stats = searchAndReduce(new AggTestConfig(searcher, aggBuilder, ftA, ftB)); multiPassStats.assertNearlyEqual(stats); assertTrue(MatrixAggregationInspectionHelper.hasValue(stats)); } diff --git a/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenToParentAggregatorTests.java b/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenToParentAggregatorTests.java index 00028af11a9eb..a8533f53b1fa8 100644 --- a/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenToParentAggregatorTests.java +++ b/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenToParentAggregatorTests.java @@ -268,7 +268,7 @@ private void testCase(Query query, IndexSearcher indexSearcher, Consumer searchAndReduce( - indexSearcher, - new TermQuery(new Term("join_field", "parent_type")), - aggregationBuilder, - withJoinFields(fieldType, fieldType2) + new AggTestConfig( + indexSearcher, + new TermQuery(new Term("join_field", "parent_type")), + aggregationBuilder, + withJoinFields(fieldType, fieldType2) + ) ) ); assertThat( @@ -239,10 +236,12 @@ public void testBestDeferringCollectorWithSubAggOfChildrenAggNeedingScores() thr var fieldType = new NumberFieldMapper.NumberFieldType("number", NumberFieldMapper.NumberType.LONG); var fieldType2 = new KeywordFieldMapper.KeywordFieldType("string_field", false, true, Map.of()); InternalChildren result = searchAndReduce( - indexSearcher, - new TermQuery(new Term("join_field", "parent_type")), - aggregationBuilder, - withJoinFields(fieldType, fieldType2) + new AggTestConfig( + indexSearcher, + new TermQuery(new Term("join_field", "parent_type")), + aggregationBuilder, + withJoinFields(fieldType, fieldType2) + ) ); Terms terms = result.getAggregations().get("_name2"); @@ -312,7 +311,7 @@ private void testCase(Query query, IndexSearcher indexSearcher, Consumer objectMappers; + private Sort indexSort; @Override @Before @@ -3295,8 +3296,7 @@ private void execu assert create.size() == verify.size() : "create and verify should be the same size"; Map types = Arrays.stream(FIELD_TYPES) .collect(Collectors.toMap(MappedFieldType::name, Function.identity())); - Sort indexSort = useIndexSort ? buildIndexSort(sources, types) : null; - IndexSettings indexSettings = createIndexSettings(indexSort); + indexSort = useIndexSort ? buildIndexSort(sources, types) : null; try (Directory directory = newDirectory()) { IndexWriterConfig config = newIndexWriterConfig(random(), new MockAnalyzer(random())); if (indexSort != null) { @@ -3335,17 +3335,18 @@ private void execu try (IndexReader indexReader = DirectoryReader.open(directory)) { IndexSearcher indexSearcher = new IndexSearcher(indexReader); for (int i = 0; i < create.size(); i++) { - verify.get(i).accept(searchAndReduce(indexSettings, indexSearcher, query, create.get(i).get(), FIELD_TYPES)); + verify.get(i).accept(searchAndReduce(new AggTestConfig(indexSearcher, query, create.get(i).get(), FIELD_TYPES))); } } } } - private static IndexSettings createIndexSettings(Sort sort) { + @Override + protected IndexSettings createIndexSettings() { Settings.Builder builder = Settings.builder(); - if (sort != null) { - String[] fields = Arrays.stream(sort.getSort()).map(SortField::getField).toArray(String[]::new); - String[] orders = Arrays.stream(sort.getSort()).map((o) -> o.getReverse() ? "desc" : "asc").toArray(String[]::new); + if (indexSort != null) { + String[] fields = Arrays.stream(indexSort.getSort()).map(SortField::getField).toArray(String[]::new); + String[] orders = Arrays.stream(indexSort.getSort()).map((o) -> o.getReverse() ? "desc" : "asc").toArray(String[]::new); builder.putList("index.sort.field", fields); builder.putList("index.sort.order", orders); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java index 5cbce4a198fde..9d70eea3963bf 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java @@ -12,7 +12,6 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; import org.elasticsearch.index.mapper.KeywordFieldMapper; @@ -52,7 +51,7 @@ public void testEmpty() throws Exception { IndexSearcher indexSearcher = newSearcher(indexReader, true, true); QueryBuilder filter = QueryBuilders.termQuery("field", randomAlphaOfLength(5)); FilterAggregationBuilder builder = new FilterAggregationBuilder("test", filter); - InternalFilter response = searchAndReduce(indexSearcher, new MatchAllDocsQuery(), builder, fieldType); + InternalFilter response = searchAndReduce(new AggTestConfig(indexSearcher, builder, fieldType)); assertEquals(response.getDocCount(), 0); assertFalse(AggregationInspectionHelper.hasValue(response)); indexReader.close(); @@ -87,7 +86,7 @@ public void testRandom() throws Exception { QueryBuilder filter = QueryBuilders.termQuery("field", Integer.toString(value)); FilterAggregationBuilder builder = new FilterAggregationBuilder("test", filter); - final InternalFilter response = searchAndReduce(indexSearcher, new MatchAllDocsQuery(), builder, fieldType); + final InternalFilter response = searchAndReduce(new AggTestConfig(indexSearcher, builder, fieldType)); assertEquals(response.getDocCount(), (long) expectedBucketCount[value]); if (expectedBucketCount[value] > 0) { assertTrue(AggregationInspectionHelper.hasValue(response)); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java index f2095ceab870c..80d20648227a4 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java @@ -120,10 +120,7 @@ public void testEmpty() throws Exception { FiltersAggregationBuilder builder = new FiltersAggregationBuilder("test", filters); builder.otherBucketKey("other"); InternalFilters response = searchAndReduce( - indexSearcher, - new MatchAllDocsQuery(), - builder, - new KeywordFieldMapper.KeywordFieldType("field") + new AggTestConfig(indexSearcher, new MatchAllDocsQuery(), builder, new KeywordFieldType("field")) ); assertEquals(response.getBuckets().size(), numFilters); for (InternalFilters.InternalBucket filter : response.getBuckets()) { @@ -221,10 +218,7 @@ public void testKeyedFilter() throws Exception { builder.otherBucket(true); builder.otherBucketKey("other"); final InternalFilters filters = searchAndReduce( - indexSearcher, - new MatchAllDocsQuery(), - builder, - new KeywordFieldMapper.KeywordFieldType("field") + new AggTestConfig(indexSearcher, new MatchAllDocsQuery(), builder, new KeywordFieldType("field")) ); assertEquals(filters.getBuckets().size(), 7); assertEquals(filters.getBucketByKey("foobar").getDocCount(), 2); @@ -281,10 +275,7 @@ public void testRandom() throws Exception { builder.otherBucketKey("other"); final InternalFilters response = searchAndReduce( - indexSearcher, - new MatchAllDocsQuery(), - builder, - new KeywordFieldMapper.KeywordFieldType("field") + new AggTestConfig(indexSearcher, new MatchAllDocsQuery(), builder, new KeywordFieldType("field")) ); List buckets = response.getBuckets(); assertEquals(buckets.size(), filters.length + 1); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregatorTests.java index 563c1b4102617..d10de8039cdee 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregatorTests.java @@ -942,12 +942,7 @@ private void testSearchCase( MappedFieldType numericFieldType = new NumberFieldMapper.NumberFieldType(NUMERIC_FIELD, NumberFieldMapper.NumberType.LONG); final InternalAutoDateHistogram histogram = searchAndReduce( - indexSearcher, - query, - aggregationBuilder, - fieldType, - instantFieldType, - numericFieldType + new AggTestConfig(indexSearcher, query, aggregationBuilder, fieldType, instantFieldType, numericFieldType) ); verify.accept(histogram); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java index 74a5f6e5fbe83..1eb643e428e54 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java @@ -1174,7 +1174,9 @@ private void testSearchCase( configure.accept(aggregationBuilder); } - InternalDateHistogram histogram = searchAndReduce(indexSearcher, query, aggregationBuilder, maxBucket, fieldType); + InternalDateHistogram histogram = searchAndReduce( + new AggTestConfig(indexSearcher, query, aggregationBuilder, fieldType).withMaxBuckets(maxBucket) + ); verify.accept(histogram); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregatorTests.java index aa0803ed378dd..db3c8304c6a9c 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregatorTests.java @@ -1084,7 +1084,7 @@ private void testCase( try (IndexReader indexReader = DirectoryReader.open(directory)) { IndexSearcher indexSearcher = newSearcher(indexReader, true, true); - InternalDateHistogram histogram = searchAndReduce(indexSearcher, query, aggregationBuilder, fieldType); + InternalDateHistogram histogram = searchAndReduce(new AggTestConfig(indexSearcher, query, aggregationBuilder, fieldType)); verify.accept(histogram); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java index 15319674c2644..00ac7191fe2c2 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java @@ -52,7 +52,7 @@ public void testLongs() throws Exception { HistogramAggregationBuilder aggBuilder = new HistogramAggregationBuilder("my_agg").field("field").interval(5); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, longField("field")); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, longField("field"))); assertEquals(6, histogram.getBuckets().size()); assertEquals(-10d, histogram.getBuckets().get(0).getKey()); assertEquals(2, histogram.getBuckets().get(0).getDocCount()); @@ -82,7 +82,7 @@ public void testDoubles() throws Exception { HistogramAggregationBuilder aggBuilder = new HistogramAggregationBuilder("my_agg").field("field").interval(5); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, doubleField("field")); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, doubleField("field"))); assertEquals(6, histogram.getBuckets().size()); assertEquals(6, histogram.getBuckets().size()); assertEquals(-10d, histogram.getBuckets().get(0).getKey()); @@ -132,7 +132,7 @@ public void testDates() throws Exception { .interval(1000 * 60 * 60 * 24); try (IndexReader reader = indexWriter.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertTrue(AggregationInspectionHelper.hasValue(histogram)); } } @@ -149,7 +149,7 @@ public void testIrrationalInterval() throws Exception { HistogramAggregationBuilder aggBuilder = new HistogramAggregationBuilder("my_agg").field("field").interval(Math.PI); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, longField("field")); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, longField("field"))); assertEquals(6, histogram.getBuckets().size()); assertEquals(-4 * Math.PI, histogram.getBuckets().get(0).getKey()); assertEquals(1, histogram.getBuckets().get(0).getDocCount()); @@ -179,7 +179,7 @@ public void testMinDocCount() throws Exception { HistogramAggregationBuilder aggBuilder = new HistogramAggregationBuilder("my_agg").field("field").interval(10).minDocCount(2); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, longField("field")); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, longField("field"))); assertEquals(2, histogram.getBuckets().size()); assertEquals(-10d, histogram.getBuckets().get(0).getKey()); assertEquals(2, histogram.getBuckets().get(0).getDocCount()); @@ -202,7 +202,7 @@ public void testMissing() throws Exception { HistogramAggregationBuilder aggBuilder = new HistogramAggregationBuilder("my_agg").field("field").interval(5).missing(2d); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, longField("field")); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, longField("field"))); assertEquals(6, histogram.getBuckets().size()); assertEquals(-10d, histogram.getBuckets().get(0).getKey()); assertEquals(2, histogram.getBuckets().get(0).getDocCount()); @@ -231,7 +231,7 @@ public void testMissingUnmappedField() throws Exception { HistogramAggregationBuilder aggBuilder = new HistogramAggregationBuilder("my_agg").field("field").interval(5).missing(2d); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder)); assertEquals(1, histogram.getBuckets().size()); @@ -257,7 +257,7 @@ public void testMissingUnmappedFieldBadType() throws Exception { IndexSearcher searcher = new IndexSearcher(reader); Throwable t = expectThrows( IllegalArgumentException.class, - () -> { searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder); } + () -> { searchAndReduce(new AggTestConfig(searcher, aggBuilder)); } ); // This throws a number format exception (which is a subclass of IllegalArgumentException) and might be ok? assertThat(t.getMessage(), containsString(missingValue)); @@ -279,7 +279,7 @@ public void testIncorrectFieldType() throws Exception { expectThrows( IllegalArgumentException.class, - () -> { searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, keywordField("field")); } + () -> { searchAndReduce(new AggTestConfig(searcher, aggBuilder, keywordField("field"))); } ); } } @@ -297,7 +297,7 @@ public void testOffset() throws Exception { HistogramAggregationBuilder aggBuilder = new HistogramAggregationBuilder("my_agg").field("field").interval(5).offset(Math.PI); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, doubleField("field")); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, doubleField("field"))); assertEquals(4, histogram.getBuckets().size()); assertEquals(-10 + Math.PI, histogram.getBuckets().get(0).getKey()); assertEquals(2, histogram.getBuckets().get(0).getDocCount()); @@ -329,7 +329,7 @@ public void testRandomOffset() throws Exception { .offset(offset); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, doubleField("field")); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, doubleField("field"))); assertEquals(4, histogram.getBuckets().size()); assertEquals(-10 + expectedOffset, histogram.getBuckets().get(0).getKey()); @@ -363,7 +363,7 @@ public void testExtendedBounds() throws Exception { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("field", NumberFieldMapper.NumberType.DOUBLE); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, doubleField("field")); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, doubleField("field"))); assertEquals(6, histogram.getBuckets().size()); assertEquals(-15d, histogram.getBuckets().get(0).getKey()); assertEquals(0, histogram.getBuckets().get(0).getDocCount()); @@ -396,7 +396,7 @@ public void testHardBounds() throws Exception { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("field", NumberFieldMapper.NumberType.DOUBLE); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertEquals(1, histogram.getBuckets().size()); assertEquals(0d, histogram.getBuckets().get(0).getKey()); assertEquals(2, histogram.getBuckets().get(0).getDocCount()); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/RangeHistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/RangeHistogramAggregatorTests.java index 5504ee2948dfc..6116136a0ad4b 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/RangeHistogramAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/RangeHistogramAggregatorTests.java @@ -57,12 +57,7 @@ public void testDoubles() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggBuilder, - rangeField("field", rangeType) - ); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, rangeField("field", rangeType))); assertEquals(7, histogram.getBuckets().size()); assertEquals(-5d, histogram.getBuckets().get(0).getKey()); @@ -108,12 +103,7 @@ public void testLongs() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggBuilder, - rangeField("field", rangeType) - ); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, rangeField("field", rangeType))); assertEquals(7, histogram.getBuckets().size()); assertEquals(-5d, histogram.getBuckets().get(0).getKey()); @@ -159,12 +149,7 @@ public void testMultipleRanges() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggBuilder, - rangeField("field", rangeType) - ); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, rangeField("field", rangeType))); assertEquals(7, histogram.getBuckets().size()); assertEquals(-5d, histogram.getBuckets().get(0).getKey()); @@ -211,12 +196,7 @@ public void testMultipleRangesLotsOfOverlap() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggBuilder, - rangeField("field", rangeType) - ); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, rangeField("field", rangeType))); assertEquals(3, histogram.getBuckets().size()); assertEquals(0d, histogram.getBuckets().get(0).getKey()); @@ -250,12 +230,7 @@ public void testLongsIrrationalInterval() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggBuilder, - rangeField("field", rangeType) - ); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, rangeField("field", rangeType))); assertEquals(6, histogram.getBuckets().size()); assertEquals(-1 * Math.PI, histogram.getBuckets().get(0).getKey()); @@ -298,12 +273,7 @@ public void testMinDocCount() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggBuilder, - rangeField("field", rangeType) - ); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, rangeField("field", rangeType))); assertEquals(2, histogram.getBuckets().size()); assertEquals(5d, histogram.getBuckets().get(0).getKey()); @@ -334,12 +304,7 @@ public void testOffset() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggBuilder, - rangeField("field", rangeType) - ); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, rangeField("field", rangeType))); assertEquals(8, histogram.getBuckets().size()); assertEquals(-6d, histogram.getBuckets().get(0).getKey()); @@ -396,12 +361,7 @@ public void testOffsetGtInterval() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggBuilder, - rangeField("field", rangeType) - ); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, rangeField("field", rangeType))); assertEquals(7, histogram.getBuckets().size()); assertEquals(-5d + expectedOffset, histogram.getBuckets().get(0).getKey()); @@ -452,7 +412,7 @@ public void testIpRangesUnsupported() throws Exception { IndexSearcher searcher = new IndexSearcher(reader); Exception e = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, rangeField("field", rangeType)) + () -> searchAndReduce(new AggTestConfig(searcher, aggBuilder, rangeField("field", rangeType))) ); assertThat(e.getMessage(), equalTo("Expected numeric range type but found non-numeric range [ip_range]")); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java index f063eab612104..5b392a22a6ebd 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java @@ -624,7 +624,9 @@ private void testSearchCase( throw new IOException("Test data has an invalid type"); } - final InternalVariableWidthHistogram histogram = searchAndReduce(indexSearcher, query, aggregationBuilder, fieldType); + final InternalVariableWidthHistogram histogram = searchAndReduce( + new AggTestConfig(indexSearcher, query, aggregationBuilder, fieldType) + ); verify.accept(histogram); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java index 9255d17d87dce..dd851ecc35994 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java @@ -324,7 +324,7 @@ private void testCase( try (IndexReader indexReader = DirectoryReader.open(directory)) { final IndexSearcher indexSearcher = newSearcher(indexReader, true, true); final MappedFieldType[] fieldTypesArray = fieldTypes.toArray(new MappedFieldType[0]); - final InternalMissing missing = searchAndReduce(indexSearcher, query, builder, fieldTypesArray); + final InternalMissing missing = searchAndReduce(new AggTestConfig(indexSearcher, query, builder, fieldTypesArray)); verify.accept(missing); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java index af27f43f87ed5..600b7e6e216a0 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java @@ -148,12 +148,7 @@ public void testNoDocs() throws IOException { nestedBuilder.subAggregation(maxAgg); MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); - InternalNested nested = searchAndReduce( - newSearcher(indexReader, false, true), - new MatchAllDocsQuery(), - nestedBuilder, - fieldType - ); + InternalNested nested = searchAndReduce(new AggTestConfig(newSearcher(indexReader, false, true), nestedBuilder, fieldType)); assertEquals(NESTED_AGG, nested.getName()); assertEquals(0, nested.getDocCount()); @@ -198,12 +193,7 @@ public void testSingleNestingMax() throws IOException { nestedBuilder.subAggregation(maxAgg); MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); - InternalNested nested = searchAndReduce( - newSearcher(indexReader, false, true), - new MatchAllDocsQuery(), - nestedBuilder, - fieldType - ); + InternalNested nested = searchAndReduce(new AggTestConfig(newSearcher(indexReader, false, true), nestedBuilder, fieldType)); assertEquals(expectedNestedDocs, nested.getDocCount()); assertEquals(NESTED_AGG, nested.getName()); @@ -255,12 +245,7 @@ public void testDoubleNestingMax() throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); - InternalNested nested = searchAndReduce( - newSearcher(indexReader, false, true), - new MatchAllDocsQuery(), - nestedBuilder, - fieldType - ); + InternalNested nested = searchAndReduce(new AggTestConfig(newSearcher(indexReader, false, true), nestedBuilder, fieldType)); assertEquals(expectedNestedDocs, nested.getDocCount()); assertEquals(NESTED_AGG, nested.getName()); @@ -313,12 +298,7 @@ public void testOrphanedDocs() throws IOException { nestedBuilder.subAggregation(sumAgg); MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); - InternalNested nested = searchAndReduce( - newSearcher(indexReader, false, true), - new MatchAllDocsQuery(), - nestedBuilder, - fieldType - ); + InternalNested nested = searchAndReduce(new AggTestConfig(newSearcher(indexReader, false, true), nestedBuilder, fieldType)); assertEquals(expectedNestedDocs, nested.getDocCount()); assertEquals(NESTED_AGG, nested.getName()); @@ -399,10 +379,7 @@ public void testResetRootDocId() throws Exception { bq.add(new TermQuery(new Term(IdFieldMapper.NAME, Uid.encodeId("2"))), BooleanClause.Occur.MUST_NOT); InternalNested nested = searchAndReduce( - newSearcher(indexReader, false, true), - new ConstantScoreQuery(bq.build()), - nestedBuilder, - fieldType + new AggTestConfig(newSearcher(indexReader, false, true), new ConstantScoreQuery(bq.build()), nestedBuilder, fieldType) ); assertEquals(NESTED_AGG, nested.getName()); @@ -441,11 +418,7 @@ public void testNestedOrdering() throws IOException { termsBuilder.subAggregation(nestedBuilder); Terms terms = searchAndReduce( - newSearcher(indexReader, false, true), - new MatchAllDocsQuery(), - termsBuilder, - fieldType1, - fieldType2 + new AggTestConfig(newSearcher(indexReader, false, true), termsBuilder, fieldType1, fieldType2) ); assertEquals(7, terms.getBuckets().size()); @@ -495,13 +468,7 @@ public void testNestedOrdering() throws IOException { nestedBuilder.subAggregation(maxAgg); termsBuilder.subAggregation(nestedBuilder); - terms = searchAndReduce( - newSearcher(indexReader, false, true), - new MatchAllDocsQuery(), - termsBuilder, - fieldType1, - fieldType2 - ); + terms = searchAndReduce(new AggTestConfig(newSearcher(indexReader, false, true), termsBuilder, fieldType1, fieldType2)); assertEquals(7, terms.getBuckets().size()); assertEquals("authors", terms.getName()); @@ -588,11 +555,7 @@ public void testNestedOrdering_random() throws IOException { termsBuilder.subAggregation(nestedBuilder); Terms terms = searchAndReduce( - newSearcher(indexReader, false, true), - new MatchAllDocsQuery(), - termsBuilder, - fieldType1, - fieldType2 + new AggTestConfig(newSearcher(indexReader, false, true), termsBuilder, fieldType1, fieldType2) ); assertEquals(books.size(), terms.getBuckets().size()); @@ -689,11 +652,13 @@ public void testPreGetChildLeafCollectors() throws IOException { MappedFieldType fieldType2 = new KeywordFieldMapper.KeywordFieldType("value"); Filter filter = searchAndReduce( - newSearcher(indexReader, false, true), - Queries.newNonNestedFilter(), - filterAggregationBuilder, - fieldType1, - fieldType2 + new AggTestConfig( + newSearcher(indexReader, false, true), + Queries.newNonNestedFilter(), + filterAggregationBuilder, + fieldType1, + fieldType2 + ) ); assertEquals("filterAgg", filter.getName()); @@ -755,8 +720,8 @@ public void testFieldAlias() throws IOException { max(MAX_AGG_NAME).field(VALUE_FIELD_NAME + "-alias") ); - InternalNested nested = searchAndReduce(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), agg, fieldType); - Nested aliasNested = searchAndReduce(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), aliasAgg, fieldType); + InternalNested nested = searchAndReduce(new AggTestConfig(newSearcher(indexReader, false, true), agg, fieldType)); + Nested aliasNested = searchAndReduce(new AggTestConfig(newSearcher(indexReader, false, true), aliasAgg, fieldType)); assertEquals(nested, aliasNested); assertEquals(expectedNestedDocs, nested.getDocCount()); @@ -806,12 +771,7 @@ public void testNestedWithPipeline() throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); - InternalNested nested = searchAndReduce( - newSearcher(indexReader, false, true), - new MatchAllDocsQuery(), - nestedBuilder, - fieldType - ); + InternalNested nested = searchAndReduce(new AggTestConfig(newSearcher(indexReader, false, true), nestedBuilder, fieldType)); assertEquals(expectedNestedDocs, nested.getDocCount()); assertEquals(NESTED_AGG, nested.getName()); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java index 6681aaa3b6f00..2e10a552f813c 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java @@ -74,7 +74,7 @@ public void testNoDocs() throws IOException { reverseNestedBuilder.subAggregation(maxAgg); MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); - Nested nested = searchAndReduce(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), nestedBuilder, fieldType); + Nested nested = searchAndReduce(new AggTestConfig(newSearcher(indexReader, false, true), nestedBuilder, fieldType)); ReverseNested reverseNested = (ReverseNested) ((InternalAggregation) nested).getProperty(REVERSE_AGG_NAME); assertEquals(REVERSE_AGG_NAME, reverseNested.getName()); assertEquals(0, reverseNested.getDocCount()); @@ -134,7 +134,7 @@ public void testMaxFromParentDocs() throws IOException { reverseNestedBuilder.subAggregation(maxAgg); MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); - Nested nested = searchAndReduce(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), nestedBuilder, fieldType); + Nested nested = searchAndReduce(new AggTestConfig(newSearcher(indexReader, false, true), nestedBuilder, fieldType)); assertEquals(expectedNestedDocs, nested.getDocCount()); ReverseNested reverseNested = (ReverseNested) ((InternalAggregation) nested).getProperty(REVERSE_AGG_NAME); @@ -201,8 +201,8 @@ public void testFieldAlias() throws IOException { reverseNested(REVERSE_AGG_NAME).subAggregation(aliasMaxAgg) ); - Nested nested = searchAndReduce(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), agg, fieldType); - Nested aliasNested = searchAndReduce(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), aliasAgg, fieldType); + Nested nested = searchAndReduce(new AggTestConfig(newSearcher(indexReader, false, true), agg, fieldType)); + Nested aliasNested = searchAndReduce(new AggTestConfig(newSearcher(indexReader, false, true), aliasAgg, fieldType)); ReverseNested reverseNested = nested.getAggregations().get(REVERSE_AGG_NAME); ReverseNested aliasReverseNested = aliasNested.getAggregations().get(REVERSE_AGG_NAME); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java index c626d5df7ddc7..4e86c1fa5d382 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java @@ -529,10 +529,7 @@ private void testCase( IndexSearcher indexSearcher = newSearcher(indexReader, true, true); InternalRange> agg = searchAndReduce( - indexSearcher, - query, - aggregationBuilder, - fieldType + new AggTestConfig(indexSearcher, query, aggregationBuilder, fieldType) ); verify.accept(agg); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java index 02c528e3a9c4d..5642baf03b612 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java @@ -12,7 +12,6 @@ import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.BytesRef; @@ -100,7 +99,7 @@ public void testRanges() throws Exception { MappedFieldType fieldType = new IpFieldMapper.IpFieldType("field"); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalBinaryRange range = searchAndReduce(searcher, new MatchAllDocsQuery(), builder, fieldType); + InternalBinaryRange range = searchAndReduce(new AggTestConfig(searcher, builder, fieldType)); assertEquals(numRanges, range.getBuckets().size()); for (int i = 0; i < range.getBuckets().size(); i++) { Tuple expected = requestedRanges[i]; @@ -133,7 +132,7 @@ public void testMissingUnmapped() throws Exception { .missing("192.168.100.42"); // Apparently we expect a string here try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalBinaryRange range = searchAndReduce(searcher, new MatchAllDocsQuery(), builder); + InternalBinaryRange range = searchAndReduce(new AggTestConfig(searcher, builder)); assertEquals(1, range.getBuckets().size()); } } @@ -151,7 +150,7 @@ public void testMissingUnmappedBadType() throws Exception { .missing(1234); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - expectThrows(IllegalArgumentException.class, () -> searchAndReduce(searcher, new MatchAllDocsQuery(), builder)); + expectThrows(IllegalArgumentException.class, () -> searchAndReduce(new AggTestConfig(searcher, builder))); } } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedSamplerTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedSamplerTests.java index 71a6e9c06dd21..f267630f30d2c 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedSamplerTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedSamplerTests.java @@ -181,7 +181,7 @@ private void testCase( .shardSize(shardSize) .subAggregation(new TermsAggregationBuilder("terms").field("id")); - InternalSampler result = searchAndReduce(indexSearcher, query, builder, genreFieldType, idFieldType); + InternalSampler result = searchAndReduce(new AggTestConfig(indexSearcher, query, builder, genreFieldType, idFieldType)); verify.accept(result); } @@ -199,7 +199,7 @@ public void testDiversifiedSampler_noDocs() throws Exception { DiversifiedAggregationBuilder builder = new DiversifiedAggregationBuilder("_name").field(genreFieldType.name()) .subAggregation(new TermsAggregationBuilder("terms").field("id")); - InternalSampler result = searchAndReduce(indexSearcher, new MatchAllDocsQuery(), builder, genreFieldType, idFieldType); + InternalSampler result = searchAndReduce(new AggTestConfig(indexSearcher, builder, genreFieldType, idFieldType)); Terms terms = result.getAggregations().get("terms"); assertEquals(0, terms.getBuckets().size()); indexReader.close(); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorTests.java index 2a9f8188c3dd2..0d0ba3c18f6c0 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregatorTests.java @@ -17,7 +17,6 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.elasticsearch.index.mapper.MappedFieldType; @@ -66,11 +65,7 @@ public void testSampler() throws IOException { assertEquals("test expects a single segment", 1, reader.leaves().size()); IndexSearcher searcher = new IndexSearcher(reader); InternalSampler sampler = searchAndReduce( - searcher, - new TermQuery(new Term("text", "good")), - aggBuilder, - textFieldType, - numericFieldType + new AggTestConfig(searcher, new TermQuery(new Term("text", "good")), aggBuilder, textFieldType, numericFieldType) ); Min min = sampler.getAggregations().get("min"); assertEquals(5.0, min.value(), 0); @@ -105,11 +100,7 @@ public void testRidiculousSize() throws IOException { assertEquals("test expects a single segment", 1, reader.leaves().size()); IndexSearcher searcher = new IndexSearcher(reader); InternalSampler sampler = searchAndReduce( - searcher, - new TermQuery(new Term("text", "good")), - aggBuilder, - textFieldType, - numericFieldType + new AggTestConfig(searcher, new TermQuery(new Term("text", "good")), aggBuilder, textFieldType, numericFieldType) ); Min min = sampler.getAggregations().get("min"); assertEquals(3.0, min.value(), 0); @@ -136,7 +127,7 @@ public void testEmptyParentBucket() throws Exception { SamplerAggregationBuilder sampler = new SamplerAggregationBuilder("sampler").subAggregation(samplerChild); samplerParent.subAggregation(sampler); - InternalFilters response = searchAndReduce(searcher, new MatchAllDocsQuery(), samplerParent); + InternalFilters response = searchAndReduce(new AggTestConfig(searcher, samplerParent)); assertEquals(response.getBuckets().size(), 2); assertEquals(response.getBuckets().get(0).getDocCount(), 1); assertEquals(response.getBuckets().get(1).getDocCount(), 0); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/BinaryTermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/BinaryTermsAggregatorTests.java index 3b2fecfc12c32..bbbd9674b7938 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/BinaryTermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/BinaryTermsAggregatorTests.java @@ -156,7 +156,9 @@ private void testSearchCase( MappedFieldType binaryFieldType = new BinaryFieldMapper.BinaryFieldType(BINARY_FIELD); - InternalMappedTerms rareTerms = searchAndReduce(indexSearcher, query, aggregationBuilder, binaryFieldType); + InternalMappedTerms rareTerms = searchAndReduce( + new AggTestConfig(indexSearcher, query, aggregationBuilder, binaryFieldType) + ); verify.accept(rareTerms); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/KeywordTermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/KeywordTermsAggregatorTests.java index 0c6616737c854..a93a75d203075 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/KeywordTermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/KeywordTermsAggregatorTests.java @@ -127,7 +127,9 @@ private void testSearchCase( configure.accept(aggregationBuilder); } - InternalMappedTerms rareTerms = searchAndReduce(indexSearcher, query, aggregationBuilder, keywordFieldType); + InternalMappedTerms rareTerms = searchAndReduce( + new AggTestConfig(indexSearcher, query, aggregationBuilder, keywordFieldType) + ); verify.accept(rareTerms); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/NumericTermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/NumericTermsAggregatorTests.java index 190902db7186f..f63fe141cb646 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/NumericTermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/NumericTermsAggregatorTests.java @@ -166,7 +166,9 @@ private void testSearchCase( MappedFieldType longFieldType = new NumberFieldMapper.NumberFieldType(LONG_FIELD, NumberFieldMapper.NumberType.LONG); - InternalMappedTerms rareTerms = searchAndReduce(indexSearcher, query, aggregationBuilder, longFieldType); + InternalMappedTerms rareTerms = searchAndReduce( + new AggTestConfig(indexSearcher, query, aggregationBuilder, longFieldType) + ); verify.accept(rareTerms); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregatorTests.java index e52c6539f4ef4..ed044e5009c6d 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregatorTests.java @@ -365,7 +365,7 @@ public void testGlobalAggregationWithScore() throws IOException { MappedFieldType fieldType = new KeywordFieldMapper.KeywordFieldType("keyword"); - InternalGlobal result = searchAndReduce(indexSearcher, new MatchAllDocsQuery(), globalBuilder, fieldType); + InternalGlobal result = searchAndReduce(new AggTestConfig(indexSearcher, globalBuilder, fieldType)); InternalMultiBucketAggregation terms = result.getAggregations().get("terms"); assertThat(terms.getBuckets().size(), equalTo(3)); for (MultiBucketsAggregation.Bucket bucket : terms.getBuckets()) { @@ -401,11 +401,8 @@ public void testWithNestedAggregations() throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("nested_value", NumberFieldMapper.NumberType.LONG); try (IndexReader indexReader = wrapInMockESDirectoryReader(DirectoryReader.open(directory))) { InternalNested result = searchAndReduce( - newIndexSearcher(indexReader), // match root document only - new FieldExistsQuery(PRIMARY_TERM_NAME), - nested, - fieldType + new AggTestConfig(newIndexSearcher(indexReader), new FieldExistsQuery(PRIMARY_TERM_NAME), nested, fieldType) ); InternalMultiBucketAggregation terms = result.getAggregations().get("terms"); assertThat(terms.getBuckets().size(), equalTo(1)); @@ -445,11 +442,13 @@ public void testWithNestedScoringAggregations() throws IOException { IllegalStateException e = expectThrows( IllegalStateException.class, () -> searchAndReduce( - newIndexSearcher(indexReader), // match root document only - new FieldExistsQuery(PRIMARY_TERM_NAME), - nested, - fieldType + new AggTestConfig( + newIndexSearcher(indexReader), + new FieldExistsQuery(PRIMARY_TERM_NAME), + nested, + fieldType + ) ) ); assertThat( @@ -462,11 +461,8 @@ public void testWithNestedScoringAggregations() throws IOException { ); } else { InternalNested result = searchAndReduce( - newIndexSearcher(indexReader), // match root document only - new FieldExistsQuery(PRIMARY_TERM_NAME), - nested, - fieldType + new AggTestConfig(newIndexSearcher(indexReader), new FieldExistsQuery(PRIMARY_TERM_NAME), nested, fieldType) ); InternalMultiBucketAggregation terms = result.getAggregations().get("terms"); assertThat(terms.getBuckets().size(), equalTo(2)); @@ -565,7 +561,7 @@ private A executeTestCase(Query query, List terms = result.getAggregations().get("terms"); assertThat(terms.getBuckets().size(), equalTo(3)); for (MultiBucketsAggregation.Bucket bucket : terms.getBuckets()) { @@ -1421,11 +1421,13 @@ public void testWithNestedAggregations() throws IOException { try (IndexReader indexReader = wrapInMockESDirectoryReader(DirectoryReader.open(directory))) { { InternalNested result = searchAndReduce( - newSearcher(indexReader, false, true), // match root document only - new FieldExistsQuery(PRIMARY_TERM_NAME), - nested, - fieldType + new AggTestConfig( + newSearcher(indexReader, false, true), + new FieldExistsQuery(PRIMARY_TERM_NAME), + nested, + fieldType + ) ); InternalMultiBucketAggregation terms = result.getAggregations().get("terms"); assertNestedTopHitsScore(terms, withScore); @@ -1435,11 +1437,13 @@ public void testWithNestedAggregations() throws IOException { FilterAggregationBuilder filter = new FilterAggregationBuilder("filter", new MatchAllQueryBuilder()) .subAggregation(nested); InternalFilter result = searchAndReduce( - newSearcher(indexReader, false, true), // match root document only - new FieldExistsQuery(PRIMARY_TERM_NAME), - filter, - fieldType + new AggTestConfig( + newSearcher(indexReader, false, true), + new FieldExistsQuery(PRIMARY_TERM_NAME), + filter, + fieldType + ) ); InternalNested nestedResult = result.getAggregations().get("nested"); InternalMultiBucketAggregation terms = nestedResult.getAggregations().get("terms"); @@ -1472,12 +1476,14 @@ public void testHeisenpig() throws IOException { .order(BucketOrder.aggregation("nested>max_number", false)); try (IndexReader indexReader = wrapInMockESDirectoryReader(DirectoryReader.open(directory))) { StringTerms result = searchAndReduce( - newSearcher(indexReader, false, true), // match root document only - Queries.newNonNestedFilter(), - terms, - animalFieldType, - nestedFieldType + new AggTestConfig( + newSearcher(indexReader, false, true), + Queries.newNonNestedFilter(), + terms, + animalFieldType, + nestedFieldType + ) ); assertThat(result.getBuckets().get(0).getKeyAsString(), equalTo("pig")); assertThat(result.getBuckets().get(0).docCount, equalTo(1L)); @@ -1514,12 +1520,14 @@ public void testSortingWithNestedAggregations() throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("value", NumberFieldMapper.NumberType.LONG); try (IndexReader indexReader = wrapInMockESDirectoryReader(DirectoryReader.open(directory))) { LongTerms result = searchAndReduce( - newSearcher(indexReader, false, true), // match root document only - new FieldExistsQuery(PRIMARY_TERM_NAME), - terms, - fieldType, - nestedFieldType + new AggTestConfig( + newSearcher(indexReader, false, true), + new FieldExistsQuery(PRIMARY_TERM_NAME), + terms, + fieldType, + nestedFieldType + ) ); assertThat(result.getBuckets().get(0).term, equalTo(3L)); assertThat( @@ -1697,7 +1705,7 @@ private void threeLayerStringTestCase(String executionHint) throws IOException { .executionHint(executionHint) .subAggregation(new TermsAggregationBuilder("k").field("k").executionHint(executionHint)) ); - StringTerms result = searchAndReduce(searcher, new MatchAllDocsQuery(), request, ift, jft, kft); + StringTerms result = searchAndReduce(new AggTestConfig(searcher, request, ift, jft, kft)); for (int i = 0; i < 10; i++) { StringTerms.Bucket iBucket = result.getBucketByKey(Integer.toString(i)); assertThat(iBucket.getDocCount(), equalTo(100L)); @@ -1738,12 +1746,7 @@ public void testThreeLayerLong() throws IOException { new TermsAggregationBuilder("j").field("j").subAggregation(new TermsAggregationBuilder("k").field("k")) ); LongTerms result = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - request, - longField("i"), - longField("j"), - longField("k") + new AggTestConfig(searcher, request, longField("i"), longField("j"), longField("k")) ); for (int i = 0; i < 10; i++) { LongTerms.Bucket iBucket = result.getBucketByKey(Integer.toString(i)); @@ -1881,16 +1884,14 @@ public void testOrderByCardinality() throws IOException { IndexSearcher indexSearcher = newIndexSearcher(indexReader); LongTerms terms = searchAndReduce( - createIndexSettings(), - indexSearcher, - new MatchAllDocsQuery(), - aggregationBuilder, - Integer.MAX_VALUE, - false, - new NumberFieldMapper.NumberFieldType("a", NumberFieldMapper.NumberType.INTEGER), - bIsString - ? new KeywordFieldMapper.KeywordFieldType("b") - : new NumberFieldMapper.NumberFieldType("b", NumberFieldMapper.NumberType.INTEGER) + new AggTestConfig( + indexSearcher, + aggregationBuilder, + new NumberFieldMapper.NumberFieldType("a", NumberFieldMapper.NumberType.INTEGER), + bIsString + ? new KeywordFieldMapper.KeywordFieldType("b") + : new NumberFieldMapper.NumberFieldType("b", NumberFieldMapper.NumberType.INTEGER) + ).withSplitLeavesIntoSeperateAggregators(false).withMaxBuckets(Integer.MAX_VALUE) ); assertThat( terms.getBuckets().stream().map(MultiBucketsAggregation.Bucket::getKey).collect(toList()), diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsAggregatorTests.java index e8fd9aeefdc89..6b0aa31b7a225 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsAggregatorTests.java @@ -14,7 +14,6 @@ import org.apache.lucene.geo.GeoEncodingUtils; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; import org.elasticsearch.ElasticsearchParseException; @@ -45,7 +44,7 @@ public void testEmpty() throws Exception { MappedFieldType fieldType = new GeoPointFieldMapper.GeoPointFieldType("field"); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalGeoBounds bounds = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoBounds bounds = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertTrue(Double.isInfinite(bounds.top)); assertTrue(Double.isInfinite(bounds.bottom)); assertTrue(Double.isInfinite(bounds.posLeft)); @@ -70,7 +69,7 @@ public void testUnmappedFieldWithDocs() throws Exception { MappedFieldType fieldType = new GeoPointFieldMapper.GeoPointFieldType("field"); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalGeoBounds bounds = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoBounds bounds = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertTrue(Double.isInfinite(bounds.top)); assertTrue(Double.isInfinite(bounds.bottom)); assertTrue(Double.isInfinite(bounds.posLeft)); @@ -102,7 +101,7 @@ public void testMissing() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalGeoBounds bounds = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoBounds bounds = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertThat(bounds.top, equalTo(lat)); assertThat(bounds.bottom, equalTo(lat)); assertThat(bounds.posLeft, equalTo(lon >= 0 ? lon : Double.POSITIVE_INFINITY)); @@ -129,7 +128,7 @@ public void testInvalidMissing() throws Exception { IndexSearcher searcher = new IndexSearcher(reader); ElasticsearchParseException exception = expectThrows( ElasticsearchParseException.class, - () -> searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType) + () -> searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)) ); assertThat(exception.getMessage(), startsWith("unsupported symbol")); } @@ -177,7 +176,7 @@ public void testRandom() throws Exception { MappedFieldType fieldType = new GeoPointFieldMapper.GeoPointFieldType("field"); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalGeoBounds bounds = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoBounds bounds = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertThat(bounds.top, closeTo(top, GEOHASH_TOLERANCE)); assertThat(bounds.bottom, closeTo(bottom, GEOHASH_TOLERANCE)); assertThat(bounds.posLeft, closeTo(posLeft, GEOHASH_TOLERANCE)); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidAggregatorTests.java index a10310e13a20e..c3313f5dc3056 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidAggregatorTests.java @@ -12,7 +12,6 @@ import org.apache.lucene.geo.GeoEncodingUtils; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; import org.elasticsearch.common.geo.GeoPoint; @@ -40,7 +39,7 @@ public void testEmpty() throws Exception { MappedFieldType fieldType = new GeoPointFieldMapper.GeoPointFieldType("field"); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalGeoCentroid result = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoCentroid result = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertNull(result.centroid()); assertFalse(AggregationInspectionHelper.hasValue(result)); } @@ -58,11 +57,11 @@ public void testUnmapped() throws Exception { IndexSearcher searcher = new IndexSearcher(reader); MappedFieldType fieldType = new GeoPointFieldMapper.GeoPointFieldType("another_field"); - InternalGeoCentroid result = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoCentroid result = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertNull(result.centroid()); fieldType = new GeoPointFieldMapper.GeoPointFieldType("another_field"); - result = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + result = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertNull(result.centroid()); assertFalse(AggregationInspectionHelper.hasValue(result)); } @@ -85,7 +84,7 @@ public void testUnmappedWithMissing() throws Exception { IndexSearcher searcher = new IndexSearcher(reader); MappedFieldType fieldType = new GeoPointFieldMapper.GeoPointFieldType("another_field"); - InternalGeoCentroid result = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoCentroid result = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertEquals(result.centroid(), expectedCentroid); assertTrue(AggregationInspectionHelper.hasValue(result)); } @@ -150,7 +149,7 @@ private void assertCentroid(RandomIndexWriter w, GeoPoint expectedCentroid) thro GeoCentroidAggregationBuilder aggBuilder = new GeoCentroidAggregationBuilder("my_agg").field("field"); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalGeoCentroid result = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoCentroid result = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertEquals("my_agg", result.getName()); SpatialPoint centroid = result.centroid(); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksAggregatorTests.java index c41ee73378b7c..a95dba6376348 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksAggregatorTests.java @@ -13,7 +13,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiReader; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.NumericUtils; @@ -49,7 +48,7 @@ public void testEmpty() throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("field", NumberFieldMapper.NumberType.DOUBLE); try (IndexReader reader = new MultiReader()) { IndexSearcher searcher = new IndexSearcher(reader); - PercentileRanks ranks = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + PercentileRanks ranks = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); Percentile rank = ranks.iterator().next(); assertEquals(Double.NaN, rank.getPercent(), 0d); assertEquals(0.5, rank.getValue(), 0d); @@ -71,7 +70,7 @@ public void testSimple() throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("field", NumberFieldMapper.NumberType.DOUBLE); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - PercentileRanks ranks = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + PercentileRanks ranks = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); Iterator rankIterator = ranks.iterator(); Percentile rank = rankIterator.next(); assertEquals(0.1, rank.getValue(), 0d); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java index ef1855891ccaa..49e9f04d18284 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java @@ -385,7 +385,7 @@ public void testSingleValuedFieldPartiallyUnmapped() throws IOException { MultiReader multiReader = new MultiReader(indexReader, unamappedIndexReader); IndexSearcher indexSearcher = newSearcher(multiReader, true, true); - Min min = searchAndReduce(indexSearcher, new MatchAllDocsQuery(), aggregationBuilder, fieldType); + Min min = searchAndReduce(new AggTestConfig(indexSearcher, aggregationBuilder, fieldType)); assertEquals(2.0, min.value(), 0); assertTrue(AggregationInspectionHelper.hasValue(min)); } @@ -416,7 +416,7 @@ public void testSingleValuedFieldPartiallyUnmappedWithMissing() throws IOExcepti MultiReader multiReader = new MultiReader(indexReader, unamappedIndexReader); IndexSearcher indexSearcher = newSearcher(multiReader, true, true); - Min min = searchAndReduce(indexSearcher, new MatchAllDocsQuery(), aggregationBuilder, fieldType); + Min min = searchAndReduce(new AggTestConfig(indexSearcher, aggregationBuilder, fieldType)); assertEquals(-19.0, min.value(), 0); assertTrue(AggregationInspectionHelper.hasValue(min)); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java index aeb80232d87f5..6fd9c6ca1f334 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java @@ -289,9 +289,7 @@ public void testNoDocs() throws IOException { ScriptedMetricAggregationBuilder aggregationBuilder = new ScriptedMetricAggregationBuilder(AGG_NAME); aggregationBuilder.mapScript(MAP_SCRIPT).combineScript(COMBINE_SCRIPT_NOOP).reduceScript(REDUCE_SCRIPT); ScriptedMetric scriptedMetric = searchAndReduce( - newSearcher(indexReader, true, true), - new MatchAllDocsQuery(), - aggregationBuilder + new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder) ); assertEquals(AGG_NAME, scriptedMetric.getName()); assertNotNull(scriptedMetric.aggregation()); @@ -313,7 +311,7 @@ public void testScriptedMetricWithoutCombine() throws IOException { aggregationBuilder.initScript(INIT_SCRIPT).mapScript(MAP_SCRIPT).reduceScript(REDUCE_SCRIPT); IllegalArgumentException exception = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder) + () -> searchAndReduce(new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder)) ); assertEquals(exception.getMessage(), "[combineScript] must not be null: [scriptedMetric]"); } @@ -333,7 +331,7 @@ public void testScriptedMetricWithoutReduce() throws IOException { aggregationBuilder.initScript(INIT_SCRIPT).mapScript(MAP_SCRIPT).combineScript(COMBINE_SCRIPT); IllegalArgumentException exception = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder) + () -> searchAndReduce(new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder)) ); assertEquals(exception.getMessage(), "[reduceScript] must not be null: [scriptedMetric]"); } @@ -355,9 +353,7 @@ public void testScriptedMetricWithCombine() throws IOException { ScriptedMetricAggregationBuilder aggregationBuilder = new ScriptedMetricAggregationBuilder(AGG_NAME); aggregationBuilder.initScript(INIT_SCRIPT).mapScript(MAP_SCRIPT).combineScript(COMBINE_SCRIPT).reduceScript(REDUCE_SCRIPT); ScriptedMetric scriptedMetric = searchAndReduce( - newSearcher(indexReader, true, true), - new MatchAllDocsQuery(), - aggregationBuilder + new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder) ); assertEquals(AGG_NAME, scriptedMetric.getName()); assertNotNull(scriptedMetric.aggregation()); @@ -384,9 +380,7 @@ public void testScriptedMetricWithCombineAccessesScores() throws IOException { .combineScript(COMBINE_SCRIPT_SCORE) .reduceScript(REDUCE_SCRIPT); ScriptedMetric scriptedMetric = searchAndReduce( - newSearcher(indexReader, true, true), - new MatchAllDocsQuery(), - aggregationBuilder + new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder) ); assertEquals(AGG_NAME, scriptedMetric.getName()); assertNotNull(scriptedMetric.aggregation()); @@ -413,9 +407,7 @@ public void testScriptParamsPassedThrough() throws IOException { .combineScript(COMBINE_SCRIPT_PARAMS) .reduceScript(REDUCE_SCRIPT); ScriptedMetric scriptedMetric = searchAndReduce( - newSearcher(indexReader, true, true), - new MatchAllDocsQuery(), - aggregationBuilder + new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder) ); // The result value depends on the script params. @@ -444,10 +436,7 @@ public void testAggParamsPassedToReduceScript() throws IOException { .combineScript(COMBINE_SCRIPT_PARAMS) .reduceScript(REDUCE_SCRIPT_PARAMS); ScriptedMetric scriptedMetric = searchAndReduce( - newSearcher(indexReader, true, true), - new MatchAllDocsQuery(), - aggregationBuilder, - 0 + new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder).withMaxBuckets(0) ); // The result value depends on the script params. @@ -475,7 +464,7 @@ public void testConflictingAggAndScriptParams() throws IOException { IllegalArgumentException ex = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder) + () -> searchAndReduce(new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder)) ); assertEquals( "Parameter name \"" + CONFLICTING_PARAM_NAME + "\" used in both aggregation and script parameters", @@ -499,7 +488,7 @@ public void testSelfReferencingAggStateAfterInit() throws IOException { IllegalArgumentException ex = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder) + () -> searchAndReduce(new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder)) ); assertEquals("Iterable object is self-referencing itself (Scripted metric aggs init script)", ex.getMessage()); } @@ -523,7 +512,7 @@ public void testSelfReferencingAggStateAfterMap() throws IOException { IllegalArgumentException ex = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder) + () -> searchAndReduce(new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder)) ); assertEquals("Iterable object is self-referencing itself (Scripted metric aggs map script)", ex.getMessage()); } @@ -544,7 +533,7 @@ public void testSelfReferencingAggStateAfterCombine() throws IOException { IllegalArgumentException ex = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder) + () -> searchAndReduce(new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder)) ); assertEquals("Iterable object is self-referencing itself (Scripted metric aggs combine script)", ex.getMessage()); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java index 99215ba755bdb..dac1f0bd25f65 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java @@ -223,7 +223,7 @@ public void testPartiallyUnmapped() throws IOException { ) { final IndexSearcher searcher = new IndexSearcher(multiReader); - final InternalStats stats = searchAndReduce(searcher, new MatchAllDocsQuery(), builder, ft); + final InternalStats stats = searchAndReduce(new AggTestConfig(searcher, builder, ft)); assertEquals(expected.count, stats.getCount(), 0); assertEquals(expected.sum, stats.getSum(), TOLERANCE); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java index cbb6a292fc662..301d0a6c5297e 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java @@ -241,7 +241,7 @@ public void testPartiallyUnmapped() throws IOException { final IndexSearcher searcher = newSearcher(multiReader, true, true); - final Sum internalSum = searchAndReduce(searcher, new MatchAllDocsQuery(), builder, fieldType); + final Sum internalSum = searchAndReduce(new AggTestConfig(searcher, builder, fieldType)); assertEquals(sum, internalSum.value(), 0d); assertTrue(AggregationInspectionHelper.hasValue(internalSum)); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksAggregatorTests.java index f77567d462589..991ef23549577 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksAggregatorTests.java @@ -13,7 +13,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiReader; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; import org.apache.lucene.util.NumericUtils; @@ -49,7 +48,7 @@ public void testEmpty() throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("field", NumberFieldMapper.NumberType.DOUBLE); try (IndexReader reader = new MultiReader()) { IndexSearcher searcher = new IndexSearcher(reader); - PercentileRanks ranks = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + PercentileRanks ranks = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); Percentile rank = ranks.iterator().next(); assertEquals(Double.NaN, rank.getPercent(), 0d); assertEquals(0.5, rank.getValue(), 0d); @@ -71,7 +70,7 @@ public void testSimple() throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("field", NumberFieldMapper.NumberType.DOUBLE); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - PercentileRanks ranks = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + PercentileRanks ranks = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); Iterator rankIterator = ranks.iterator(); Percentile rank = rankIterator.next(); assertEquals(0.1, rank.getValue(), 0d); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregatorTests.java index 98c9d0ffe0472..4baec1b5d9e88 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregatorTests.java @@ -130,7 +130,7 @@ private Aggregation testCase(Query query, AggregationBuilder builder) throws IOE // We do not use LuceneTestCase.newSearcher because we need a DirectoryReader for "testInsideTerms" IndexSearcher indexSearcher = new IndexSearcher(indexReader); - Aggregation result = searchAndReduce(indexSearcher, query, builder, STRING_FIELD_TYPE); + Aggregation result = searchAndReduce(new AggTestConfig(indexSearcher, query, builder, STRING_FIELD_TYPE)); indexReader.close(); directory.close(); return result; @@ -185,7 +185,7 @@ public void testSetScorer() throws Exception { .add(new TermQuery(new Term("string", "baz")), Occur.SHOULD) .build(); AggregationBuilder agg = AggregationBuilders.topHits("top_hits"); - TopHits result = searchAndReduce(searcher, query, agg, STRING_FIELD_TYPE); + TopHits result = searchAndReduce(new AggTestConfig(searcher, query, agg, STRING_FIELD_TYPE)); assertEquals(3, result.getHits().getTotalHits().value); reader.close(); directory.close(); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketAggregatorTests.java index e7c657861861d..03eed8c0ed12b 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketAggregatorTests.java @@ -111,8 +111,12 @@ public void testSameAggNames() throws IOException { MappedFieldType valueFieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD, NumberFieldMapper.NumberType.LONG); - avgResult = searchAndReduce(indexSearcher, query, avgBuilder, 10000, new MappedFieldType[] { fieldType, valueFieldType }); - histogramResult = searchAndReduce(indexSearcher, query, histo, 10000, new MappedFieldType[] { fieldType, valueFieldType }); + avgResult = searchAndReduce( + new AggTestConfig(indexSearcher, query, avgBuilder, fieldType, valueFieldType).withMaxBuckets(10000) + ); + histogramResult = searchAndReduce( + new AggTestConfig(indexSearcher, query, histo, fieldType, valueFieldType).withMaxBuckets(10000) + ); } // Finally, reduce the pipeline agg @@ -167,10 +171,12 @@ public void testComplicatedBucketPath() throws IOException { MappedFieldType keywordField = keywordField(textField); filterResult = searchAndReduce( - indexSearcher, - query, - filterAggregationBuilder, - new MappedFieldType[] { fieldType, valueFieldType, keywordField } + new AggTestConfig( + indexSearcher, + query, + filterAggregationBuilder, + new MappedFieldType[] { fieldType, valueFieldType, keywordField } + ) ); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptAggregatorTests.java index 4c065d864329b..9977fdde3c1ec 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptAggregatorTests.java @@ -113,7 +113,7 @@ private void testCase( IndexSearcher indexSearcher = newIndexSearcher(indexReader); InternalFilters filters; - filters = searchAndReduce(indexSearcher, query, aggregationBuilder, fieldType); + filters = searchAndReduce(new AggTestConfig(indexSearcher, query, aggregationBuilder, fieldType)); verify.accept(filters); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumAggregatorTests.java index f99f79d19e147..686e34a48277d 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumAggregatorTests.java @@ -312,7 +312,9 @@ private void executeTestCase( MappedFieldType valueFieldType = new NumberFieldMapper.NumberFieldType("value_field", NumberFieldMapper.NumberType.LONG); InternalAggregation histogram; - histogram = searchAndReduce(indexSearcher, query, aggBuilder, new MappedFieldType[] { fieldType, valueFieldType }); + histogram = searchAndReduce( + new AggTestConfig(indexSearcher, query, aggBuilder, new MappedFieldType[] { fieldType, valueFieldType }) + ); verify.accept(histogram); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeAggregatorTests.java index 15802181e25b6..427007b22ce9b 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeAggregatorTests.java @@ -660,7 +660,7 @@ public void testDerivDerivNPE() throws IOException { try (IndexReader indexReader = DirectoryReader.open(directory)) { IndexSearcher indexSearcher = newSearcher(indexReader, true, true); - searchAndReduce(indexSearcher, query, aggBuilder); + searchAndReduce(new AggTestConfig(indexSearcher, query, aggBuilder)); } } } @@ -715,7 +715,9 @@ private void executeTestCase( DateFieldMapper.DateFieldType fieldType = new DateFieldMapper.DateFieldType(SINGLE_VALUED_FIELD_NAME); MappedFieldType valueFieldType = new NumberFieldMapper.NumberFieldType("value_field", NumberFieldMapper.NumberType.LONG); - InternalAggregation histogram = searchAndReduce(indexSearcher, query, aggBuilder, fieldType, valueFieldType); + InternalAggregation histogram = searchAndReduce( + new AggTestConfig(indexSearcher, query, aggBuilder, fieldType, valueFieldType) + ); verify.accept(histogram); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/MovFnAggrgatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/MovFnAggrgatorTests.java index 478349225b885..634e8351e5135 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/MovFnAggrgatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/MovFnAggrgatorTests.java @@ -137,7 +137,9 @@ private void executeTestCase(Query query, DateHistogramAggregationBuilder aggBui MappedFieldType valueFieldType = new NumberFieldMapper.NumberFieldType("value_field", NumberFieldMapper.NumberType.LONG); InternalDateHistogram histogram; - histogram = searchAndReduce(indexSearcher, query, aggBuilder, 1000, new MappedFieldType[] { fieldType, valueFieldType }); + histogram = searchAndReduce( + new AggTestConfig(indexSearcher, query, aggBuilder, fieldType, valueFieldType).withMaxBuckets(1000) + ); verify.accept(histogram); } } diff --git a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java index 4b3010c282f95..e8f13d4afae9c 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java @@ -428,35 +428,6 @@ protected ScriptService getMockScriptService() { return null; } - protected A searchAndReduce( - IndexSearcher searcher, - Query query, - AggregationBuilder builder, - MappedFieldType... fieldTypes - ) throws IOException { - return searchAndReduce(createIndexSettings(), searcher, query, builder, DEFAULT_MAX_BUCKETS, fieldTypes); - } - - protected A searchAndReduce( - IndexSettings indexSettings, - IndexSearcher searcher, - Query query, - AggregationBuilder builder, - MappedFieldType... fieldTypes - ) throws IOException { - return searchAndReduce(indexSettings, searcher, query, builder, DEFAULT_MAX_BUCKETS, fieldTypes); - } - - protected A searchAndReduce( - IndexSearcher searcher, - Query query, - AggregationBuilder builder, - int maxBucket, - MappedFieldType... fieldTypes - ) throws IOException { - return searchAndReduce(createIndexSettings(), searcher, query, builder, maxBucket, fieldTypes); - } - /** * Collects all documents that match the provided query {@link Query} and * returns the reduced {@link InternalAggregation}. @@ -464,51 +435,24 @@ protected A searchAndReduc * Half the time it aggregates each leaf individually and reduces all * results together. The other half the time it aggregates across the entire * index at once and runs a final reduction on the single resulting agg. - */ - protected A searchAndReduce( - IndexSettings indexSettings, - IndexSearcher searcher, - Query query, - AggregationBuilder builder, - int maxBucket, - MappedFieldType... fieldTypes - ) throws IOException { - return searchAndReduce(indexSettings, searcher, query, builder, maxBucket, randomBoolean(), fieldTypes); - } - - /** - * Collects all documents that match the provided query {@link Query} and - * returns the reduced {@link InternalAggregation}. - * * It runs the aggregation as well using a circuit breaker that randomly throws {@link CircuitBreakingException} * in order to mak sure the implementation does not leak. - * - * @param splitLeavesIntoSeparateAggregators If true this creates a new {@link Aggregator} - * for each leaf as though it were a separate index. If false this aggregates - * all leaves together, like we do in production. */ - protected A searchAndReduce( - IndexSettings indexSettings, - IndexSearcher searcher, - Query query, - AggregationBuilder builder, - int maxBucket, - boolean splitLeavesIntoSeparateAggregators, - MappedFieldType... fieldTypes - ) throws IOException { + protected A searchAndReduce(AggTestConfig aggTestConfig) throws IOException { + IndexSettings indexSettings = createIndexSettings(); // First run it to find circuit breaker leaks on the aggregator CircuitBreakerService crankyService = new CrankyCircuitBreakerService(); for (int i = 0; i < 5; i++) { try { searchAndReduce( indexSettings, - searcher, - query, - builder, - maxBucket, - splitLeavesIntoSeparateAggregators, + aggTestConfig.searcher(), + aggTestConfig.query(), + aggTestConfig.builder(), + aggTestConfig.maxBuckets(), + aggTestConfig.splitLeavesIntoSeparateAggregators(), crankyService, - fieldTypes + aggTestConfig.fieldTypes() ); } catch (CircuitBreakingException e) { // expected @@ -520,13 +464,13 @@ protected A searchAndReduc CircuitBreakerService breakerService = new NoneCircuitBreakerService(); return searchAndReduce( indexSettings, - searcher, - query, - builder, - maxBucket, - splitLeavesIntoSeparateAggregators, + aggTestConfig.searcher(), + aggTestConfig.query(), + aggTestConfig.builder(), + aggTestConfig.maxBuckets(), + aggTestConfig.splitLeavesIntoSeparateAggregators(), breakerService, - fieldTypes + aggTestConfig.fieldTypes() ); } @@ -672,7 +616,7 @@ protected void tes try (DirectoryReader unwrapped = DirectoryReader.open(directory); IndexReader indexReader = wrapDirectoryReader(unwrapped)) { IndexSearcher indexSearcher = newIndexSearcher(indexReader); - V agg = searchAndReduce(indexSearcher, query, aggregationBuilder, fieldTypes); + V agg = searchAndReduce(new AggTestConfig(indexSearcher, query, aggregationBuilder, fieldTypes)); verify.accept(agg); verifyOutputFieldNames(aggregationBuilder, agg); @@ -1010,10 +954,7 @@ public void testSupportedFieldTypes() throws IOException { AssertionError failure = null; try { InternalAggregation internalAggregation = searchAndReduce( - indexSearcher, - new MatchAllDocsQuery(), - aggregationBuilder, - fieldType + new AggTestConfig(indexSearcher, new MatchAllDocsQuery(), aggregationBuilder, fieldType) ); // We should make sure if the builder says it supports sampling, that the internal aggregations returned override // finalizeSampling @@ -1473,4 +1414,33 @@ public CircuitBreakerStats stats(String name) { return new CircuitBreakerStats(CircuitBreaker.FIELDDATA, -1, -1, 0, 0); } } + + public record AggTestConfig( + IndexSearcher searcher, + Query query, + AggregationBuilder builder, + int maxBuckets, + boolean splitLeavesIntoSeparateAggregators, + MappedFieldType... fieldTypes + ) { + public AggTestConfig(IndexSearcher searcher, AggregationBuilder builder, MappedFieldType... fieldTypes) { + this(searcher, new MatchAllDocsQuery(), builder, DEFAULT_MAX_BUCKETS, randomBoolean(), fieldTypes); + } + + public AggTestConfig(IndexSearcher searcher, Query query, AggregationBuilder builder, MappedFieldType... fieldTypes) { + this(searcher, query, builder, DEFAULT_MAX_BUCKETS, randomBoolean(), fieldTypes); + } + + public AggTestConfig withQuery(Query query) { + return new AggTestConfig(searcher, query, builder, maxBuckets, splitLeavesIntoSeparateAggregators, fieldTypes); + } + + public AggTestConfig withSplitLeavesIntoSeperateAggregators(boolean splitLeavesIntoSeparateAggregators) { + return new AggTestConfig(searcher, query, builder, maxBuckets, splitLeavesIntoSeparateAggregators, fieldTypes); + } + + public AggTestConfig withMaxBuckets(int maxBuckets) { + return new AggTestConfig(searcher, query, builder, maxBuckets, splitLeavesIntoSeparateAggregators, fieldTypes); + } + } } diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/bucket/histogram/HistoBackedHistogramAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/bucket/histogram/HistoBackedHistogramAggregatorTests.java index 4f1742450e924..bc21a740f37af 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/bucket/histogram/HistoBackedHistogramAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/bucket/histogram/HistoBackedHistogramAggregatorTests.java @@ -9,7 +9,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; import org.elasticsearch.index.mapper.CustomTermFreqField; @@ -44,7 +43,7 @@ public void testHistograms() throws Exception { HistogramAggregationBuilder aggBuilder = new HistogramAggregationBuilder("my_agg").field(FIELD_NAME).interval(5); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME)); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, defaultFieldType(FIELD_NAME))); assertEquals(9, histogram.getBuckets().size()); assertEquals(-10d, histogram.getBuckets().get(0).getKey()); assertEquals(1, histogram.getBuckets().get(0).getDocCount()); @@ -78,7 +77,7 @@ public void testMinDocCount() throws Exception { HistogramAggregationBuilder aggBuilder = new HistogramAggregationBuilder("my_agg").field(FIELD_NAME).interval(5).minDocCount(2); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME)); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, defaultFieldType(FIELD_NAME))); assertEquals(4, histogram.getBuckets().size()); assertEquals(0d, histogram.getBuckets().get(0).getKey()); assertEquals(3, histogram.getBuckets().get(0).getDocCount()); @@ -107,7 +106,7 @@ public void testHistogramWithDocCountField() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME)); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, defaultFieldType(FIELD_NAME))); assertTrue(AggregationInspectionHelper.hasValue(histogram)); assertEquals(8, histogram.getBuckets().get(0).getDocCount()); } @@ -129,7 +128,7 @@ public void testRandomOffset() throws Exception { .minDocCount(1); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME)); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, defaultFieldType(FIELD_NAME))); assertEquals(3, histogram.getBuckets().size()); assertEquals(-10 + expectedOffset, histogram.getBuckets().get(0).getKey()); @@ -157,7 +156,7 @@ public void testExtendedBounds() throws Exception { .extendedBounds(-12, 13); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME)); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, defaultFieldType(FIELD_NAME))); assertEquals(6, histogram.getBuckets().size()); assertEquals(-15d, histogram.getBuckets().get(0).getKey()); assertEquals(0, histogram.getBuckets().get(0).getDocCount()); @@ -189,7 +188,7 @@ public void testHardBounds() throws Exception { .hardBounds(new DoubleBounds(0.0, 5.0)); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME)); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, defaultFieldType(FIELD_NAME))); assertEquals(1, histogram.getBuckets().size()); assertEquals(0d, histogram.getBuckets().get(0).getKey()); assertEquals(4, histogram.getBuckets().get(0).getDocCount()); @@ -216,7 +215,7 @@ public void testSubAggs() throws Exception { IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME)) + () -> searchAndReduce(new AggTestConfig(searcher, aggBuilder, defaultFieldType(FIELD_NAME))) ); assertEquals("Histogram aggregation on histogram fields does not support sub-aggregations", e.getMessage()); diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/bucket/range/HistoBackedRangeAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/bucket/range/HistoBackedRangeAggregatorTests.java index cdf68e78019ea..b4f4abff525cd 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/bucket/range/HistoBackedRangeAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/bucket/range/HistoBackedRangeAggregatorTests.java @@ -10,7 +10,6 @@ import org.apache.lucene.document.DoubleDocValuesField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; import org.elasticsearch.index.mapper.CustomTermFreqField; @@ -68,16 +67,10 @@ public void testPercentilesAccuracy() throws Exception { RangeAggregationBuilder rawFieldAgg = new RangeAggregationBuilder("my_agg").field(RAW_FIELD_NAME); Percentiles rawPercentileResults = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - rawPercentiles, - defaultFieldType(RAW_FIELD_NAME) + new AggTestConfig(searcher, rawPercentiles, defaultFieldType(RAW_FIELD_NAME)) ); Percentiles aggregatedPercentileResults = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggregatedPercentiles, - defaultFieldType(HISTO_FIELD_NAME) + new AggTestConfig(searcher, aggregatedPercentiles, defaultFieldType(HISTO_FIELD_NAME)) ); aggBuilder.addUnboundedTo(aggregatedPercentileResults.percentile(steps[0])); rawFieldAgg.addUnboundedTo(rawPercentileResults.percentile(steps[0])); @@ -93,16 +86,10 @@ public void testPercentilesAccuracy() throws Exception { rawFieldAgg.addUnboundedFrom(rawPercentileResults.percentile(steps[steps.length - 1])); InternalRange range = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggBuilder, - defaultFieldType(HISTO_FIELD_NAME) + new AggTestConfig(searcher, aggBuilder, defaultFieldType(HISTO_FIELD_NAME)) ); InternalRange rawRange = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - rawFieldAgg, - defaultFieldType(RAW_FIELD_NAME) + new AggTestConfig(searcher, rawFieldAgg, defaultFieldType(RAW_FIELD_NAME)) ); for (int j = 0; j < rawRange.getBuckets().size(); j++) { absError += Math.abs(range.getBuckets().get(j).getDocCount() - rawRange.getBuckets().get(j).getDocCount()); @@ -185,16 +172,10 @@ private void testRanges(List ranges, String name) throws }); InternalRange range = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggBuilder, - defaultFieldType(HISTO_FIELD_NAME) + new AggTestConfig(searcher, aggBuilder, defaultFieldType(HISTO_FIELD_NAME)) ); InternalRange rawRange = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - rawFieldAgg, - defaultFieldType(RAW_FIELD_NAME) + new AggTestConfig(searcher, rawFieldAgg, defaultFieldType(RAW_FIELD_NAME)) ); for (int j = 0; j < rawRange.getBuckets().size(); j++) { absError += Math.abs(range.getBuckets().get(j).getDocCount() - rawRange.getBuckets().get(j).getDocCount()); @@ -238,10 +219,7 @@ public void testOverlapping() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); InternalRange range = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggBuilder, - defaultFieldType(HISTO_FIELD_NAME) + new AggTestConfig(searcher, aggBuilder, defaultFieldType(HISTO_FIELD_NAME)) ); assertTrue(AggregationInspectionHelper.hasValue(range)); assertEquals(7, range.getBuckets().size()); @@ -300,10 +278,7 @@ public void testNonOverlapping() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); InternalRange range = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggBuilder, - defaultFieldType(HISTO_FIELD_NAME) + new AggTestConfig(searcher, aggBuilder, defaultFieldType(HISTO_FIELD_NAME)) ); assertTrue(AggregationInspectionHelper.hasValue(range)); assertEquals(4, range.getBuckets().size()); @@ -336,7 +311,7 @@ public void testSubAggs() throws Exception { IndexSearcher searcher = new IndexSearcher(reader); IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME)) + () -> searchAndReduce(new AggTestConfig(searcher, aggBuilder, defaultFieldType(HISTO_FIELD_NAME))) ); assertEquals("Range aggregation on histogram fields does not support sub-aggregations", e.getMessage()); } diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HDRPreAggregatedPercentileRanksAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HDRPreAggregatedPercentileRanksAggregatorTests.java index 0660702c931e1..f4bcf8eb07580 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HDRPreAggregatedPercentileRanksAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HDRPreAggregatedPercentileRanksAggregatorTests.java @@ -12,7 +12,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; import org.elasticsearch.common.io.stream.BytesStreamOutput; @@ -93,7 +92,7 @@ public void testSimple() throws IOException { MappedFieldType fieldType = new HistogramFieldMapper.HistogramFieldType("field", Collections.emptyMap()); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - PercentileRanks ranks = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + PercentileRanks ranks = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); Iterator rankIterator = ranks.iterator(); Percentile rank = rankIterator.next(); assertEquals(0.1, rank.getValue(), 0d); diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/TDigestPreAggregatedPercentileRanksAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/TDigestPreAggregatedPercentileRanksAggregatorTests.java index b99ca2011c275..404560d41dcad 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/TDigestPreAggregatedPercentileRanksAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/TDigestPreAggregatedPercentileRanksAggregatorTests.java @@ -9,7 +9,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; import org.elasticsearch.index.mapper.MappedFieldType; @@ -73,7 +72,7 @@ public void testSimple() throws IOException { MappedFieldType fieldType = new HistogramFieldMapper.HistogramFieldType("field", Collections.emptyMap()); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - PercentileRanks ranks = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + PercentileRanks ranks = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); Iterator rankIterator = ranks.iterator(); Percentile rank = rankIterator.next(); assertEquals(0.1, rank.getValue(), 0d); diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/cumulativecardinality/CumulativeCardinalityAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/cumulativecardinality/CumulativeCardinalityAggregatorTests.java index 6dd235ab6a2a8..81907d7d11352 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/cumulativecardinality/CumulativeCardinalityAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/cumulativecardinality/CumulativeCardinalityAggregatorTests.java @@ -157,7 +157,7 @@ private void executeTestCase( MappedFieldType valueFieldType = new NumberFieldMapper.NumberFieldType("value_field", NumberFieldMapper.NumberType.LONG); InternalAggregation histogram; - histogram = searchAndReduce(indexSearcher, query, aggBuilder, fieldType, valueFieldType); + histogram = searchAndReduce(new AggTestConfig(indexSearcher, query, aggBuilder, fieldType, valueFieldType)); verify.accept(histogram); } } diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesHDRAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesHDRAggregatorTests.java index 0452e3b073294..8b87c2a41d297 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesHDRAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesHDRAggregatorTests.java @@ -70,7 +70,9 @@ protected void executeTestCase(int window, int shift, Query query, DateHistogram MappedFieldType valueFieldType = new NumberFieldMapper.NumberFieldType("value_field", NumberFieldMapper.NumberType.DOUBLE); InternalDateHistogram histogram; - histogram = searchAndReduce(indexSearcher, query, aggBuilder, 1000, new MappedFieldType[] { fieldType, valueFieldType }); + histogram = searchAndReduce( + new AggTestConfig(indexSearcher, query, aggBuilder, fieldType, valueFieldType).withMaxBuckets(1000) + ); for (int i = 0; i < histogram.getBuckets().size(); i++) { InternalDateHistogram.Bucket bucket = histogram.getBuckets().get(i); InternalHDRPercentiles values = bucket.getAggregations().get("MovingPercentiles"); diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesTDigestAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesTDigestAggregatorTests.java index 060ff07905cf4..d4b6cc7851047 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesTDigestAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesTDigestAggregatorTests.java @@ -70,7 +70,9 @@ protected void executeTestCase(int window, int shift, Query query, DateHistogram MappedFieldType valueFieldType = new NumberFieldMapper.NumberFieldType("value_field", NumberFieldMapper.NumberType.DOUBLE); InternalDateHistogram histogram; - histogram = searchAndReduce(indexSearcher, query, aggBuilder, 1000, new MappedFieldType[] { fieldType, valueFieldType }); + histogram = searchAndReduce( + new AggTestConfig(indexSearcher, query, aggBuilder, fieldType, valueFieldType).withMaxBuckets(1000) + ); for (int i = 0; i < histogram.getBuckets().size(); i++) { InternalDateHistogram.Bucket bucket = histogram.getBuckets().get(i); InternalTDigestPercentiles values = bucket.getAggregations().get("MovingPercentiles"); diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/normalize/NormalizeAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/normalize/NormalizeAggregatorTests.java index 571a4b48343f0..713491634c641 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/normalize/NormalizeAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/normalize/NormalizeAggregatorTests.java @@ -164,12 +164,7 @@ private void testCase(ValuesSourceAggregationBuilder aggBuilder, Consumer CompositeAggregation result = null; try { - result = searchAndReduce(searcher, query, aggBuilder, fieldTypes); + result = searchAndReduce(new AggTestConfig(searcher, query, aggBuilder, fieldTypes)); } catch (IOException e) { listener.onFailure(e); } diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/GeoLineAggregatorTests.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/GeoLineAggregatorTests.java index fb19a481a69d2..c8bbfe8fd1e8c 100644 --- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/GeoLineAggregatorTests.java +++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/GeoLineAggregatorTests.java @@ -411,14 +411,7 @@ private void testCase( MappedFieldType groupFieldType = new KeywordFieldMapper.KeywordFieldType("group_id", false, true, Collections.emptyMap()); MappedFieldType fieldType2 = new NumberFieldMapper.NumberFieldType("sort_field", fieldNumberType); - Terms terms = searchAndReduce( - indexSearcher, - new MatchAllDocsQuery(), - aggregationBuilder, - fieldType, - fieldType2, - groupFieldType - ); + Terms terms = searchAndReduce(new AggTestConfig(indexSearcher, aggregationBuilder, fieldType, fieldType2, groupFieldType)); verify.accept(terms); } finally { indexReader.close(); diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/GeoShapeBoundsAggregatorTests.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/GeoShapeBoundsAggregatorTests.java index 8db7c84a976be..060ad9917a81b 100644 --- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/GeoShapeBoundsAggregatorTests.java +++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/GeoShapeBoundsAggregatorTests.java @@ -13,7 +13,6 @@ import org.apache.lucene.geo.GeoEncodingUtils; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; import org.elasticsearch.common.geo.Orientation; @@ -66,7 +65,7 @@ public void testEmpty() throws Exception { ); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalGeoBounds bounds = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoBounds bounds = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertTrue(Double.isInfinite(bounds.top)); assertTrue(Double.isInfinite(bounds.bottom)); assertTrue(Double.isInfinite(bounds.posLeft)); @@ -99,7 +98,7 @@ public void testUnmappedFieldWithDocs() throws Exception { ); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalGeoBounds bounds = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoBounds bounds = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertTrue(Double.isInfinite(bounds.top)); assertTrue(Double.isInfinite(bounds.bottom)); assertTrue(Double.isInfinite(bounds.posLeft)); @@ -138,7 +137,7 @@ public void testMissing() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalGeoBounds bounds = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoBounds bounds = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertThat(bounds.top, equalTo(lat)); assertThat(bounds.bottom, equalTo(lat)); assertThat(bounds.posLeft, equalTo(lon >= 0 ? lon : Double.POSITIVE_INFINITY)); @@ -172,7 +171,7 @@ public void testInvalidMissing() throws Exception { IndexSearcher searcher = new IndexSearcher(reader); IllegalArgumentException exception = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType) + () -> searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)) ); assertThat(exception.getMessage(), startsWith("Unknown geometry type")); } @@ -231,7 +230,7 @@ public void testRandomShapes() throws Exception { ); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalGeoBounds bounds = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoBounds bounds = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertThat(bounds.top, closeTo(top, GEOHASH_TOLERANCE)); assertThat(bounds.bottom, closeTo(bottom, GEOHASH_TOLERANCE)); assertThat(bounds.posLeft, closeTo(posLeft, GEOHASH_TOLERANCE)); diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/GeoShapeCentroidAggregatorTests.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/GeoShapeCentroidAggregatorTests.java index e512276d0ae63..aa65e4a986875 100644 --- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/GeoShapeCentroidAggregatorTests.java +++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/search/aggregations/metrics/GeoShapeCentroidAggregatorTests.java @@ -12,7 +12,6 @@ import org.apache.lucene.geo.GeoEncodingUtils; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.tests.index.RandomIndexWriter; import org.elasticsearch.common.geo.GeoPoint; @@ -71,7 +70,7 @@ public void testEmpty() throws Exception { ); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalGeoCentroid result = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoCentroid result = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertNull(result.centroid()); assertFalse(AggregationInspectionHelper.hasValue(result)); } @@ -97,11 +96,11 @@ public void testUnmapped() throws Exception { null, Collections.emptyMap() ); - InternalGeoCentroid result = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoCentroid result = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertNull(result.centroid()); fieldType = new GeoShapeWithDocValuesFieldType("field", true, true, Orientation.RIGHT, null, null, Collections.emptyMap()); - result = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + result = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertNull(result.centroid()); assertFalse(AggregationInspectionHelper.hasValue(result)); } @@ -131,7 +130,7 @@ public void testUnmappedWithMissing() throws Exception { null, Collections.emptyMap() ); - InternalGeoCentroid result = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoCentroid result = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertThat(result.centroid(), equalTo(expectedCentroid)); assertTrue(AggregationInspectionHelper.hasValue(result)); } @@ -208,7 +207,7 @@ private void assertCentroid(RandomIndexWriter w, GeoPoint expectedCentroid) thro GeoCentroidAggregationBuilder aggBuilder = new GeoCentroidAggregationBuilder("my_agg").field("field"); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalGeoCentroid result = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoCentroid result = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertEquals("my_agg", result.getName()); SpatialPoint centroid = result.centroid();