Skip to content

Commit 299d044

Browse files
polyfractalpolyfractal
authored
Collapse pipeline aggs into single package (#34658)
- Restrict visibility of Aggregators and Factories - Move PipelineAggregatorBuilders up a level so it is consistent with AggregatorBuilders - Checkstyle line length fixes for a few classes - Minor odds/ends (swapping to method references, formatting, etc)
1 parent 067d135 commit 299d044

File tree

120 files changed

+344
-461
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+344
-461
lines changed

‎buildSrc/src/main/resources/checkstyle_suppressions.xml

-3
Original file line numberDiff line numberDiff line change
@@ -614,9 +614,6 @@
614614
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]bucket[/\\]TermsDocCountErrorIT.java" checks="LineLength" />
615615
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]bucket[/\\]TermsShardMinDocCountIT.java" checks="LineLength" />
616616
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]bucket[/\\]nested[/\\]NestedAggregatorTests.java" checks="LineLength" />
617-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]pipeline[/\\]ExtendedStatsBucketIT.java" checks="LineLength" />
618-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]pipeline[/\\]moving[/\\]avg[/\\]MovAvgIT.java" checks="LineLength" />
619-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]pipeline[/\\]serialdiff[/\\]SerialDiffIT.java" checks="LineLength" />
620617
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]basic[/\\]SearchWhileCreatingIndexIT.java" checks="LineLength" />
621618
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]basic[/\\]SearchWhileRelocatingIT.java" checks="LineLength" />
622619
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]basic[/\\]SearchWithRandomExceptionsIT.java" checks="LineLength" />

‎client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,16 @@
156156
import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
157157
import org.elasticsearch.search.aggregations.pipeline.InternalSimpleValue;
158158
import org.elasticsearch.search.aggregations.pipeline.ParsedSimpleValue;
159-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.InternalBucketMetricValue;
160-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.ParsedBucketMetricValue;
161-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.percentile.ParsedPercentilesBucket;
162-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.percentile.PercentilesBucketPipelineAggregationBuilder;
163-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.stats.ParsedStatsBucket;
164-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.stats.StatsBucketPipelineAggregationBuilder;
165-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.stats.extended.ExtendedStatsBucketPipelineAggregationBuilder;
166-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.stats.extended.ParsedExtendedStatsBucket;
167-
import org.elasticsearch.search.aggregations.pipeline.derivative.DerivativePipelineAggregationBuilder;
168-
import org.elasticsearch.search.aggregations.pipeline.derivative.ParsedDerivative;
159+
import org.elasticsearch.search.aggregations.pipeline.InternalBucketMetricValue;
160+
import org.elasticsearch.search.aggregations.pipeline.ParsedBucketMetricValue;
161+
import org.elasticsearch.search.aggregations.pipeline.ParsedPercentilesBucket;
162+
import org.elasticsearch.search.aggregations.pipeline.PercentilesBucketPipelineAggregationBuilder;
163+
import org.elasticsearch.search.aggregations.pipeline.ParsedStatsBucket;
164+
import org.elasticsearch.search.aggregations.pipeline.StatsBucketPipelineAggregationBuilder;
165+
import org.elasticsearch.search.aggregations.pipeline.ExtendedStatsBucketPipelineAggregationBuilder;
166+
import org.elasticsearch.search.aggregations.pipeline.ParsedExtendedStatsBucket;
167+
import org.elasticsearch.search.aggregations.pipeline.DerivativePipelineAggregationBuilder;
168+
import org.elasticsearch.search.aggregations.pipeline.ParsedDerivative;
169169
import org.elasticsearch.search.suggest.Suggest;
170170
import org.elasticsearch.search.suggest.completion.CompletionSuggestion;
171171
import org.elasticsearch.search.suggest.completion.CompletionSuggestionBuilder;

‎docs/reference/migration/migrate_7_0/java.asciidoc

+6
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ appropriate request directly.
2222
* All classes present in `org.elasticsearch.search.aggregations.metrics.*` packages
2323
were moved to a single `org.elasticsearch.search.aggregations.metrics` package.
2424

