From 8c97e8940fa56ee828d09a23e4864beae00a4a04 Mon Sep 17 00:00:00 2001 From: Mark Tozzi Date: Mon, 19 Sep 2022 15:08:08 -0400 Subject: [PATCH 01/13] introduce parameter object --- .../stats/MatrixStatsAggregatorTests.java | 7 +- .../ChildrenToParentAggregatorTests.java | 7 +- .../ParentToChildrenAggregatorTests.java | 21 +--- .../bucket/filter/FilterAggregatorTests.java | 5 +- .../bucket/filter/FiltersAggregatorTests.java | 16 +--- .../AutoDateHistogramAggregatorTests.java | 12 +-- .../DateRangeHistogramAggregatorTests.java | 3 +- .../NumericHistogramAggregatorTests.java | 43 ++++++--- .../RangeHistogramAggregatorTests.java | 43 ++------- ...VariableWidthHistogramAggregatorTests.java | 5 +- .../missing/MissingAggregatorTests.java | 3 +- .../bucket/nested/NestedAggregatorTests.java | 69 +++++-------- .../nested/ReverseNestedAggregatorTests.java | 17 +++- .../range/DateRangeAggregatorTests.java | 10 +- .../bucket/range/IpRangeAggregatorTests.java | 10 +- .../sampler/DiversifiedSamplerTests.java | 7 +- .../sampler/SamplerAggregatorTests.java | 15 +-- .../terms/BinaryTermsAggregatorTests.java | 5 +- .../terms/KeywordTermsAggregatorTests.java | 5 +- .../terms/NumericTermsAggregatorTests.java | 5 +- .../terms/RareTermsAggregatorTests.java | 35 +++---- .../SignificantTermsAggregatorTests.java | 96 +++++++++++-------- .../terms/SignificantTextAggregatorTests.java | 40 +++++--- .../bucket/terms/TermsAggregatorTests.java | 58 ++++++----- .../metrics/GeoBoundsAggregatorTests.java | 11 ++- .../metrics/GeoCentroidAggregatorTests.java | 11 ++- .../HDRPercentileRanksAggregatorTests.java | 5 +- .../metrics/MinAggregatorTests.java | 5 +- .../ScriptedMetricAggregatorTests.java | 41 ++++---- .../metrics/StatsAggregatorTests.java | 3 +- .../metrics/SumAggregatorTests.java | 3 +- ...TDigestPercentileRanksAggregatorTests.java | 5 +- .../metrics/TopHitsAggregatorTests.java | 9 +- .../pipeline/AvgBucketAggregatorTests.java | 15 ++- .../pipeline/BucketScriptAggregatorTests.java | 3 +- .../CumulativeSumAggregatorTests.java | 5 +- .../pipeline/DerivativeAggregatorTests.java | 7 +- .../search/aggregations/AggTestConfig.java | 17 ++++ .../aggregations/AggregatorTestCase.java | 16 +--- .../HistoBackedHistogramAggregatorTests.java | 15 +-- .../HistoBackedRangeAggregatorTests.java | 51 ++-------- ...regatedPercentileRanksAggregatorTests.java | 3 +- ...regatedPercentileRanksAggregatorTests.java | 3 +- .../CumulativeCardinalityAggregatorTests.java | 7 +- .../normalize/NormalizeAggregatorTests.java | 8 +- .../topmetrics/TopMetricsAggregatorTests.java | 3 +- .../job/RollupIndexerIndexingTests.java | 3 +- .../aggregations/GeoLineAggregatorTests.java | 8 +- .../GeoShapeBoundsAggregatorTests.java | 11 ++- .../GeoShapeCentroidAggregatorTests.java | 11 ++- 50 files changed, 397 insertions(+), 419 deletions(-) create mode 100644 test/framework/src/main/java/org/elasticsearch/search/aggregations/AggTestConfig.java 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..2596e8802af8c 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 @@ -20,6 +20,7 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.matrix.MatrixAggregationPlugin; @@ -41,7 +42,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, new MatchAllDocsQuery(), aggBuilder, ft)); assertNull(stats.getStats()); assertEquals(0L, stats.getDocCount()); } @@ -60,7 +61,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, new MatchAllDocsQuery(), aggBuilder, ft)); assertNull(stats.getStats()); assertEquals(0L, stats.getDocCount()); } @@ -95,7 +96,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, new MatchAllDocsQuery(), 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..f4cdd30d01fa5 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 @@ -34,6 +34,7 @@ import org.elasticsearch.join.mapper.ParentIdFieldMapper; import org.elasticsearch.join.mapper.ParentJoinFieldMapper; import org.elasticsearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; @@ -268,7 +269,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( e.getMessage(), @@ -239,11 +232,7 @@ 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"); TopHits topHits = terms.getBuckets().get(0).getAggregations().get("_name3"); @@ -312,7 +301,7 @@ private void testCase(Query query, IndexSearcher indexSearcher, Consumer 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..0a9f5be3257af 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 @@ -61,6 +61,7 @@ import org.elasticsearch.index.query.SearchExecutionContext; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.shard.ShardId; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationExecutionContext; import org.elasticsearch.search.aggregations.AggregationReduceContext; @@ -120,10 +121,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 +219,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 +276,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..ef2d87f5b4c7a 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 @@ -34,10 +34,7 @@ import org.elasticsearch.index.mapper.KeywordFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.search.aggregations.Aggregation; -import org.elasticsearch.search.aggregations.AggregationBuilder; -import org.elasticsearch.search.aggregations.AggregationBuilders; -import org.elasticsearch.search.aggregations.MultiBucketConsumerService; +import org.elasticsearch.search.aggregations.*; import org.elasticsearch.search.aggregations.bucket.terms.StringTerms; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.elasticsearch.search.aggregations.metrics.InternalStats; @@ -942,12 +939,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/DateRangeHistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregatorTests.java index aa0803ed378dd..cfbc1c4b2eb8d 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 @@ -26,6 +26,7 @@ import org.elasticsearch.index.mapper.RangeFieldMapper; import org.elasticsearch.index.mapper.RangeType; import org.elasticsearch.lucene.queries.BinaryDocValuesRangeQuery; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; @@ -1084,7 +1085,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..b09f87dedd638 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 @@ -23,6 +23,7 @@ import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.metrics.Min; @@ -52,7 +53,9 @@ 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, new MatchAllDocsQuery(), aggBuilder, longField("field")) + ); assertEquals(6, histogram.getBuckets().size()); assertEquals(-10d, histogram.getBuckets().get(0).getKey()); assertEquals(2, histogram.getBuckets().get(0).getDocCount()); @@ -82,7 +85,9 @@ 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, new MatchAllDocsQuery(), aggBuilder, doubleField("field")) + ); assertEquals(6, histogram.getBuckets().size()); assertEquals(6, histogram.getBuckets().size()); assertEquals(-10d, histogram.getBuckets().get(0).getKey()); @@ -132,7 +137,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, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertTrue(AggregationInspectionHelper.hasValue(histogram)); } } @@ -149,7 +154,9 @@ 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, new MatchAllDocsQuery(), 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 +186,9 @@ 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, new MatchAllDocsQuery(), aggBuilder, longField("field")) + ); assertEquals(2, histogram.getBuckets().size()); assertEquals(-10d, histogram.getBuckets().get(0).getKey()); assertEquals(2, histogram.getBuckets().get(0).getDocCount()); @@ -202,7 +211,9 @@ 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, new MatchAllDocsQuery(), aggBuilder, longField("field")) + ); assertEquals(6, histogram.getBuckets().size()); assertEquals(-10d, histogram.getBuckets().get(0).getKey()); assertEquals(2, histogram.getBuckets().get(0).getDocCount()); @@ -231,7 +242,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, new MatchAllDocsQuery(), aggBuilder)); assertEquals(1, histogram.getBuckets().size()); @@ -257,7 +268,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, new MatchAllDocsQuery(), aggBuilder)); } ); // This throws a number format exception (which is a subclass of IllegalArgumentException) and might be ok? assertThat(t.getMessage(), containsString(missingValue)); @@ -279,7 +290,7 @@ public void testIncorrectFieldType() throws Exception { expectThrows( IllegalArgumentException.class, - () -> { searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, keywordField("field")); } + () -> { searchAndReduce(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, keywordField("field"))); } ); } } @@ -297,7 +308,9 @@ 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, new MatchAllDocsQuery(), 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 +342,9 @@ 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, new MatchAllDocsQuery(), aggBuilder, doubleField("field")) + ); assertEquals(4, histogram.getBuckets().size()); assertEquals(-10 + expectedOffset, histogram.getBuckets().get(0).getKey()); @@ -363,7 +378,9 @@ 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, new MatchAllDocsQuery(), aggBuilder, doubleField("field")) + ); assertEquals(6, histogram.getBuckets().size()); assertEquals(-15d, histogram.getBuckets().get(0).getKey()); assertEquals(0, histogram.getBuckets().get(0).getDocCount()); @@ -396,7 +413,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, new MatchAllDocsQuery(), 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..98646c587cda2 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 @@ -22,6 +22,7 @@ import org.elasticsearch.core.CheckedConsumer; import org.elasticsearch.index.mapper.RangeFieldMapper; import org.elasticsearch.index.mapper.RangeType; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.metrics.Min; @@ -58,10 +59,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) + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, rangeField("field", rangeType)) ); assertEquals(7, histogram.getBuckets().size()); @@ -109,10 +107,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) + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, rangeField("field", rangeType)) ); assertEquals(7, histogram.getBuckets().size()); @@ -160,10 +155,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) + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, rangeField("field", rangeType)) ); assertEquals(7, histogram.getBuckets().size()); @@ -212,10 +204,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) + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, rangeField("field", rangeType)) ); assertEquals(3, histogram.getBuckets().size()); @@ -251,10 +240,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) + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, rangeField("field", rangeType)) ); assertEquals(6, histogram.getBuckets().size()); @@ -299,10 +285,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) + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, rangeField("field", rangeType)) ); assertEquals(2, histogram.getBuckets().size()); @@ -335,10 +318,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) + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, rangeField("field", rangeType)) ); assertEquals(8, histogram.getBuckets().size()); @@ -397,10 +377,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) + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, rangeField("field", rangeType)) ); assertEquals(7, histogram.getBuckets().size()); @@ -452,7 +429,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, new MatchAllDocsQuery(), 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..4f8a4d5753449 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 @@ -25,6 +25,7 @@ import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.AggregatorTestCase; @@ -624,7 +625,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..6fdacb10a1944 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 @@ -31,6 +31,7 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; @@ -324,7 +325,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..8ef12efc259d0 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 @@ -51,6 +51,7 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.BucketOrder; @@ -149,10 +150,7 @@ public void testNoDocs() throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); InternalNested nested = searchAndReduce( - newSearcher(indexReader, false, true), - new MatchAllDocsQuery(), - nestedBuilder, - fieldType + new AggTestConfig(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), nestedBuilder, fieldType) ); assertEquals(NESTED_AGG, nested.getName()); @@ -199,10 +197,7 @@ public void testSingleNestingMax() throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); InternalNested nested = searchAndReduce( - newSearcher(indexReader, false, true), - new MatchAllDocsQuery(), - nestedBuilder, - fieldType + new AggTestConfig(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), nestedBuilder, fieldType) ); assertEquals(expectedNestedDocs, nested.getDocCount()); @@ -256,10 +251,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 + new AggTestConfig(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), nestedBuilder, fieldType) ); assertEquals(expectedNestedDocs, nested.getDocCount()); @@ -314,10 +306,7 @@ public void testOrphanedDocs() throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); InternalNested nested = searchAndReduce( - newSearcher(indexReader, false, true), - new MatchAllDocsQuery(), - nestedBuilder, - fieldType + new AggTestConfig(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), nestedBuilder, fieldType) ); assertEquals(expectedNestedDocs, nested.getDocCount()); @@ -399,10 +388,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 +427,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), new MatchAllDocsQuery(), termsBuilder, fieldType1, fieldType2) ); assertEquals(7, terms.getBuckets().size()); @@ -496,11 +478,7 @@ public void testNestedOrdering() throws IOException { termsBuilder.subAggregation(nestedBuilder); terms = searchAndReduce( - newSearcher(indexReader, false, true), - new MatchAllDocsQuery(), - termsBuilder, - fieldType1, - fieldType2 + new AggTestConfig(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), termsBuilder, fieldType1, fieldType2) ); assertEquals(7, terms.getBuckets().size()); @@ -588,11 +566,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), new MatchAllDocsQuery(), termsBuilder, fieldType1, fieldType2) ); assertEquals(books.size(), terms.getBuckets().size()); @@ -689,11 +663,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 +731,12 @@ 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), new MatchAllDocsQuery(), agg, fieldType) + ); + Nested aliasNested = searchAndReduce( + new AggTestConfig(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), aliasAgg, fieldType) + ); assertEquals(nested, aliasNested); assertEquals(expectedNestedDocs, nested.getDocCount()); @@ -807,10 +787,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 + new AggTestConfig(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), nestedBuilder, fieldType) ); assertEquals(expectedNestedDocs, nested.getDocCount()); 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..22b12935c4272 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 @@ -26,6 +26,7 @@ import org.elasticsearch.index.mapper.ProvidedIdFieldMapper; import org.elasticsearch.index.mapper.SeqNoFieldMapper; import org.elasticsearch.index.mapper.Uid; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.InternalAggregation; @@ -74,7 +75,9 @@ 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), new MatchAllDocsQuery(), nestedBuilder, fieldType) + ); ReverseNested reverseNested = (ReverseNested) ((InternalAggregation) nested).getProperty(REVERSE_AGG_NAME); assertEquals(REVERSE_AGG_NAME, reverseNested.getName()); assertEquals(0, reverseNested.getDocCount()); @@ -134,7 +137,9 @@ 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), new MatchAllDocsQuery(), nestedBuilder, fieldType) + ); assertEquals(expectedNestedDocs, nested.getDocCount()); ReverseNested reverseNested = (ReverseNested) ((InternalAggregation) nested).getProperty(REVERSE_AGG_NAME); @@ -201,8 +206,12 @@ 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), new MatchAllDocsQuery(), agg, fieldType) + ); + Nested aliasNested = searchAndReduce( + new AggTestConfig(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), 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..b77e93ec5ae8f 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 @@ -38,10 +38,7 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; -import org.elasticsearch.search.aggregations.Aggregation; -import org.elasticsearch.search.aggregations.AggregationBuilder; -import org.elasticsearch.search.aggregations.AggregatorTestCase; -import org.elasticsearch.search.aggregations.MultiBucketConsumerService; +import org.elasticsearch.search.aggregations.*; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; import org.elasticsearch.search.aggregations.support.ValuesSourceType; @@ -529,10 +526,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..6fc604d7e2368 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 @@ -21,6 +21,7 @@ import org.elasticsearch.index.mapper.IpFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.search.DocValueFormat; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import java.net.InetAddress; @@ -100,7 +101,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, new MatchAllDocsQuery(), builder, fieldType)); assertEquals(numRanges, range.getBuckets().size()); for (int i = 0; i < range.getBuckets().size(); i++) { Tuple expected = requestedRanges[i]; @@ -133,7 +134,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, new MatchAllDocsQuery(), builder)); assertEquals(1, range.getBuckets().size()); } } @@ -151,7 +152,10 @@ 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, new MatchAllDocsQuery(), 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..2aa8698774df5 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 @@ -31,6 +31,7 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.script.field.DelegateDocValuesField; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; @@ -181,7 +182,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 +200,9 @@ 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, new MatchAllDocsQuery(), 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..1c6f5845c9019 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 @@ -27,6 +27,7 @@ import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.query.MatchNoneQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.filter.FiltersAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.filter.InternalFilters; @@ -66,11 +67,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 +102,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 +129,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, new MatchAllDocsQuery(), 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..9a735e91c5c58 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 @@ -21,6 +21,7 @@ import org.elasticsearch.index.mapper.BinaryFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.search.DocValueFormat; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationExecutionException; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.ValueType; @@ -156,7 +157,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..912d813441666 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 @@ -21,6 +21,7 @@ import org.apache.lucene.util.BytesRef; import org.elasticsearch.index.mapper.KeywordFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.ValueType; @@ -127,7 +128,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..9ee7af3b4a74d 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 @@ -20,6 +20,7 @@ import org.apache.lucene.tests.index.RandomIndexWriter; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationExecutionException; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.ValueType; @@ -166,7 +167,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..f8e33fffd5ba1 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 @@ -44,14 +44,7 @@ import org.elasticsearch.index.mapper.SeqNoFieldMapper; import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.aggregations.Aggregation; -import org.elasticsearch.search.aggregations.AggregationBuilder; -import org.elasticsearch.search.aggregations.Aggregations; -import org.elasticsearch.search.aggregations.Aggregator; -import org.elasticsearch.search.aggregations.AggregatorTestCase; -import org.elasticsearch.search.aggregations.InternalAggregation; -import org.elasticsearch.search.aggregations.InternalMultiBucketAggregation; -import org.elasticsearch.search.aggregations.MultiBucketConsumerService; +import org.elasticsearch.search.aggregations.*; import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation; import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.global.InternalGlobal; @@ -365,7 +358,9 @@ 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, new MatchAllDocsQuery(), globalBuilder, fieldType) + ); InternalMultiBucketAggregation terms = result.getAggregations().get("terms"); assertThat(terms.getBuckets().size(), equalTo(3)); for (MultiBucketsAggregation.Bucket bucket : terms.getBuckets()) { @@ -401,11 +396,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 +437,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 +456,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 +556,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 +1424,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 +1440,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 +1479,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 +1523,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 +1708,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, new MatchAllDocsQuery(), 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 +1749,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, new MatchAllDocsQuery(), request, longField("i"), longField("j"), longField("k")) ); for (int i = 0; i < 10; i++) { LongTerms.Bucket iBucket = result.getBucketByKey(Integer.toString(i)); 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..32c46a468147a 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 @@ -23,6 +23,7 @@ import org.elasticsearch.geometry.Point; import org.elasticsearch.index.mapper.GeoPointFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; @@ -45,7 +46,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, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertTrue(Double.isInfinite(bounds.top)); assertTrue(Double.isInfinite(bounds.bottom)); assertTrue(Double.isInfinite(bounds.posLeft)); @@ -70,7 +71,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, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertTrue(Double.isInfinite(bounds.top)); assertTrue(Double.isInfinite(bounds.bottom)); assertTrue(Double.isInfinite(bounds.posLeft)); @@ -102,7 +103,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, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertThat(bounds.top, equalTo(lat)); assertThat(bounds.bottom, equalTo(lat)); assertThat(bounds.posLeft, equalTo(lon >= 0 ? lon : Double.POSITIVE_INFINITY)); @@ -129,7 +130,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, new MatchAllDocsQuery(), aggBuilder, fieldType)) ); assertThat(exception.getMessage(), startsWith("unsupported symbol")); } @@ -177,7 +178,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, new MatchAllDocsQuery(), 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..640efd3becd32 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 @@ -19,6 +19,7 @@ import org.elasticsearch.common.geo.SpatialPoint; import org.elasticsearch.index.mapper.GeoPointFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; @@ -40,7 +41,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, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertNull(result.centroid()); assertFalse(AggregationInspectionHelper.hasValue(result)); } @@ -58,11 +59,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, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertNull(result.centroid()); fieldType = new GeoPointFieldMapper.GeoPointFieldType("another_field"); - result = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + result = searchAndReduce(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertNull(result.centroid()); assertFalse(AggregationInspectionHelper.hasValue(result)); } @@ -85,7 +86,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, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertEquals(result.centroid(), expectedCentroid); assertTrue(AggregationInspectionHelper.hasValue(result)); } @@ -150,7 +151,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, new MatchAllDocsQuery(), 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..527eb5157ff25 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 @@ -19,6 +19,7 @@ import org.apache.lucene.util.NumericUtils; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; @@ -49,7 +50,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, new MatchAllDocsQuery(), aggBuilder, fieldType)); Percentile rank = ranks.iterator().next(); assertEquals(Double.NaN, rank.getPercent(), 0d); assertEquals(0.5, rank.getValue(), 0d); @@ -71,7 +72,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, new MatchAllDocsQuery(), 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..e9a053e6b06f2 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 @@ -47,6 +47,7 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.BucketOrder; @@ -385,7 +386,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, new MatchAllDocsQuery(), aggregationBuilder, fieldType)); assertEquals(2.0, min.value(), 0); assertTrue(AggregationInspectionHelper.hasValue(min)); } @@ -416,7 +417,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, new MatchAllDocsQuery(), 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..52b87fab97740 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 @@ -29,6 +29,7 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.terms.StringTerms; @@ -289,9 +290,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), new MatchAllDocsQuery(), aggregationBuilder) ); assertEquals(AGG_NAME, scriptedMetric.getName()); assertNotNull(scriptedMetric.aggregation()); @@ -313,7 +312,9 @@ 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), new MatchAllDocsQuery(), aggregationBuilder) + ) ); assertEquals(exception.getMessage(), "[combineScript] must not be null: [scriptedMetric]"); } @@ -333,7 +334,9 @@ 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), new MatchAllDocsQuery(), aggregationBuilder) + ) ); assertEquals(exception.getMessage(), "[reduceScript] must not be null: [scriptedMetric]"); } @@ -355,9 +358,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), new MatchAllDocsQuery(), aggregationBuilder) ); assertEquals(AGG_NAME, scriptedMetric.getName()); assertNotNull(scriptedMetric.aggregation()); @@ -384,9 +385,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), new MatchAllDocsQuery(), aggregationBuilder) ); assertEquals(AGG_NAME, scriptedMetric.getName()); assertNotNull(scriptedMetric.aggregation()); @@ -413,9 +412,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), new MatchAllDocsQuery(), aggregationBuilder) ); // The result value depends on the script params. @@ -475,7 +472,9 @@ 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), new MatchAllDocsQuery(), aggregationBuilder) + ) ); assertEquals( "Parameter name \"" + CONFLICTING_PARAM_NAME + "\" used in both aggregation and script parameters", @@ -499,7 +498,9 @@ 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), new MatchAllDocsQuery(), aggregationBuilder) + ) ); assertEquals("Iterable object is self-referencing itself (Scripted metric aggs init script)", ex.getMessage()); } @@ -523,7 +524,9 @@ 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), new MatchAllDocsQuery(), aggregationBuilder) + ) ); assertEquals("Iterable object is self-referencing itself (Scripted metric aggs map script)", ex.getMessage()); } @@ -544,7 +547,9 @@ 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), new MatchAllDocsQuery(), 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..6db5848c0168c 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 @@ -29,6 +29,7 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; @@ -223,7 +224,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, new MatchAllDocsQuery(), 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..3e9a867588dfd 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 @@ -38,6 +38,7 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; @@ -241,7 +242,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, new MatchAllDocsQuery(), 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..6555babfbfe00 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 @@ -19,6 +19,7 @@ import org.apache.lucene.util.NumericUtils; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; @@ -49,7 +50,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, new MatchAllDocsQuery(), aggBuilder, fieldType)); Percentile rank = ranks.iterator().next(); assertEquals(Double.NaN, rank.getPercent(), 0d); assertEquals(0.5, rank.getValue(), 0d); @@ -71,7 +72,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, new MatchAllDocsQuery(), 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..7aab6e82c5a0a 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 @@ -34,10 +34,7 @@ import org.elasticsearch.index.mapper.ProvidedIdFieldMapper; import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.search.aggregations.Aggregation; -import org.elasticsearch.search.aggregations.AggregationBuilder; -import org.elasticsearch.search.aggregations.AggregationBuilders; -import org.elasticsearch.search.aggregations.AggregatorTestCase; +import org.elasticsearch.search.aggregations.*; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; import org.elasticsearch.search.sort.SortOrder; @@ -130,7 +127,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 +182,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..23a5590609415 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 @@ -27,10 +27,7 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.search.aggregations.Aggregation; -import org.elasticsearch.search.aggregations.Aggregations; -import org.elasticsearch.search.aggregations.AggregatorTestCase; -import org.elasticsearch.search.aggregations.InternalAggregation; +import org.elasticsearch.search.aggregations.*; import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.filter.InternalFilter; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder; @@ -167,10 +164,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..7912d6edd0cc2 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 @@ -31,6 +31,7 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.filter.FiltersAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.filter.InternalFilters; @@ -113,7 +114,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..156358322a056 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 @@ -24,6 +24,7 @@ import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.InternalAggregation; @@ -312,7 +313,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..457f76f7efa58 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 @@ -24,6 +24,7 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.InternalAggregation; @@ -660,7 +661,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 +716,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/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggTestConfig.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggTestConfig.java new file mode 100644 index 0000000000000..b038a5ed9f65a --- /dev/null +++ b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggTestConfig.java @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0 and the Server Side Public License, v 1; you may not use this file except + * in compliance with, at your election, the Elastic License 2.0 or the Server + * Side Public License, v 1. + */ + +package org.elasticsearch.search.aggregations; + +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Query; +import org.elasticsearch.index.mapper.MappedFieldType; + +public record AggTestConfig(IndexSearcher searcher, Query query, AggregationBuilder builder, + MappedFieldType... fieldTypes) { +} 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..711618f9ada3a 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 @@ -429,12 +429,8 @@ protected ScriptService getMockScriptService() { } protected A searchAndReduce( - IndexSearcher searcher, - Query query, - AggregationBuilder builder, - MappedFieldType... fieldTypes - ) throws IOException { - return searchAndReduce(createIndexSettings(), searcher, query, builder, DEFAULT_MAX_BUCKETS, fieldTypes); + AggTestConfig aggTestConfig) throws IOException { + return searchAndReduce(createIndexSettings(), aggTestConfig.searcher(), aggTestConfig.query(), aggTestConfig.builder(), DEFAULT_MAX_BUCKETS, aggTestConfig.fieldTypes()); } protected A searchAndReduce( @@ -672,7 +668,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,11 +1006,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 if (aggregationBuilder.supportsSampling()) { 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..1ebc85e84532f 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 @@ -15,6 +15,7 @@ import org.elasticsearch.index.mapper.CustomTermFreqField; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.histogram.DoubleBounds; @@ -44,7 +45,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, new MatchAllDocsQuery(), 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 +79,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, new MatchAllDocsQuery(), 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 +108,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, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME))); assertTrue(AggregationInspectionHelper.hasValue(histogram)); assertEquals(8, histogram.getBuckets().get(0).getDocCount()); } @@ -129,7 +130,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, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME))); assertEquals(3, histogram.getBuckets().size()); assertEquals(-10 + expectedOffset, histogram.getBuckets().get(0).getKey()); @@ -157,7 +158,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, new MatchAllDocsQuery(), 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 +190,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, new MatchAllDocsQuery(), 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 +217,7 @@ public void testSubAggs() throws Exception { IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME)) + () -> searchAndReduce(new AggTestConfig(searcher, new MatchAllDocsQuery(), 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..075657a4015da 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 @@ -17,6 +17,7 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.range.InternalRange; @@ -68,17 +69,9 @@ 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, new MatchAllDocsQuery(), rawPercentiles, defaultFieldType(RAW_FIELD_NAME))); Percentiles aggregatedPercentileResults = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggregatedPercentiles, - defaultFieldType(HISTO_FIELD_NAME) - ); + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggregatedPercentiles, defaultFieldType(HISTO_FIELD_NAME))); aggBuilder.addUnboundedTo(aggregatedPercentileResults.percentile(steps[0])); rawFieldAgg.addUnboundedTo(rawPercentileResults.percentile(steps[0])); @@ -93,17 +86,9 @@ 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, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME))); InternalRange rawRange = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - rawFieldAgg, - defaultFieldType(RAW_FIELD_NAME) - ); + new AggTestConfig(searcher, new MatchAllDocsQuery(), 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,17 +170,9 @@ private void testRanges(List ranges, String name) throws }); InternalRange range = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - aggBuilder, - defaultFieldType(HISTO_FIELD_NAME) - ); + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME))); InternalRange rawRange = searchAndReduce( - searcher, - new MatchAllDocsQuery(), - rawFieldAgg, - defaultFieldType(RAW_FIELD_NAME) - ); + new AggTestConfig(searcher, new MatchAllDocsQuery(), 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,11 +215,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, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME))); assertTrue(AggregationInspectionHelper.hasValue(range)); assertEquals(7, range.getBuckets().size()); @@ -300,11 +273,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, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME))); assertTrue(AggregationInspectionHelper.hasValue(range)); assertEquals(4, range.getBuckets().size()); @@ -336,7 +305,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, new MatchAllDocsQuery(), 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..ca7886ee5a511 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 @@ -18,6 +18,7 @@ import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.metrics.InternalHDRPercentileRanks; @@ -93,7 +94,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, new MatchAllDocsQuery(), 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..3556b6aca633c 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 @@ -14,6 +14,7 @@ import org.apache.lucene.tests.index.RandomIndexWriter; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.metrics.InternalTDigestPercentileRanks; @@ -73,7 +74,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, new MatchAllDocsQuery(), 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..f7235d86f4436 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 @@ -22,10 +22,7 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.AggregationBuilder; -import org.elasticsearch.search.aggregations.AggregationExecutionException; -import org.elasticsearch.search.aggregations.AggregatorTestCase; -import org.elasticsearch.search.aggregations.InternalAggregation; +import org.elasticsearch.search.aggregations.*; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; @@ -157,7 +154,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/normalize/NormalizeAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/normalize/NormalizeAggregatorTests.java index 571a4b48343f0..2299099308e5f 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 @@ -24,6 +24,7 @@ import org.elasticsearch.index.mapper.KeywordFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder; @@ -164,12 +165,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..abe864d4a1b63 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 @@ -29,6 +29,7 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; @@ -412,12 +413,7 @@ private void testCase( MappedFieldType fieldType2 = new NumberFieldMapper.NumberFieldType("sort_field", fieldNumberType); Terms terms = searchAndReduce( - indexSearcher, - new MatchAllDocsQuery(), - aggregationBuilder, - fieldType, - fieldType2, - groupFieldType + new AggTestConfig(indexSearcher, new MatchAllDocsQuery(), aggregationBuilder, fieldType, fieldType2, groupFieldType) ); verify.accept(terms); } finally { 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..962da0c92cd6d 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 @@ -23,6 +23,7 @@ import org.elasticsearch.geometry.Point; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.metrics.GeoBoundsAggregationBuilder; @@ -66,7 +67,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, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertTrue(Double.isInfinite(bounds.top)); assertTrue(Double.isInfinite(bounds.bottom)); assertTrue(Double.isInfinite(bounds.posLeft)); @@ -99,7 +100,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, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertTrue(Double.isInfinite(bounds.top)); assertTrue(Double.isInfinite(bounds.bottom)); assertTrue(Double.isInfinite(bounds.posLeft)); @@ -138,7 +139,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, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertThat(bounds.top, equalTo(lat)); assertThat(bounds.bottom, equalTo(lat)); assertThat(bounds.posLeft, equalTo(lon >= 0 ? lon : Double.POSITIVE_INFINITY)); @@ -172,7 +173,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, new MatchAllDocsQuery(), aggBuilder, fieldType)) ); assertThat(exception.getMessage(), startsWith("Unknown geometry type")); } @@ -231,7 +232,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, new MatchAllDocsQuery(), 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..e35118dc9a770 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 @@ -23,6 +23,7 @@ import org.elasticsearch.geometry.Geometry; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.plugins.SearchPlugin; +import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.metrics.CompensatedSum; @@ -71,7 +72,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, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertNull(result.centroid()); assertFalse(AggregationInspectionHelper.hasValue(result)); } @@ -97,11 +98,11 @@ public void testUnmapped() throws Exception { null, Collections.emptyMap() ); - InternalGeoCentroid result = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoCentroid result = searchAndReduce(new AggTestConfig(searcher, new MatchAllDocsQuery(), 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, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertNull(result.centroid()); assertFalse(AggregationInspectionHelper.hasValue(result)); } @@ -131,7 +132,7 @@ public void testUnmappedWithMissing() throws Exception { null, Collections.emptyMap() ); - InternalGeoCentroid result = searchAndReduce(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType); + InternalGeoCentroid result = searchAndReduce(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertThat(result.centroid(), equalTo(expectedCentroid)); assertTrue(AggregationInspectionHelper.hasValue(result)); } @@ -208,7 +209,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, new MatchAllDocsQuery(), aggBuilder, fieldType)); assertEquals("my_agg", result.getName()); SpatialPoint centroid = result.centroid(); From b1b414f7cdcf7df3dc58c0e7eaf3a93021167ac4 Mon Sep 17 00:00:00 2001 From: Mark Tozzi Date: Mon, 19 Sep 2022 15:09:23 -0400 Subject: [PATCH 02/13] Formatting --- .../search/aggregations/AggregatorTestCase.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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 711618f9ada3a..2e4ca815b4862 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,9 +428,15 @@ protected ScriptService getMockScriptService() { return null; } - protected A searchAndReduce( - AggTestConfig aggTestConfig) throws IOException { - return searchAndReduce(createIndexSettings(), aggTestConfig.searcher(), aggTestConfig.query(), aggTestConfig.builder(), DEFAULT_MAX_BUCKETS, aggTestConfig.fieldTypes()); + protected A searchAndReduce(AggTestConfig aggTestConfig) throws IOException { + return searchAndReduce( + createIndexSettings(), + aggTestConfig.searcher(), + aggTestConfig.query(), + aggTestConfig.builder(), + DEFAULT_MAX_BUCKETS, + aggTestConfig.fieldTypes() + ); } protected A searchAndReduce( @@ -1006,7 +1012,8 @@ public void testSupportedFieldTypes() throws IOException { AssertionError failure = null; try { InternalAggregation internalAggregation = searchAndReduce( - new AggTestConfig(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 if (aggregationBuilder.supportsSampling()) { From 8ceadb948b9fd8d3638c428d0e162abcc271de0e Mon Sep 17 00:00:00 2001 From: Mark Tozzi Date: Mon, 19 Sep 2022 15:23:01 -0400 Subject: [PATCH 03/13] make the config object internal class of AggTest --- .../stats/MatrixStatsAggregatorTests.java | 1 - .../ChildrenToParentAggregatorTests.java | 1 - .../ParentToChildrenAggregatorTests.java | 1 - .../bucket/filter/FilterAggregatorTests.java | 1 - .../bucket/filter/FiltersAggregatorTests.java | 1 - .../DateRangeHistogramAggregatorTests.java | 1 - .../NumericHistogramAggregatorTests.java | 1 - .../RangeHistogramAggregatorTests.java | 1 - .../VariableWidthHistogramAggregatorTests.java | 1 - .../bucket/missing/MissingAggregatorTests.java | 1 - .../bucket/nested/NestedAggregatorTests.java | 1 - .../nested/ReverseNestedAggregatorTests.java | 1 - .../bucket/range/IpRangeAggregatorTests.java | 1 - .../bucket/sampler/DiversifiedSamplerTests.java | 1 - .../bucket/sampler/SamplerAggregatorTests.java | 1 - .../terms/BinaryTermsAggregatorTests.java | 1 - .../terms/KeywordTermsAggregatorTests.java | 1 - .../terms/NumericTermsAggregatorTests.java | 1 - .../terms/SignificantTermsAggregatorTests.java | 1 - .../terms/SignificantTextAggregatorTests.java | 1 - .../bucket/terms/TermsAggregatorTests.java | 1 - .../metrics/GeoBoundsAggregatorTests.java | 1 - .../metrics/GeoCentroidAggregatorTests.java | 1 - .../HDRPercentileRanksAggregatorTests.java | 1 - .../metrics/MinAggregatorTests.java | 1 - .../metrics/ScriptedMetricAggregatorTests.java | 1 - .../metrics/StatsAggregatorTests.java | 1 - .../metrics/SumAggregatorTests.java | 1 - .../TDigestPercentileRanksAggregatorTests.java | 1 - .../pipeline/BucketScriptAggregatorTests.java | 1 - .../pipeline/CumulativeSumAggregatorTests.java | 1 - .../pipeline/DerivativeAggregatorTests.java | 1 - .../search/aggregations/AggTestConfig.java | 17 ----------------- .../search/aggregations/AggregatorTestCase.java | 10 ++++++++++ .../HistoBackedHistogramAggregatorTests.java | 1 - .../range/HistoBackedRangeAggregatorTests.java | 1 - ...ggregatedPercentileRanksAggregatorTests.java | 1 - ...ggregatedPercentileRanksAggregatorTests.java | 1 - .../normalize/NormalizeAggregatorTests.java | 1 - .../topmetrics/TopMetricsAggregatorTests.java | 1 - .../rollup/job/RollupIndexerIndexingTests.java | 1 - .../aggregations/GeoLineAggregatorTests.java | 1 - .../metrics/GeoShapeBoundsAggregatorTests.java | 1 - .../GeoShapeCentroidAggregatorTests.java | 1 - 44 files changed, 10 insertions(+), 59 deletions(-) delete mode 100644 test/framework/src/main/java/org/elasticsearch/search/aggregations/AggTestConfig.java 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 2596e8802af8c..2f7f4269aa827 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 @@ -20,7 +20,6 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.matrix.MatrixAggregationPlugin; 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 f4cdd30d01fa5..e52cb3bec621c 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 @@ -34,7 +34,6 @@ import org.elasticsearch.join.mapper.ParentIdFieldMapper; import org.elasticsearch.join.mapper.ParentJoinFieldMapper; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; diff --git a/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java b/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java index 82b49869f0dd2..ec36526cc3a68 100644 --- a/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java +++ b/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java @@ -35,7 +35,6 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.join.ParentJoinPlugin; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.AggregatorTestCase; 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 cf37ceb073c8d..a9e1adb9c6e56 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 @@ -20,7 +20,6 @@ import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationExecutionContext; import org.elasticsearch.search.aggregations.Aggregator.BucketComparator; import org.elasticsearch.search.aggregations.AggregatorTestCase; 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 0a9f5be3257af..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 @@ -61,7 +61,6 @@ import org.elasticsearch.index.query.SearchExecutionContext; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationExecutionContext; import org.elasticsearch.search.aggregations.AggregationReduceContext; 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 cfbc1c4b2eb8d..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 @@ -26,7 +26,6 @@ import org.elasticsearch.index.mapper.RangeFieldMapper; import org.elasticsearch.index.mapper.RangeType; import org.elasticsearch.lucene.queries.BinaryDocValuesRangeQuery; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; 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 b09f87dedd638..2cedb2932d5df 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 @@ -23,7 +23,6 @@ import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.metrics.Min; 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 98646c587cda2..f572a31a8aefd 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 @@ -22,7 +22,6 @@ import org.elasticsearch.core.CheckedConsumer; import org.elasticsearch.index.mapper.RangeFieldMapper; import org.elasticsearch.index.mapper.RangeType; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.metrics.Min; 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 4f8a4d5753449..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 @@ -25,7 +25,6 @@ import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.AggregatorTestCase; 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 6fdacb10a1944..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 @@ -31,7 +31,6 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; 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 8ef12efc259d0..71cf00b26e3ed 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 @@ -51,7 +51,6 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.BucketOrder; 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 22b12935c4272..ebb1a93a618c2 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 @@ -26,7 +26,6 @@ import org.elasticsearch.index.mapper.ProvidedIdFieldMapper; import org.elasticsearch.index.mapper.SeqNoFieldMapper; import org.elasticsearch.index.mapper.Uid; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.InternalAggregation; 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 6fc604d7e2368..8657305092d5c 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 @@ -21,7 +21,6 @@ import org.elasticsearch.index.mapper.IpFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.search.DocValueFormat; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import java.net.InetAddress; 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 2aa8698774df5..d10ef132b14af 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 @@ -31,7 +31,6 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.script.field.DelegateDocValuesField; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; 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 1c6f5845c9019..dee748bbcb11a 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 @@ -27,7 +27,6 @@ import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.query.MatchNoneQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.filter.FiltersAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.filter.InternalFilters; 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 9a735e91c5c58..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 @@ -21,7 +21,6 @@ import org.elasticsearch.index.mapper.BinaryFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.search.DocValueFormat; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationExecutionException; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.ValueType; 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 912d813441666..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 @@ -21,7 +21,6 @@ import org.apache.lucene.util.BytesRef; import org.elasticsearch.index.mapper.KeywordFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.ValueType; 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 9ee7af3b4a74d..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 @@ -20,7 +20,6 @@ import org.apache.lucene.tests.index.RandomIndexWriter; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationExecutionException; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.ValueType; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java index 6220286b27176..a1585fb8ae255 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java @@ -39,7 +39,6 @@ import org.elasticsearch.index.mapper.TextFieldMapper.TextFieldType; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.sampler.random.InternalRandomSampler; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregatorTests.java index 29d93395d9126..5d164f37e050d 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregatorTests.java @@ -31,7 +31,6 @@ import org.elasticsearch.index.mapper.MockFieldMapper; import org.elasticsearch.index.mapper.TextFieldMapper; import org.elasticsearch.index.mapper.TextFieldMapper.TextFieldType; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.sampler.InternalSampler; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java index 2c9d2ceaf5815..d9dcfe1f01db4 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java @@ -75,7 +75,6 @@ import org.elasticsearch.script.ScriptType; import org.elasticsearch.script.StringFieldScript; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.AggregationExecutionException; 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 32c46a468147a..074e42f8c4a7f 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 @@ -23,7 +23,6 @@ import org.elasticsearch.geometry.Point; import org.elasticsearch.index.mapper.GeoPointFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; 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 640efd3becd32..28ab947d0fc38 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 @@ -19,7 +19,6 @@ import org.elasticsearch.common.geo.SpatialPoint; import org.elasticsearch.index.mapper.GeoPointFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; 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 527eb5157ff25..da9ffe9452f31 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 @@ -19,7 +19,6 @@ import org.apache.lucene.util.NumericUtils; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; 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 e9a053e6b06f2..e9f88ad798d9b 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 @@ -47,7 +47,6 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.BucketOrder; 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 52b87fab97740..da813f44bdc13 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 @@ -29,7 +29,6 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.terms.StringTerms; 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 6db5848c0168c..80e0a7c66f2a2 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 @@ -29,7 +29,6 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; 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 3e9a867588dfd..259204324ff5b 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 @@ -38,7 +38,6 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; 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 6555babfbfe00..9b6f9d3d09195 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 @@ -19,7 +19,6 @@ import org.apache.lucene.util.NumericUtils; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; 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 7912d6edd0cc2..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 @@ -31,7 +31,6 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.filter.FiltersAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.filter.InternalFilters; 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 156358322a056..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 @@ -24,7 +24,6 @@ import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.InternalAggregation; 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 457f76f7efa58..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 @@ -24,7 +24,6 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.InternalAggregation; diff --git a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggTestConfig.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggTestConfig.java deleted file mode 100644 index b038a5ed9f65a..0000000000000 --- a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggTestConfig.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0 and the Server Side Public License, v 1; you may not use this file except - * in compliance with, at your election, the Elastic License 2.0 or the Server - * Side Public License, v 1. - */ - -package org.elasticsearch.search.aggregations; - -import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.Query; -import org.elasticsearch.index.mapper.MappedFieldType; - -public record AggTestConfig(IndexSearcher searcher, Query query, AggregationBuilder builder, - MappedFieldType... fieldTypes) { -} 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 2e4ca815b4862..237cb367d887d 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 @@ -1472,4 +1472,14 @@ public CircuitBreakerStats stats(String name) { return new CircuitBreakerStats(CircuitBreaker.FIELDDATA, -1, -1, 0, 0); } } + + public record AggTestConfig(IndexSearcher searcher, Query query, AggregationBuilder builder, + MappedFieldType... fieldTypes) { + public AggTestConfig(IndexSearcher searcher, Query query, AggregationBuilder builder, MappedFieldType... fieldTypes) { + this.searcher = searcher; + this.query = query; + this.builder = builder; + this.fieldTypes = 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 1ebc85e84532f..37f57059c6c9a 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 @@ -15,7 +15,6 @@ import org.elasticsearch.index.mapper.CustomTermFreqField; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.histogram.DoubleBounds; 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 075657a4015da..4bd76902582c4 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 @@ -17,7 +17,6 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.range.InternalRange; 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 ca7886ee5a511..4c64a2d5bf626 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 @@ -18,7 +18,6 @@ import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.metrics.InternalHDRPercentileRanks; 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 3556b6aca633c..e9dd0720a1721 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 @@ -14,7 +14,6 @@ import org.apache.lucene.tests.index.RandomIndexWriter; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.metrics.InternalTDigestPercentileRanks; 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 2299099308e5f..b93ceb79ff224 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 @@ -24,7 +24,6 @@ import org.elasticsearch.index.mapper.KeywordFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder; diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/topmetrics/TopMetricsAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/topmetrics/TopMetricsAggregatorTests.java index 2b377e899c022..c217efe7cae53 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/topmetrics/TopMetricsAggregatorTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/topmetrics/TopMetricsAggregatorTests.java @@ -49,7 +49,6 @@ import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; import org.elasticsearch.search.DocValueFormat; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationExecutionContext; import org.elasticsearch.search.aggregations.Aggregator; diff --git a/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/job/RollupIndexerIndexingTests.java b/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/job/RollupIndexerIndexingTests.java index 3553024cd31ad..b45b92dccdc7f 100644 --- a/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/job/RollupIndexerIndexingTests.java +++ b/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/rollup/job/RollupIndexerIndexingTests.java @@ -44,7 +44,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.SearchExecutionContext; import org.elasticsearch.script.ScriptCompiler; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.Aggregations; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.composite.CompositeAggregation; 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 abe864d4a1b63..e278ef2510efb 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 @@ -29,7 +29,6 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; 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 962da0c92cd6d..ef0c84f415957 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 @@ -23,7 +23,6 @@ import org.elasticsearch.geometry.Point; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.metrics.GeoBoundsAggregationBuilder; 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 e35118dc9a770..074951fa75ca8 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 @@ -23,7 +23,6 @@ import org.elasticsearch.geometry.Geometry; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.AggTestConfig; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.metrics.CompensatedSum; From 345eef93570fba3cdee3dd3854dbe9a2bcfb935a Mon Sep 17 00:00:00 2001 From: Mark Tozzi Date: Mon, 19 Sep 2022 16:08:45 -0400 Subject: [PATCH 04/13] another one --- .../DateHistogramAggregatorTests.java | 2 +- .../bucket/terms/TermsAggregatorTests.java | 8 +++--- .../ScriptedMetricAggregatorTests.java | 7 +---- .../pipeline/AvgBucketAggregatorTests.java | 4 +-- .../pipeline/MovFnAggrgatorTests.java | 2 +- .../aggregations/AggregatorTestCase.java | 26 ++++++++----------- .../MovingPercentilesHDRAggregatorTests.java | 2 +- ...vingPercentilesTDigestAggregatorTests.java | 2 +- 8 files changed, 21 insertions(+), 32 deletions(-) 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..9376e6e8b5888 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,7 @@ 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/terms/TermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java index d9dcfe1f01db4..621c07e4ac51a 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java @@ -400,7 +400,7 @@ public void testDelaysSubAggs() throws Exception { * lets us create a fairly small test index. */ int maxBuckets = 200; - StringTerms result = searchAndReduce(searcher, new MatchAllDocsQuery(), aggregationBuilder, maxBuckets, s1ft, s2ft); + StringTerms result = searchAndReduce(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggregationBuilder, s1ft, s2ft).withMaxBuckets(maxBuckets)); assertThat( result.getBuckets().stream().map(StringTerms.Bucket::getKey).collect(toList()), equalTo(List.of("b007", "b107", "b207", "b307", "b407", "b507", "b607", "b707", "b807", "b907", "b000")) @@ -1886,17 +1886,15 @@ public void testOrderByCardinality() throws IOException { IndexSearcher indexSearcher = newIndexSearcher(indexReader); LongTerms terms = searchAndReduce( - createIndexSettings(), + new AggTestConfig( 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) - ); + ).withSplitLeavesIntoSeperateAggregators(false).withMaxBuckets(Integer.MAX_VALUE)); assertThat( terms.getBuckets().stream().map(MultiBucketsAggregation.Bucket::getKey).collect(toList()), equalTo(List.of(9L, 8L, 7L)) 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 da813f44bdc13..f9fe3eb087de0 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 @@ -439,12 +439,7 @@ public void testAggParamsPassedToReduceScript() throws IOException { .mapScript(MAP_SCRIPT_PARAMS) .combineScript(COMBINE_SCRIPT_PARAMS) .reduceScript(REDUCE_SCRIPT_PARAMS); - ScriptedMetric scriptedMetric = searchAndReduce( - newSearcher(indexReader, true, true), - new MatchAllDocsQuery(), - aggregationBuilder, - 0 - ); + ScriptedMetric scriptedMetric = searchAndReduce(new AggTestConfig(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder).withMaxBuckets(0)); // The result value depends on the script params. assertEquals(4803, scriptedMetric.aggregation()); 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 23a5590609415..846bf32a8eabb 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 @@ -108,8 +108,8 @@ 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 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..68c98f9cb3451 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,7 @@ 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 237cb367d887d..c8d284193e0e4 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 @@ -434,7 +434,7 @@ protected A searchAndReduc aggTestConfig.searcher(), aggTestConfig.query(), aggTestConfig.builder(), - DEFAULT_MAX_BUCKETS, + aggTestConfig.maxBuckets(), aggTestConfig.fieldTypes() ); } @@ -449,16 +449,6 @@ protected A searchAndReduc 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}. @@ -1474,12 +1464,18 @@ public CircuitBreakerStats stats(String name) { } public record AggTestConfig(IndexSearcher searcher, Query query, AggregationBuilder builder, + boolean splitLeavesIntoSeparateAggregators, int maxBuckets, MappedFieldType... fieldTypes) { public AggTestConfig(IndexSearcher searcher, Query query, AggregationBuilder builder, MappedFieldType... fieldTypes) { - this.searcher = searcher; - this.query = query; - this.builder = builder; - this.fieldTypes = fieldTypes; + this(searcher, query, builder, randomBoolean(), DEFAULT_MAX_BUCKETS, fieldTypes); + } + + public AggTestConfig withSplitLeavesIntoSeperateAggregators(boolean splitLeavesIntoSeparateAggregators) { + return new AggTestConfig(searcher, query, builder, splitLeavesIntoSeparateAggregators, maxBuckets, fieldTypes); + } + + public AggTestConfig withMaxBuckets(int maxBuckets) { + return new AggTestConfig(searcher, query, builder, splitLeavesIntoSeparateAggregators, maxBuckets, fieldTypes); } } } 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..4a186ed65c2f2 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,7 @@ 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..dbc75431a9907 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,7 @@ 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"); From 5b8ca8cd82cae8965bbae0beca85dfabcdfe7468 Mon Sep 17 00:00:00 2001 From: Mark Tozzi Date: Mon, 19 Sep 2022 16:39:08 -0400 Subject: [PATCH 05/13] we shouldn't ever need to pass settings --- .../composite/CompositeAggregatorTests.java | 15 ++++++------- .../DateHistogramAggregatorTests.java | 4 +++- .../bucket/terms/TermsAggregatorTests.java | 21 +++++++++++-------- .../ScriptedMetricAggregatorTests.java | 4 +++- .../pipeline/AvgBucketAggregatorTests.java | 8 +++++-- .../pipeline/MovFnAggrgatorTests.java | 4 +++- .../aggregations/AggregatorTestCase.java | 10 --------- 7 files changed, 35 insertions(+), 31 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java index 00f188e536fc9..065ed15f4f8b8 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java @@ -125,6 +125,7 @@ public class CompositeAggregatorTests extends AggregatorTestCase { private static MappedFieldType[] FIELD_TYPES; private List 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/histogram/DateHistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java index 9376e6e8b5888..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(new AggTestConfig(indexSearcher, query, aggregationBuilder, fieldType).withMaxBuckets(maxBucket)); + 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/terms/TermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java index 621c07e4ac51a..3aac2137e1434 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java @@ -400,7 +400,9 @@ public void testDelaysSubAggs() throws Exception { * lets us create a fairly small test index. */ int maxBuckets = 200; - StringTerms result = searchAndReduce(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggregationBuilder, s1ft, s2ft).withMaxBuckets(maxBuckets)); + StringTerms result = searchAndReduce( + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggregationBuilder, s1ft, s2ft).withMaxBuckets(maxBuckets) + ); assertThat( result.getBuckets().stream().map(StringTerms.Bucket::getKey).collect(toList()), equalTo(List.of("b007", "b107", "b207", "b307", "b407", "b507", "b607", "b707", "b807", "b907", "b000")) @@ -1887,14 +1889,15 @@ public void testOrderByCardinality() throws IOException { LongTerms terms = searchAndReduce( new AggTestConfig( - indexSearcher, - new MatchAllDocsQuery(), - 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)); + indexSearcher, + new MatchAllDocsQuery(), + 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()), equalTo(List.of(9L, 8L, 7L)) 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 f9fe3eb087de0..b60f2a3dd4e2c 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 @@ -439,7 +439,9 @@ public void testAggParamsPassedToReduceScript() throws IOException { .mapScript(MAP_SCRIPT_PARAMS) .combineScript(COMBINE_SCRIPT_PARAMS) .reduceScript(REDUCE_SCRIPT_PARAMS); - ScriptedMetric scriptedMetric = searchAndReduce(new AggTestConfig(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder).withMaxBuckets(0)); + ScriptedMetric scriptedMetric = searchAndReduce( + new AggTestConfig(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder).withMaxBuckets(0) + ); // The result value depends on the script params. assertEquals(4803, scriptedMetric.aggregation()); 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 846bf32a8eabb..68916e55b7c4d 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 @@ -108,8 +108,12 @@ public void testSameAggNames() throws IOException { MappedFieldType valueFieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD, NumberFieldMapper.NumberType.LONG); - avgResult = searchAndReduce(new AggTestConfig(indexSearcher, query, avgBuilder, fieldType, valueFieldType).withMaxBuckets(10000)); - histogramResult = searchAndReduce(new AggTestConfig(indexSearcher, query, histo, fieldType, valueFieldType).withMaxBuckets(10000)); + 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 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 68c98f9cb3451..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(new AggTestConfig(indexSearcher, query, aggBuilder, fieldType, valueFieldType).withMaxBuckets(1000)); + 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 c8d284193e0e4..1cdf9ec59f556 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 @@ -439,16 +439,6 @@ protected A searchAndReduc ); } - 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); - } - /** * Collects all documents that match the provided query {@link Query} and * returns the reduced {@link InternalAggregation}. From 040cdc10cb3208608dfc2076e396940ad0763989 Mon Sep 17 00:00:00 2001 From: Mark Tozzi Date: Mon, 19 Sep 2022 16:44:56 -0400 Subject: [PATCH 06/13] we don't actually need that method at all --- .../aggregations/AggregatorTestCase.java | 34 +++++-------------- 1 file changed, 9 insertions(+), 25 deletions(-) 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 1cdf9ec59f556..4f978055fe9e3 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 @@ -430,11 +430,11 @@ protected ScriptService getMockScriptService() { protected A searchAndReduce(AggTestConfig aggTestConfig) throws IOException { return searchAndReduce( - createIndexSettings(), aggTestConfig.searcher(), aggTestConfig.query(), aggTestConfig.builder(), aggTestConfig.maxBuckets(), + aggTestConfig.splitLeavesIntoSeparateAggregators(), aggTestConfig.fieldTypes() ); } @@ -446,31 +446,14 @@ 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. + * 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, @@ -478,6 +461,7 @@ protected A searchAndReduc boolean splitLeavesIntoSeparateAggregators, MappedFieldType... fieldTypes ) 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++) { @@ -1454,18 +1438,18 @@ public CircuitBreakerStats stats(String name) { } public record AggTestConfig(IndexSearcher searcher, Query query, AggregationBuilder builder, - boolean splitLeavesIntoSeparateAggregators, int maxBuckets, - MappedFieldType... fieldTypes) { + int maxBuckets, boolean splitLeavesIntoSeparateAggregators, + MappedFieldType... fieldTypes) { public AggTestConfig(IndexSearcher searcher, Query query, AggregationBuilder builder, MappedFieldType... fieldTypes) { - this(searcher, query, builder, randomBoolean(), DEFAULT_MAX_BUCKETS, fieldTypes); + this(searcher, query, builder, DEFAULT_MAX_BUCKETS, randomBoolean(), fieldTypes); } public AggTestConfig withSplitLeavesIntoSeperateAggregators(boolean splitLeavesIntoSeparateAggregators) { - return new AggTestConfig(searcher, query, builder, splitLeavesIntoSeparateAggregators, maxBuckets, fieldTypes); + return new AggTestConfig(searcher, query, builder, maxBuckets, splitLeavesIntoSeparateAggregators, fieldTypes); } public AggTestConfig withMaxBuckets(int maxBuckets) { - return new AggTestConfig(searcher, query, builder, splitLeavesIntoSeparateAggregators, maxBuckets, fieldTypes); + return new AggTestConfig(searcher, query, builder, maxBuckets, splitLeavesIntoSeparateAggregators, fieldTypes); } } } From d086d7ea5d9b9fdb432262a5092fca5078b1055a Mon Sep 17 00:00:00 2001 From: Mark Tozzi Date: Mon, 19 Sep 2022 17:01:31 -0400 Subject: [PATCH 07/13] and finally, one public searchAndReduce method! --- .../aggregations/AggregatorTestCase.java | 47 ++++++------------- 1 file changed, 14 insertions(+), 33 deletions(-) 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 4f978055fe9e3..b92cdb7d6adeb 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,17 +428,6 @@ protected ScriptService getMockScriptService() { return null; } - protected A searchAndReduce(AggTestConfig aggTestConfig) throws IOException { - return searchAndReduce( - aggTestConfig.searcher(), - aggTestConfig.query(), - aggTestConfig.builder(), - aggTestConfig.maxBuckets(), - aggTestConfig.splitLeavesIntoSeparateAggregators(), - aggTestConfig.fieldTypes() - ); - } - /** * Collects all documents that match the provided query {@link Query} and * returns the reduced {@link InternalAggregation}. @@ -449,18 +438,10 @@ protected A searchAndReduc * 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. + * @param aggTestConfig */ protected A searchAndReduce( - IndexSearcher searcher, - Query query, - AggregationBuilder builder, - int maxBucket, - boolean splitLeavesIntoSeparateAggregators, - MappedFieldType... fieldTypes - ) throws IOException { + AggTestConfig aggTestConfig) throws IOException { IndexSettings indexSettings = createIndexSettings(); // First run it to find circuit breaker leaks on the aggregator CircuitBreakerService crankyService = new CrankyCircuitBreakerService(); @@ -468,13 +449,13 @@ protected A searchAndReduc 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 @@ -486,13 +467,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() ); } From bcd5675f5dfd594d83ce70062413d2d0d192c4c4 Mon Sep 17 00:00:00 2001 From: Mark Tozzi Date: Mon, 19 Sep 2022 17:16:53 -0400 Subject: [PATCH 08/13] line length --- .../ChildrenToParentAggregatorTests.java | 4 +++- .../ParentToChildrenAggregatorTests.java | 19 ++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) 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 e52cb3bec621c..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 @@ -293,7 +293,9 @@ private void testCaseTermsParentTerms(Query query, IndexSearcher indexSearcher, MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("number", NumberFieldMapper.NumberType.LONG); MappedFieldType subFieldType = new NumberFieldMapper.NumberFieldType("subNumber", NumberFieldMapper.NumberType.LONG); - LongTerms result = searchAndReduce(new AggTestConfig(indexSearcher, query, aggregationBuilder, withJoinFields(fieldType, subFieldType))); + LongTerms result = searchAndReduce( + new AggTestConfig(indexSearcher, query, aggregationBuilder, withJoinFields(fieldType, subFieldType)) + ); verify.accept(result); } diff --git a/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java b/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java index ec36526cc3a68..7c03f8f15e183 100644 --- a/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java +++ b/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java @@ -157,7 +157,8 @@ public void testParentChildAsSubAgg() throws IOException { } } StringTerms result = searchAndReduce( - new AggTestConfig(indexSearcher, new MatchAllDocsQuery(), request, withJoinFields(longField("number"), kwd))); + new AggTestConfig(indexSearcher, new MatchAllDocsQuery(), request, withJoinFields(longField("number"), kwd)) + ); StringTerms.Bucket evenBucket = result.getBucketByKey("even"); InternalChildren evenChildren = evenBucket.getAggregations().get("children"); @@ -205,7 +206,13 @@ public void testBestDeferringCollectorWithSubAggOfChildrenAggNeedingScores() thr var e = expectThrows( RuntimeException.class, () -> searchAndReduce( - new AggTestConfig(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( e.getMessage(), @@ -231,7 +238,13 @@ 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( - new AggTestConfig(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"); TopHits topHits = terms.getBuckets().get(0).getAggregations().get("_name3"); From ff4ad6ba7728f21e456827f09742b5f944a16f5c Mon Sep 17 00:00:00 2001 From: Mark Tozzi Date: Mon, 19 Sep 2022 17:28:22 -0400 Subject: [PATCH 09/13] more checkstyle --- .../aggregations/AggregatorTestCase.java | 14 ++++++---- .../HistoBackedHistogramAggregatorTests.java | 24 ++++++++++++---- .../HistoBackedRangeAggregatorTests.java | 28 +++++++++++++------ .../MovingPercentilesHDRAggregatorTests.java | 4 ++- ...vingPercentilesTDigestAggregatorTests.java | 4 ++- .../normalize/NormalizeAggregatorTests.java | 2 +- .../aggregations/GeoLineAggregatorTests.java | 2 +- 7 files changed, 54 insertions(+), 24 deletions(-) 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 b92cdb7d6adeb..e27a699854708 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 @@ -440,8 +440,7 @@ protected ScriptService getMockScriptService() { * * @param aggTestConfig */ - protected A searchAndReduce( - AggTestConfig aggTestConfig) 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(); @@ -1418,9 +1417,14 @@ public CircuitBreakerStats stats(String name) { } } - public record AggTestConfig(IndexSearcher searcher, Query query, AggregationBuilder builder, - int maxBuckets, boolean splitLeavesIntoSeparateAggregators, - MappedFieldType... fieldTypes) { + public record AggTestConfig( + IndexSearcher searcher, + Query query, + AggregationBuilder builder, + int maxBuckets, + boolean splitLeavesIntoSeparateAggregators, + MappedFieldType... fieldTypes + ) { public AggTestConfig(IndexSearcher searcher, Query query, AggregationBuilder builder, MappedFieldType... fieldTypes) { this(searcher, query, builder, DEFAULT_MAX_BUCKETS, randomBoolean(), 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 37f57059c6c9a..79b51266248a2 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 @@ -44,7 +44,9 @@ 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(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME))); + InternalHistogram histogram = searchAndReduce( + new AggTestConfig(searcher, new MatchAllDocsQuery(), 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 +80,9 @@ 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(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME))); + InternalHistogram histogram = searchAndReduce( + new AggTestConfig(searcher, new MatchAllDocsQuery(), 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 +111,9 @@ public void testHistogramWithDocCountField() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME))); + InternalHistogram histogram = searchAndReduce( + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME)) + ); assertTrue(AggregationInspectionHelper.hasValue(histogram)); assertEquals(8, histogram.getBuckets().get(0).getDocCount()); } @@ -129,7 +135,9 @@ public void testRandomOffset() throws Exception { .minDocCount(1); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME))); + InternalHistogram histogram = searchAndReduce( + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME)) + ); assertEquals(3, histogram.getBuckets().size()); assertEquals(-10 + expectedOffset, histogram.getBuckets().get(0).getKey()); @@ -157,7 +165,9 @@ public void testExtendedBounds() throws Exception { .extendedBounds(-12, 13); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME))); + InternalHistogram histogram = searchAndReduce( + new AggTestConfig(searcher, new MatchAllDocsQuery(), 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 +199,9 @@ 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(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME))); + InternalHistogram histogram = searchAndReduce( + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(FIELD_NAME)) + ); assertEquals(1, histogram.getBuckets().size()); assertEquals(0d, histogram.getBuckets().get(0).getKey()); assertEquals(4, histogram.getBuckets().get(0).getDocCount()); 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 4bd76902582c4..50b16b047275f 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 @@ -68,9 +68,11 @@ public void testPercentilesAccuracy() throws Exception { RangeAggregationBuilder rawFieldAgg = new RangeAggregationBuilder("my_agg").field(RAW_FIELD_NAME); Percentiles rawPercentileResults = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), rawPercentiles, defaultFieldType(RAW_FIELD_NAME))); + new AggTestConfig(searcher, new MatchAllDocsQuery(), rawPercentiles, defaultFieldType(RAW_FIELD_NAME)) + ); Percentiles aggregatedPercentileResults = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), aggregatedPercentiles, defaultFieldType(HISTO_FIELD_NAME))); + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggregatedPercentiles, defaultFieldType(HISTO_FIELD_NAME)) + ); aggBuilder.addUnboundedTo(aggregatedPercentileResults.percentile(steps[0])); rawFieldAgg.addUnboundedTo(rawPercentileResults.percentile(steps[0])); @@ -85,9 +87,11 @@ public void testPercentilesAccuracy() throws Exception { rawFieldAgg.addUnboundedFrom(rawPercentileResults.percentile(steps[steps.length - 1])); InternalRange range = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME))); + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME)) + ); InternalRange rawRange = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), rawFieldAgg, defaultFieldType(RAW_FIELD_NAME))); + new AggTestConfig(searcher, new MatchAllDocsQuery(), 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()); } @@ -169,9 +173,11 @@ private void testRanges(List ranges, String name) throws }); InternalRange range = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME))); + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME)) + ); InternalRange rawRange = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), rawFieldAgg, defaultFieldType(RAW_FIELD_NAME))); + new AggTestConfig(searcher, new MatchAllDocsQuery(), 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()); } @@ -214,7 +220,8 @@ public void testOverlapping() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); InternalRange range = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME))); + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME)) + ); assertTrue(AggregationInspectionHelper.hasValue(range)); assertEquals(7, range.getBuckets().size()); @@ -272,7 +279,8 @@ public void testNonOverlapping() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); InternalRange range = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME))); + new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME)) + ); assertTrue(AggregationInspectionHelper.hasValue(range)); assertEquals(4, range.getBuckets().size()); @@ -304,7 +312,9 @@ public void testSubAggs() throws Exception { IndexSearcher searcher = new IndexSearcher(reader); IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME))) + () -> searchAndReduce( + new AggTestConfig(searcher, new MatchAllDocsQuery(), 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/movingPercentiles/MovingPercentilesHDRAggregatorTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/movingPercentiles/MovingPercentilesHDRAggregatorTests.java index 4a186ed65c2f2..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(new AggTestConfig(indexSearcher, query, aggBuilder, fieldType, valueFieldType).withMaxBuckets(1000)); + 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 dbc75431a9907..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(new AggTestConfig(indexSearcher, query, aggBuilder, fieldType, valueFieldType).withMaxBuckets(1000)); + 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 b93ceb79ff224..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,7 +164,7 @@ private void testCase(ValuesSourceAggregationBuilder aggBuilder, Consumer Date: Mon, 19 Sep 2022 17:29:13 -0400 Subject: [PATCH 10/13] remove useless javadoc --- .../elasticsearch/search/aggregations/AggregatorTestCase.java | 2 -- 1 file changed, 2 deletions(-) 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 e27a699854708..caa69944ac5b8 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 @@ -437,8 +437,6 @@ protected ScriptService getMockScriptService() { * index at once and runs a final reduction on the single resulting agg. * 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 aggTestConfig */ protected A searchAndReduce(AggTestConfig aggTestConfig) throws IOException { IndexSettings indexSettings = createIndexSettings(); From f2732cd01096419a8a8de22ea3d65c9f302a8e3e Mon Sep 17 00:00:00 2001 From: Mark Tozzi Date: Mon, 19 Sep 2022 17:35:20 -0400 Subject: [PATCH 11/13] something overzealously optimized an import --- .../CumulativeCardinalityAggregatorTests.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 f7235d86f4436..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 @@ -22,7 +22,10 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.*; +import org.elasticsearch.search.aggregations.AggregationBuilder; +import org.elasticsearch.search.aggregations.AggregationExecutionException; +import org.elasticsearch.search.aggregations.AggregatorTestCase; +import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; From 4d3e054d1b811efbe9095cd14a4d34978cab956a Mon Sep 17 00:00:00 2001 From: Mark Tozzi Date: Tue, 20 Sep 2022 11:59:24 -0400 Subject: [PATCH 12/13] fix imports, again --- .../histogram/AutoDateHistogramAggregatorTests.java | 5 ++++- .../bucket/range/DateRangeAggregatorTests.java | 5 ++++- .../bucket/terms/RareTermsAggregatorTests.java | 9 ++++++++- .../aggregations/metrics/TopHitsAggregatorTests.java | 5 ++++- .../aggregations/pipeline/AvgBucketAggregatorTests.java | 5 ++++- 5 files changed, 24 insertions(+), 5 deletions(-) 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 ef2d87f5b4c7a..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 @@ -34,7 +34,10 @@ import org.elasticsearch.index.mapper.KeywordFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.search.aggregations.*; +import org.elasticsearch.search.aggregations.Aggregation; +import org.elasticsearch.search.aggregations.AggregationBuilder; +import org.elasticsearch.search.aggregations.AggregationBuilders; +import org.elasticsearch.search.aggregations.MultiBucketConsumerService; import org.elasticsearch.search.aggregations.bucket.terms.StringTerms; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.elasticsearch.search.aggregations.metrics.InternalStats; 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 b77e93ec5ae8f..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 @@ -38,7 +38,10 @@ import org.elasticsearch.script.ScriptModule; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptType; -import org.elasticsearch.search.aggregations.*; +import org.elasticsearch.search.aggregations.Aggregation; +import org.elasticsearch.search.aggregations.AggregationBuilder; +import org.elasticsearch.search.aggregations.AggregatorTestCase; +import org.elasticsearch.search.aggregations.MultiBucketConsumerService; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; import org.elasticsearch.search.aggregations.support.ValuesSourceType; 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 f8e33fffd5ba1..894f9fba954b5 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 @@ -44,7 +44,14 @@ import org.elasticsearch.index.mapper.SeqNoFieldMapper; import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.aggregations.*; +import org.elasticsearch.search.aggregations.Aggregation; +import org.elasticsearch.search.aggregations.AggregationBuilder; +import org.elasticsearch.search.aggregations.Aggregations; +import org.elasticsearch.search.aggregations.Aggregator; +import org.elasticsearch.search.aggregations.AggregatorTestCase; +import org.elasticsearch.search.aggregations.InternalAggregation; +import org.elasticsearch.search.aggregations.InternalMultiBucketAggregation; +import org.elasticsearch.search.aggregations.MultiBucketConsumerService; import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation; import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.global.InternalGlobal; 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 7aab6e82c5a0a..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 @@ -34,7 +34,10 @@ import org.elasticsearch.index.mapper.ProvidedIdFieldMapper; import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.search.aggregations.*; +import org.elasticsearch.search.aggregations.Aggregation; +import org.elasticsearch.search.aggregations.AggregationBuilder; +import org.elasticsearch.search.aggregations.AggregationBuilders; +import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; import org.elasticsearch.search.sort.SortOrder; 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 68916e55b7c4d..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 @@ -27,7 +27,10 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.search.aggregations.*; +import org.elasticsearch.search.aggregations.Aggregation; +import org.elasticsearch.search.aggregations.Aggregations; +import org.elasticsearch.search.aggregations.AggregatorTestCase; +import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.filter.InternalFilter; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder; From 37cf9052d4dc83663b3da7de6964899b164de763 Mon Sep 17 00:00:00 2001 From: Mark Tozzi Date: Tue, 20 Sep 2022 13:42:06 -0400 Subject: [PATCH 13/13] default config to use MatchAllDocsQuery --- .../stats/MatrixStatsAggregatorTests.java | 7 ++-- .../ParentToChildrenAggregatorTests.java | 4 +- .../bucket/filter/FilterAggregatorTests.java | 5 +-- .../NumericHistogramAggregatorTests.java | 42 ++++++------------- .../RangeHistogramAggregatorTests.java | 34 ++++----------- .../bucket/nested/NestedAggregatorTests.java | 36 +++++----------- .../nested/ReverseNestedAggregatorTests.java | 16 ++----- .../bucket/range/IpRangeAggregatorTests.java | 10 ++--- .../sampler/DiversifiedSamplerTests.java | 4 +- .../sampler/SamplerAggregatorTests.java | 3 +- .../terms/RareTermsAggregatorTests.java | 4 +- .../SignificantTermsAggregatorTests.java | 27 +++--------- .../terms/SignificantTextAggregatorTests.java | 5 +-- .../bucket/terms/TermsAggregatorTests.java | 13 ++---- .../metrics/GeoBoundsAggregatorTests.java | 11 +++-- .../metrics/GeoCentroidAggregatorTests.java | 11 +++-- .../HDRPercentileRanksAggregatorTests.java | 5 +-- .../metrics/MinAggregatorTests.java | 4 +- .../ScriptedMetricAggregatorTests.java | 34 +++++---------- .../metrics/StatsAggregatorTests.java | 2 +- .../metrics/SumAggregatorTests.java | 2 +- ...TDigestPercentileRanksAggregatorTests.java | 5 +-- .../aggregations/AggregatorTestCase.java | 8 ++++ .../HistoBackedHistogramAggregatorTests.java | 27 ++++-------- .../HistoBackedRangeAggregatorTests.java | 21 ++++------ ...regatedPercentileRanksAggregatorTests.java | 3 +- ...regatedPercentileRanksAggregatorTests.java | 3 +- .../aggregations/GeoLineAggregatorTests.java | 4 +- .../GeoShapeBoundsAggregatorTests.java | 11 +++-- .../GeoShapeCentroidAggregatorTests.java | 11 +++-- 30 files changed, 125 insertions(+), 247 deletions(-) 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 2f7f4269aa827..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(new AggTestConfig(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(new AggTestConfig(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(new AggTestConfig(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/ParentToChildrenAggregatorTests.java b/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java index 7c03f8f15e183..fdba0f4fc5daa 100644 --- a/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java +++ b/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java @@ -156,9 +156,7 @@ public void testParentChildAsSubAgg() throws IOException { expectedOddMin = Math.min(expectedOddMin, e.getValue().v2()); } } - StringTerms result = searchAndReduce( - new AggTestConfig(indexSearcher, new MatchAllDocsQuery(), request, withJoinFields(longField("number"), kwd)) - ); + StringTerms result = searchAndReduce(new AggTestConfig(indexSearcher, request, withJoinFields(longField("number"), kwd))); StringTerms.Bucket evenBucket = result.getBucketByKey("even"); InternalChildren evenChildren = evenBucket.getAggregations().get("children"); 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 a9e1adb9c6e56..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(new AggTestConfig(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(new AggTestConfig(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/histogram/NumericHistogramAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java index 2cedb2932d5df..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,9 +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( - new AggTestConfig(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()); @@ -84,9 +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( - new AggTestConfig(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()); @@ -136,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(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType)); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertTrue(AggregationInspectionHelper.hasValue(histogram)); } } @@ -153,9 +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( - new AggTestConfig(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()); @@ -185,9 +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( - new AggTestConfig(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()); @@ -210,9 +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( - new AggTestConfig(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()); @@ -241,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(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder)); + InternalHistogram histogram = searchAndReduce(new AggTestConfig(searcher, aggBuilder)); assertEquals(1, histogram.getBuckets().size()); @@ -267,7 +257,7 @@ public void testMissingUnmappedFieldBadType() throws Exception { IndexSearcher searcher = new IndexSearcher(reader); Throwable t = expectThrows( IllegalArgumentException.class, - () -> { searchAndReduce(new AggTestConfig(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)); @@ -289,7 +279,7 @@ public void testIncorrectFieldType() throws Exception { expectThrows( IllegalArgumentException.class, - () -> { searchAndReduce(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, keywordField("field"))); } + () -> { searchAndReduce(new AggTestConfig(searcher, aggBuilder, keywordField("field"))); } ); } } @@ -307,9 +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( - new AggTestConfig(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()); @@ -341,9 +329,7 @@ public void testRandomOffset() throws Exception { .offset(offset); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - new AggTestConfig(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()); @@ -377,9 +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( - new AggTestConfig(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()); @@ -412,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(new AggTestConfig(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 f572a31a8aefd..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,9 +57,7 @@ public void testDoubles() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - new AggTestConfig(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()); @@ -105,9 +103,7 @@ public void testLongs() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - new AggTestConfig(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()); @@ -153,9 +149,7 @@ public void testMultipleRanges() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - new AggTestConfig(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()); @@ -202,9 +196,7 @@ public void testMultipleRangesLotsOfOverlap() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - new AggTestConfig(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()); @@ -238,9 +230,7 @@ public void testLongsIrrationalInterval() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - new AggTestConfig(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()); @@ -283,9 +273,7 @@ public void testMinDocCount() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - new AggTestConfig(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()); @@ -316,9 +304,7 @@ public void testOffset() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - new AggTestConfig(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()); @@ -375,9 +361,7 @@ public void testOffsetGtInterval() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - new AggTestConfig(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()); @@ -428,7 +412,7 @@ public void testIpRangesUnsupported() throws Exception { IndexSearcher searcher = new IndexSearcher(reader); Exception e = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce(new AggTestConfig(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/nested/NestedAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java index 71cf00b26e3ed..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,9 +148,7 @@ public void testNoDocs() throws IOException { nestedBuilder.subAggregation(maxAgg); MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); - InternalNested nested = searchAndReduce( - new AggTestConfig(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()); @@ -195,9 +193,7 @@ public void testSingleNestingMax() throws IOException { nestedBuilder.subAggregation(maxAgg); MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); - InternalNested nested = searchAndReduce( - new AggTestConfig(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()); @@ -249,9 +245,7 @@ public void testDoubleNestingMax() throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); - InternalNested nested = searchAndReduce( - new AggTestConfig(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()); @@ -304,9 +298,7 @@ public void testOrphanedDocs() throws IOException { nestedBuilder.subAggregation(sumAgg); MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); - InternalNested nested = searchAndReduce( - new AggTestConfig(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()); @@ -426,7 +418,7 @@ public void testNestedOrdering() throws IOException { termsBuilder.subAggregation(nestedBuilder); Terms terms = searchAndReduce( - new AggTestConfig(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), termsBuilder, fieldType1, fieldType2) + new AggTestConfig(newSearcher(indexReader, false, true), termsBuilder, fieldType1, fieldType2) ); assertEquals(7, terms.getBuckets().size()); @@ -476,9 +468,7 @@ public void testNestedOrdering() throws IOException { nestedBuilder.subAggregation(maxAgg); termsBuilder.subAggregation(nestedBuilder); - terms = searchAndReduce( - new AggTestConfig(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()); @@ -565,7 +555,7 @@ public void testNestedOrdering_random() throws IOException { termsBuilder.subAggregation(nestedBuilder); Terms terms = searchAndReduce( - new AggTestConfig(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), termsBuilder, fieldType1, fieldType2) + new AggTestConfig(newSearcher(indexReader, false, true), termsBuilder, fieldType1, fieldType2) ); assertEquals(books.size(), terms.getBuckets().size()); @@ -730,12 +720,8 @@ public void testFieldAlias() throws IOException { max(MAX_AGG_NAME).field(VALUE_FIELD_NAME + "-alias") ); - InternalNested nested = searchAndReduce( - new AggTestConfig(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), agg, fieldType) - ); - Nested aliasNested = searchAndReduce( - new AggTestConfig(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()); @@ -785,9 +771,7 @@ public void testNestedWithPipeline() throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); - InternalNested nested = searchAndReduce( - new AggTestConfig(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 ebb1a93a618c2..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,9 +74,7 @@ public void testNoDocs() throws IOException { reverseNestedBuilder.subAggregation(maxAgg); MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); - Nested nested = searchAndReduce( - new AggTestConfig(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()); @@ -136,9 +134,7 @@ public void testMaxFromParentDocs() throws IOException { reverseNestedBuilder.subAggregation(maxAgg); MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(VALUE_FIELD_NAME, NumberFieldMapper.NumberType.LONG); - Nested nested = searchAndReduce( - new AggTestConfig(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); @@ -205,12 +201,8 @@ public void testFieldAlias() throws IOException { reverseNested(REVERSE_AGG_NAME).subAggregation(aliasMaxAgg) ); - Nested nested = searchAndReduce( - new AggTestConfig(newSearcher(indexReader, false, true), new MatchAllDocsQuery(), agg, fieldType) - ); - Nested aliasNested = searchAndReduce( - new AggTestConfig(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/IpRangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java index 8657305092d5c..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(new AggTestConfig(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(new AggTestConfig(searcher, new MatchAllDocsQuery(), builder)); + InternalBinaryRange range = searchAndReduce(new AggTestConfig(searcher, builder)); assertEquals(1, range.getBuckets().size()); } } @@ -151,10 +150,7 @@ public void testMissingUnmappedBadType() throws Exception { .missing(1234); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - expectThrows( - IllegalArgumentException.class, - () -> searchAndReduce(new AggTestConfig(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 d10ef132b14af..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 @@ -199,9 +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( - new AggTestConfig(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 dee748bbcb11a..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; @@ -128,7 +127,7 @@ public void testEmptyParentBucket() throws Exception { SamplerAggregationBuilder sampler = new SamplerAggregationBuilder("sampler").subAggregation(samplerChild); samplerParent.subAggregation(sampler); - InternalFilters response = searchAndReduce(new AggTestConfig(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/RareTermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregatorTests.java index 894f9fba954b5..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,9 +365,7 @@ public void testGlobalAggregationWithScore() throws IOException { MappedFieldType fieldType = new KeywordFieldMapper.KeywordFieldType("keyword"); - InternalGlobal result = searchAndReduce( - new AggTestConfig(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()) { diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java index a1585fb8ae255..7a7b84d8fd711 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java @@ -483,9 +483,7 @@ private void testAllDocsWithoutStringField(String executionHint) throws IOExcept IndexSearcher searcher = newIndexSearcher(reader); SignificantTermsAggregationBuilder request = new SignificantTermsAggregationBuilder("f").field("f") .executionHint(executionHint); - SignificantStringTerms result = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), request, keywordField("f")) - ); + SignificantStringTerms result = searchAndReduce(new AggTestConfig(searcher, request, keywordField("f"))); assertThat(result.getSubsetSize(), equalTo(1L)); } } @@ -505,9 +503,7 @@ public void testAllDocsWithoutNumericField() throws IOException { try (IndexReader reader = maybeWrapReaderEs(writer.getReader())) { IndexSearcher searcher = newIndexSearcher(reader); SignificantTermsAggregationBuilder request = new SignificantTermsAggregationBuilder("f").field("f"); - SignificantLongTerms result = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), request, longField("f")) - ); + SignificantLongTerms result = searchAndReduce(new AggTestConfig(searcher, request, longField("f"))); assertThat(result.getSubsetSize(), equalTo(1L)); } } @@ -539,9 +535,7 @@ private void testSomeDocsWithoutStringField(String executionHint) throws IOExcep IndexSearcher searcher = newIndexSearcher(reader); SignificantTermsAggregationBuilder request = new SignificantTermsAggregationBuilder("f").field("f") .executionHint(executionHint); - SignificantStringTerms result = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), request, keywordField("f")) - ); + SignificantStringTerms result = searchAndReduce(new AggTestConfig(searcher, request, keywordField("f"))); assertThat(result.getSubsetSize(), equalTo(2L)); } } @@ -563,9 +557,7 @@ public void testSomeDocsWithoutNumericField() throws IOException { try (IndexReader reader = maybeWrapReaderEs(writer.getReader())) { IndexSearcher searcher = newIndexSearcher(reader); SignificantTermsAggregationBuilder request = new SignificantTermsAggregationBuilder("f").field("f"); - SignificantLongTerms result = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), request, longField("f")) - ); + SignificantLongTerms result = searchAndReduce(new AggTestConfig(searcher, request, longField("f"))); assertThat(result.getSubsetSize(), equalTo(2L)); } } @@ -608,14 +600,7 @@ private void threeLayerStringTestCase(String executionHint) throws IOException { .executionHint(executionHint) .subAggregation(jRequest); SignificantStringTerms result = searchAndReduce( - new AggTestConfig( - searcher, - new MatchAllDocsQuery(), - request, - keywordField("i"), - keywordField("j"), - keywordField("k") - ) + new AggTestConfig(searcher, request, keywordField("i"), keywordField("j"), keywordField("k")) ); assertThat(result.getSubsetSize(), equalTo(1000L)); for (int i = 0; i < 10; i++) { @@ -664,7 +649,7 @@ public void testThreeLayerLong() throws IOException { .subAggregation(new SignificantTermsAggregationBuilder("k").field("k").minDocCount(0)) ); SignificantLongTerms result = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), request, longField("i"), longField("j"), longField("k")) + new AggTestConfig(searcher, request, longField("i"), longField("j"), longField("k")) ); assertThat(result.getSubsetSize(), equalTo(1000L)); for (int i = 0; i < 10; i++) { diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregatorTests.java index 5d164f37e050d..01d5fe62711e8 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregatorTests.java @@ -19,7 +19,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.apache.lucene.util.BytesRef; @@ -277,9 +276,7 @@ public void testInsideTermsAgg() throws IOException { assertEquals("test expects a single segment", 1, reader.leaves().size()); IndexSearcher searcher = new IndexSearcher(reader); - StringTerms terms = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, textFieldType, keywordField("kwd")) - ); + StringTerms terms = searchAndReduce(new AggTestConfig(searcher, aggBuilder, textFieldType, keywordField("kwd"))); SignificantTerms sigOdd = terms.getBucketByKey("odd").getAggregations().get("sig_text"); assertNull(sigOdd.getBucketByKey("even")); assertNull(sigOdd.getBucketByKey("duplicate")); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java index 3aac2137e1434..20c850eb503fb 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java @@ -400,9 +400,7 @@ public void testDelaysSubAggs() throws Exception { * lets us create a fairly small test index. */ int maxBuckets = 200; - StringTerms result = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), aggregationBuilder, s1ft, s2ft).withMaxBuckets(maxBuckets) - ); + StringTerms result = searchAndReduce(new AggTestConfig(searcher, aggregationBuilder, s1ft, s2ft).withMaxBuckets(maxBuckets)); assertThat( result.getBuckets().stream().map(StringTerms.Bucket::getKey).collect(toList()), equalTo(List.of("b007", "b107", "b207", "b307", "b407", "b507", "b607", "b707", "b807", "b907", "b000")) @@ -1373,9 +1371,7 @@ public void testGlobalAggregationWithScore() throws IOException { MappedFieldType fieldType = new KeywordFieldMapper.KeywordFieldType("keyword"); - InternalGlobal result = searchAndReduce( - new AggTestConfig(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()) { @@ -1709,7 +1705,7 @@ private void threeLayerStringTestCase(String executionHint) throws IOException { .executionHint(executionHint) .subAggregation(new TermsAggregationBuilder("k").field("k").executionHint(executionHint)) ); - StringTerms result = searchAndReduce(new AggTestConfig(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)); @@ -1750,7 +1746,7 @@ public void testThreeLayerLong() throws IOException { new TermsAggregationBuilder("j").field("j").subAggregation(new TermsAggregationBuilder("k").field("k")) ); LongTerms result = searchAndReduce( - new AggTestConfig(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)); @@ -1890,7 +1886,6 @@ public void testOrderByCardinality() throws IOException { LongTerms terms = searchAndReduce( new AggTestConfig( indexSearcher, - new MatchAllDocsQuery(), aggregationBuilder, new NumberFieldMapper.NumberFieldType("a", NumberFieldMapper.NumberType.INTEGER), bIsString 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 074e42f8c4a7f..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(new AggTestConfig(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(new AggTestConfig(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(new AggTestConfig(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(new AggTestConfig(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(new AggTestConfig(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 28ab947d0fc38..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(new AggTestConfig(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(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType)); + InternalGeoCentroid result = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertNull(result.centroid()); fieldType = new GeoPointFieldMapper.GeoPointFieldType("another_field"); - result = searchAndReduce(new AggTestConfig(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(new AggTestConfig(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(new AggTestConfig(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 da9ffe9452f31..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(new AggTestConfig(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(new AggTestConfig(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 e9f88ad798d9b..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(new AggTestConfig(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(new AggTestConfig(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 b60f2a3dd4e2c..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,7 +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( - new AggTestConfig(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder) + new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder) ); assertEquals(AGG_NAME, scriptedMetric.getName()); assertNotNull(scriptedMetric.aggregation()); @@ -311,9 +311,7 @@ public void testScriptedMetricWithoutCombine() throws IOException { aggregationBuilder.initScript(INIT_SCRIPT).mapScript(MAP_SCRIPT).reduceScript(REDUCE_SCRIPT); IllegalArgumentException exception = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce( - new AggTestConfig(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,9 +331,7 @@ public void testScriptedMetricWithoutReduce() throws IOException { aggregationBuilder.initScript(INIT_SCRIPT).mapScript(MAP_SCRIPT).combineScript(COMBINE_SCRIPT); IllegalArgumentException exception = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce( - new AggTestConfig(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder) - ) + () -> searchAndReduce(new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder)) ); assertEquals(exception.getMessage(), "[reduceScript] must not be null: [scriptedMetric]"); } @@ -357,7 +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( - new AggTestConfig(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder) + new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder) ); assertEquals(AGG_NAME, scriptedMetric.getName()); assertNotNull(scriptedMetric.aggregation()); @@ -384,7 +380,7 @@ public void testScriptedMetricWithCombineAccessesScores() throws IOException { .combineScript(COMBINE_SCRIPT_SCORE) .reduceScript(REDUCE_SCRIPT); ScriptedMetric scriptedMetric = searchAndReduce( - new AggTestConfig(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder) + new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder) ); assertEquals(AGG_NAME, scriptedMetric.getName()); assertNotNull(scriptedMetric.aggregation()); @@ -411,7 +407,7 @@ public void testScriptParamsPassedThrough() throws IOException { .combineScript(COMBINE_SCRIPT_PARAMS) .reduceScript(REDUCE_SCRIPT); ScriptedMetric scriptedMetric = searchAndReduce( - new AggTestConfig(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder) + new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder) ); // The result value depends on the script params. @@ -440,7 +436,7 @@ public void testAggParamsPassedToReduceScript() throws IOException { .combineScript(COMBINE_SCRIPT_PARAMS) .reduceScript(REDUCE_SCRIPT_PARAMS); ScriptedMetric scriptedMetric = searchAndReduce( - new AggTestConfig(newSearcher(indexReader, true, true), new MatchAllDocsQuery(), aggregationBuilder).withMaxBuckets(0) + new AggTestConfig(newSearcher(indexReader, true, true), aggregationBuilder).withMaxBuckets(0) ); // The result value depends on the script params. @@ -468,9 +464,7 @@ public void testConflictingAggAndScriptParams() throws IOException { IllegalArgumentException ex = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce( - new AggTestConfig(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", @@ -494,9 +488,7 @@ public void testSelfReferencingAggStateAfterInit() throws IOException { IllegalArgumentException ex = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce( - new AggTestConfig(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()); } @@ -520,9 +512,7 @@ public void testSelfReferencingAggStateAfterMap() throws IOException { IllegalArgumentException ex = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce( - new AggTestConfig(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()); } @@ -543,9 +533,7 @@ public void testSelfReferencingAggStateAfterCombine() throws IOException { IllegalArgumentException ex = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce( - new AggTestConfig(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 80e0a7c66f2a2..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(new AggTestConfig(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 259204324ff5b..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(new AggTestConfig(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 9b6f9d3d09195..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(new AggTestConfig(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(new AggTestConfig(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/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java index caa69944ac5b8..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 @@ -1423,10 +1423,18 @@ public record AggTestConfig( 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); } 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 79b51266248a2..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,9 +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( - new AggTestConfig(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()); @@ -80,9 +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( - new AggTestConfig(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()); @@ -111,9 +106,7 @@ public void testHistogramWithDocCountField() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - new AggTestConfig(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()); } @@ -135,9 +128,7 @@ public void testRandomOffset() throws Exception { .minDocCount(1); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - new AggTestConfig(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()); @@ -165,9 +156,7 @@ public void testExtendedBounds() throws Exception { .extendedBounds(-12, 13); try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); - InternalHistogram histogram = searchAndReduce( - new AggTestConfig(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()); @@ -199,9 +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( - new AggTestConfig(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()); @@ -228,7 +215,7 @@ public void testSubAggs() throws Exception { IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce(new AggTestConfig(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 50b16b047275f..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,10 +67,10 @@ public void testPercentilesAccuracy() throws Exception { RangeAggregationBuilder rawFieldAgg = new RangeAggregationBuilder("my_agg").field(RAW_FIELD_NAME); Percentiles rawPercentileResults = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), rawPercentiles, defaultFieldType(RAW_FIELD_NAME)) + new AggTestConfig(searcher, rawPercentiles, defaultFieldType(RAW_FIELD_NAME)) ); Percentiles aggregatedPercentileResults = searchAndReduce( - new AggTestConfig(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])); @@ -87,10 +86,10 @@ public void testPercentilesAccuracy() throws Exception { rawFieldAgg.addUnboundedFrom(rawPercentileResults.percentile(steps[steps.length - 1])); InternalRange range = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME)) + new AggTestConfig(searcher, aggBuilder, defaultFieldType(HISTO_FIELD_NAME)) ); InternalRange rawRange = searchAndReduce( - new AggTestConfig(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()); @@ -173,10 +172,10 @@ private void testRanges(List ranges, String name) throws }); InternalRange range = searchAndReduce( - new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, defaultFieldType(HISTO_FIELD_NAME)) + new AggTestConfig(searcher, aggBuilder, defaultFieldType(HISTO_FIELD_NAME)) ); InternalRange rawRange = searchAndReduce( - new AggTestConfig(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()); @@ -220,7 +219,7 @@ public void testOverlapping() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); InternalRange range = searchAndReduce( - new AggTestConfig(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()); @@ -279,7 +278,7 @@ public void testNonOverlapping() throws Exception { try (IndexReader reader = w.getReader()) { IndexSearcher searcher = new IndexSearcher(reader); InternalRange range = searchAndReduce( - new AggTestConfig(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()); @@ -312,9 +311,7 @@ public void testSubAggs() throws Exception { IndexSearcher searcher = new IndexSearcher(reader); IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> searchAndReduce( - new AggTestConfig(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 4c64a2d5bf626..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(new AggTestConfig(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 e9dd0720a1721..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(new AggTestConfig(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/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 93ef11618a829..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,9 +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( - new AggTestConfig(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 ef0c84f415957..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(new AggTestConfig(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(new AggTestConfig(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(new AggTestConfig(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(new AggTestConfig(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(new AggTestConfig(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 074951fa75ca8..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(new AggTestConfig(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(new AggTestConfig(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(new AggTestConfig(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(new AggTestConfig(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(new AggTestConfig(searcher, new MatchAllDocsQuery(), aggBuilder, fieldType)); + InternalGeoCentroid result = searchAndReduce(new AggTestConfig(searcher, aggBuilder, fieldType)); assertEquals("my_agg", result.getName()); SpatialPoint centroid = result.centroid();