25+
* All classes present in `org.elasticsearch.search.aggregations.pipeline.*` packages
26+
were moved to a single `org.elasticsearch.search.aggregations.pipeline` package. In
27+
addition, `org.elasticsearch.search.aggregations.pipeline.PipelineAggregationBuilders`
28+
was moved to `org.elasticsearch.search.aggregations.PipelineAggregationBuilders`
29+
30+
2531
[float]
2632
==== `Retry.withBackoff` methods with `Settings` removed
2733

‎modules/lang-expression/src/test/java/org/elasticsearch/script/expression/MoreExpressionTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
5454
import static org.elasticsearch.search.aggregations.AggregationBuilders.histogram;
5555
import static org.elasticsearch.search.aggregations.AggregationBuilders.sum;
56-
import static org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorBuilders.bucketScript;
56+
import static org.elasticsearch.search.aggregations.PipelineAggregatorBuilders.bucketScript;
5757
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
5858
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
5959
import static org.hamcrest.Matchers.equalTo;

‎modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.elasticsearch.rest.RestHandler;
4141
import org.elasticsearch.script.ScriptContext;
4242
import org.elasticsearch.script.ScriptEngine;
43-
import org.elasticsearch.search.aggregations.pipeline.movfn.MovingFunctionScript;
43+
import org.elasticsearch.search.aggregations.pipeline.MovingFunctionScript;
4444

4545
import java.util.ArrayList;
4646
import java.util.Arrays;

‎modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.aggs.movfn.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
# This file contains a whitelist for the Moving Function pipeline aggregator in core
2121

22-
class org.elasticsearch.search.aggregations.pipeline.movfn.MovingFunctions {
22+
class org.elasticsearch.search.aggregations.pipeline.MovingFunctions {
2323
double max(double[])
2424
double min(double[])
2525
double sum(double[])

‎server/src/main/java/org/elasticsearch/plugins/SearchPlugin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristic;
4343
import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicParser;
4444
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
45-
import org.elasticsearch.search.aggregations.pipeline.movavg.MovAvgPipelineAggregator;
46-
import org.elasticsearch.search.aggregations.pipeline.movavg.models.MovAvgModel;
45+
import org.elasticsearch.search.aggregations.pipeline.MovAvgPipelineAggregator;
46+
import org.elasticsearch.search.aggregations.pipeline.MovAvgModel;
4747
import org.elasticsearch.search.fetch.FetchSubPhase;
4848
import org.elasticsearch.search.fetch.subphase.highlight.Highlighter;
4949
import org.elasticsearch.search.rescore.RescorerBuilder;

‎server/src/main/java/org/elasticsearch/script/ScriptModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.elasticsearch.common.settings.ClusterSettings;
2323
import org.elasticsearch.common.settings.Settings;
2424
import org.elasticsearch.plugins.ScriptPlugin;
25-
import org.elasticsearch.search.aggregations.pipeline.movfn.MovingFunctionScript;
25+
import org.elasticsearch.search.aggregations.pipeline.MovingFunctionScript;
2626

2727
import java.util.Collections;
2828
import java.util.HashMap;

‎server/src/main/java/org/elasticsearch/search/SearchModule.java

+42-42
Original file line numberDiff line numberDiff line change
@@ -185,48 +185,48 @@
185185
import org.elasticsearch.search.aggregations.metrics.WeightedAvgAggregationBuilder;
186186
import org.elasticsearch.search.aggregations.pipeline.InternalSimpleValue;
187187
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
188-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.InternalBucketMetricValue;
189-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.avg.AvgBucketPipelineAggregationBuilder;
190-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.avg.AvgBucketPipelineAggregator;
191-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.max.MaxBucketPipelineAggregationBuilder;
192-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.max.MaxBucketPipelineAggregator;
193-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.min.MinBucketPipelineAggregationBuilder;
194-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.min.MinBucketPipelineAggregator;
195-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.percentile.InternalPercentilesBucket;
196-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.percentile.PercentilesBucketPipelineAggregationBuilder;
197-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.percentile.PercentilesBucketPipelineAggregator;
198-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.stats.InternalStatsBucket;
199-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.stats.StatsBucketPipelineAggregationBuilder;
200-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.stats.StatsBucketPipelineAggregator;
201-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.stats.extended.ExtendedStatsBucketParser;
202-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.stats.extended.ExtendedStatsBucketPipelineAggregationBuilder;
203-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.stats.extended.ExtendedStatsBucketPipelineAggregator;
204-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.stats.extended.InternalExtendedStatsBucket;
205-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.sum.SumBucketPipelineAggregationBuilder;
206-
import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.sum.SumBucketPipelineAggregator;
207-
import org.elasticsearch.search.aggregations.pipeline.bucketscript.BucketScriptPipelineAggregationBuilder;
208-
import org.elasticsearch.search.aggregations.pipeline.bucketscript.BucketScriptPipelineAggregator;
209-
import org.elasticsearch.search.aggregations.pipeline.bucketselector.BucketSelectorPipelineAggregationBuilder;
210-
import org.elasticsearch.search.aggregations.pipeline.bucketselector.BucketSelectorPipelineAggregator;
211-
import org.elasticsearch.search.aggregations.pipeline.bucketsort.BucketSortPipelineAggregationBuilder;
212-
import org.elasticsearch.search.aggregations.pipeline.bucketsort.BucketSortPipelineAggregator;
213-
import org.elasticsearch.search.aggregations.pipeline.cumulativesum.CumulativeSumPipelineAggregationBuilder;
214-
import org.elasticsearch.search.aggregations.pipeline.cumulativesum.CumulativeSumPipelineAggregator;
215-
import org.elasticsearch.search.aggregations.pipeline.derivative.DerivativePipelineAggregationBuilder;
216-
import org.elasticsearch.search.aggregations.pipeline.derivative.DerivativePipelineAggregator;
217-
import org.elasticsearch.search.aggregations.pipeline.derivative.InternalDerivative;
218-
import org.elasticsearch.search.aggregations.pipeline.movavg.MovAvgPipelineAggregationBuilder;
219-
import org.elasticsearch.search.aggregations.pipeline.movavg.MovAvgPipelineAggregator;
220-
import org.elasticsearch.search.aggregations.pipeline.movavg.models.EwmaModel;
221-
import org.elasticsearch.search.aggregations.pipeline.movavg.models.HoltLinearModel;
222-
import org.elasticsearch.search.aggregations.pipeline.movavg.models.HoltWintersModel;
223-
import org.elasticsearch.search.aggregations.pipeline.movavg.models.LinearModel;
224-
import org.elasticsearch.search.aggregations.pipeline.movavg.models.MovAvgModel;
225-
import org.elasticsearch.search.aggregations.pipeline.movavg.models.SimpleModel;
226-
import org.elasticsearch.search.aggregations.pipeline.movfn.MovFnPipelineAggregationBuilder;
227-
import org.elasticsearch.search.aggregations.pipeline.movfn.MovFnPipelineAggregator;
228-
import org.elasticsearch.search.aggregations.pipeline.serialdiff.SerialDiffPipelineAggregationBuilder;
229-
import org.elasticsearch.search.aggregations.pipeline.serialdiff.SerialDiffPipelineAggregator;
188+
import org.elasticsearch.search.aggregations.pipeline.InternalBucketMetricValue;
189+
import org.elasticsearch.search.aggregations.pipeline.AvgBucketPipelineAggregationBuilder;
190+
import org.elasticsearch.search.aggregations.pipeline.AvgBucketPipelineAggregator;
191+
import org.elasticsearch.search.aggregations.pipeline.MaxBucketPipelineAggregationBuilder;
192+
import org.elasticsearch.search.aggregations.pipeline.MaxBucketPipelineAggregator;
193+
import org.elasticsearch.search.aggregations.pipeline.MinBucketPipelineAggregationBuilder;
194+
import org.elasticsearch.search.aggregations.pipeline.MinBucketPipelineAggregator;
195+
import org.elasticsearch.search.aggregations.pipeline.InternalPercentilesBucket;
196+
import org.elasticsearch.search.aggregations.pipeline.PercentilesBucketPipelineAggregationBuilder;
197+
import org.elasticsearch.search.aggregations.pipeline.PercentilesBucketPipelineAggregator;
198+
import org.elasticsearch.search.aggregations.pipeline.InternalStatsBucket;
199+
import org.elasticsearch.search.aggregations.pipeline.StatsBucketPipelineAggregationBuilder;
200+
import org.elasticsearch.search.aggregations.pipeline.StatsBucketPipelineAggregator;
201+
import org.elasticsearch.search.aggregations.pipeline.ExtendedStatsBucketParser;
202+
import org.elasticsearch.search.aggregations.pipeline.ExtendedStatsBucketPipelineAggregationBuilder;
203+
import org.elasticsearch.search.aggregations.pipeline.ExtendedStatsBucketPipelineAggregator;
204+
import org.elasticsearch.search.aggregations.pipeline.InternalExtendedStatsBucket;
205+
import org.elasticsearch.search.aggregations.pipeline.SumBucketPipelineAggregationBuilder;
206+
import org.elasticsearch.search.aggregations.pipeline.SumBucketPipelineAggregator;
207+
import org.elasticsearch.search.aggregations.pipeline.BucketScriptPipelineAggregationBuilder;
208+
import org.elasticsearch.search.aggregations.pipeline.BucketScriptPipelineAggregator;
209+
import org.elasticsearch.search.aggregations.pipeline.BucketSelectorPipelineAggregationBuilder;
210+
import org.elasticsearch.search.aggregations.pipeline.BucketSelectorPipelineAggregator;
211+
import org.elasticsearch.search.aggregations.pipeline.BucketSortPipelineAggregationBuilder;
212+
import org.elasticsearch.search.aggregations.pipeline.BucketSortPipelineAggregator;
213+
import org.elasticsearch.search.aggregations.pipeline.CumulativeSumPipelineAggregationBuilder;
214+
import org.elasticsearch.search.aggregations.pipeline.CumulativeSumPipelineAggregator;
215+
import org.elasticsearch.search.aggregations.pipeline.DerivativePipelineAggregationBuilder;
216+
import org.elasticsearch.search.aggregations.pipeline.DerivativePipelineAggregator;
217+
import org.elasticsearch.search.aggregations.pipeline.InternalDerivative;
218+
import org.elasticsearch.search.aggregations.pipeline.MovAvgPipelineAggregationBuilder;
219+
import org.elasticsearch.search.aggregations.pipeline.MovAvgPipelineAggregator;
220+
import org.elasticsearch.search.aggregations.pipeline.EwmaModel;
221+
import org.elasticsearch.search.aggregations.pipeline.HoltLinearModel;
222+
import org.elasticsearch.search.aggregations.pipeline.HoltWintersModel;
223+
import org.elasticsearch.search.aggregations.pipeline.LinearModel;
224+
import org.elasticsearch.search.aggregations.pipeline.MovAvgModel;
225+
import org.elasticsearch.search.aggregations.pipeline.SimpleModel;
226+
import org.elasticsearch.search.aggregations.pipeline.MovFnPipelineAggregationBuilder;
227+
import org.elasticsearch.search.aggregations.pipeline.MovFnPipelineAggregator;
228+
import org.elasticsearch.search.aggregations.pipeline.SerialDiffPipelineAggregationBuilder;
229+
import org.elasticsearch.search.aggregations.pipeline.SerialDiffPipelineAggregator;
230230
import org.elasticsearch.search.fetch.FetchPhase;
231231
import org.elasticsearch.search.fetch.FetchSubPhase;
232232
import org.elasticsearch.search.fetch.subphase.DocValueFieldsFetchSubPhase;

0 commit comments

Comments
 (0)