Skip to content

Commit 475a0ce

Browse files
csoulioscsoulios
authored
ValuesSource refactoring: Wire up ExtendedStats aggregation (#53227)
1 parent 1c8dc5d commit 475a0ce

File tree

4 files changed

+87
-27
lines changed

4 files changed

+87
-27
lines changed

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

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -347,37 +347,39 @@ private void registerAggregations(List<SearchPlugin> plugins) {
347347
.addResultReader(InternalSum::new)
348348
.setAggregatorRegistrar(SumAggregationBuilder::registerAggregators));
349349
registerAggregation(new AggregationSpec(MinAggregationBuilder.NAME, MinAggregationBuilder::new, MinAggregationBuilder.PARSER)
350-
.addResultReader(InternalMin::new)
351-
.setAggregatorRegistrar(MinAggregationBuilder::registerAggregators));
350+
.addResultReader(InternalMin::new)
351+
.setAggregatorRegistrar(MinAggregationBuilder::registerAggregators));
352352
registerAggregation(new AggregationSpec(MaxAggregationBuilder.NAME, MaxAggregationBuilder::new, MaxAggregationBuilder.PARSER)
353-
.addResultReader(InternalMax::new)
354-
.setAggregatorRegistrar(MaxAggregationBuilder::registerAggregators));
353+
.addResultReader(InternalMax::new)
354+
.setAggregatorRegistrar(MaxAggregationBuilder::registerAggregators));
355355
registerAggregation(new AggregationSpec(StatsAggregationBuilder.NAME, StatsAggregationBuilder::new, StatsAggregationBuilder.PARSER)
356356
.addResultReader(InternalStats::new)
357357
.setAggregatorRegistrar(StatsAggregationBuilder::registerAggregators));
358358
registerAggregation(new AggregationSpec(ExtendedStatsAggregationBuilder.NAME, ExtendedStatsAggregationBuilder::new,
359-
ExtendedStatsAggregationBuilder.PARSER).addResultReader(InternalExtendedStats::new));
359+
ExtendedStatsAggregationBuilder.PARSER)
360+
.addResultReader(InternalExtendedStats::new)
361+
.setAggregatorRegistrar(ExtendedStatsAggregationBuilder::registerAggregators));
360362
registerAggregation(new AggregationSpec(ValueCountAggregationBuilder.NAME, ValueCountAggregationBuilder::new,
361-
ValueCountAggregationBuilder.PARSER)
362-
.addResultReader(InternalValueCount::new)
363-
.setAggregatorRegistrar(ValueCountAggregationBuilder::registerAggregators));
363+
ValueCountAggregationBuilder.PARSER)
364+
.addResultReader(InternalValueCount::new)
365+
.setAggregatorRegistrar(ValueCountAggregationBuilder::registerAggregators));
364366
registerAggregation(new AggregationSpec(PercentilesAggregationBuilder.NAME, PercentilesAggregationBuilder::new,
365-
PercentilesAggregationBuilder.PARSER)
366-
.addResultReader(InternalTDigestPercentiles.NAME, InternalTDigestPercentiles::new)
367-
.addResultReader(InternalHDRPercentiles.NAME, InternalHDRPercentiles::new)
368-
.setAggregatorRegistrar(PercentilesAggregationBuilder::registerAggregators));
367+
PercentilesAggregationBuilder.PARSER)
368+
.addResultReader(InternalTDigestPercentiles.NAME, InternalTDigestPercentiles::new)
369+
.addResultReader(InternalHDRPercentiles.NAME, InternalHDRPercentiles::new)
370+
.setAggregatorRegistrar(PercentilesAggregationBuilder::registerAggregators));
369371
registerAggregation(new AggregationSpec(PercentileRanksAggregationBuilder.NAME, PercentileRanksAggregationBuilder::new,
370-
PercentileRanksAggregationBuilder.PARSER)
371-
.addResultReader(InternalTDigestPercentileRanks.NAME, InternalTDigestPercentileRanks::new)
372-
.addResultReader(InternalHDRPercentileRanks.NAME, InternalHDRPercentileRanks::new)
373-
.setAggregatorRegistrar(PercentileRanksAggregationBuilder::registerAggregators));
372+
PercentileRanksAggregationBuilder.PARSER)
373+
.addResultReader(InternalTDigestPercentileRanks.NAME, InternalTDigestPercentileRanks::new)
374+
.addResultReader(InternalHDRPercentileRanks.NAME, InternalHDRPercentileRanks::new)
375+
.setAggregatorRegistrar(PercentileRanksAggregationBuilder::registerAggregators));
374376
registerAggregation(new AggregationSpec(MedianAbsoluteDeviationAggregationBuilder.NAME,
375377
MedianAbsoluteDeviationAggregationBuilder::new, MedianAbsoluteDeviationAggregationBuilder.PARSER)
376378
.addResultReader(InternalMedianAbsoluteDeviation::new)
377379
.setAggregatorRegistrar(MedianAbsoluteDeviationAggregationBuilder::registerAggregators));
378380
registerAggregation(new AggregationSpec(CardinalityAggregationBuilder.NAME, CardinalityAggregationBuilder::new,
379-
CardinalityAggregationBuilder.PARSER).addResultReader(InternalCardinality::new)
380-
.setAggregatorRegistrar(CardinalityAggregationBuilder::registerAggregators));
381+
CardinalityAggregationBuilder.PARSER).addResultReader(InternalCardinality::new)
382+
.setAggregatorRegistrar(CardinalityAggregationBuilder::registerAggregators));
381383
registerAggregation(new AggregationSpec(GlobalAggregationBuilder.NAME, GlobalAggregationBuilder::new,
382384
GlobalAggregationBuilder::parse).addResultReader(InternalGlobal::new));
383385
registerAggregation(new AggregationSpec(MissingAggregationBuilder.NAME, MissingAggregationBuilder::new,

‎server/src/main/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregationBuilder.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.elasticsearch.search.aggregations.support.ValuesSource;
3232
import org.elasticsearch.search.aggregations.support.ValuesSourceAggregationBuilder;
3333
import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
34+
import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry;
3435
import org.elasticsearch.search.aggregations.support.ValuesSourceType;
3536

3637
import java.io.IOException;
@@ -48,6 +49,9 @@ public class ExtendedStatsAggregationBuilder
4849
PARSER.declareDouble(ExtendedStatsAggregationBuilder::sigma, ExtendedStatsAggregator.SIGMA_FIELD);
4950
}
5051

52+
public static void registerAggregators(ValuesSourceRegistry valuesSourceRegistry) {
53+
ExtendedStatsAggregatorFactory.registerAggregators(valuesSourceRegistry);
54+
}
5155
private double sigma = 2.0;
5256

5357
public ExtendedStatsAggregationBuilder(String name) {

‎server/src/main/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregatorFactory.java‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,13 @@
2525
import org.elasticsearch.search.aggregations.AggregatorFactories;
2626
import org.elasticsearch.search.aggregations.AggregatorFactory;
2727
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
28+
import org.elasticsearch.search.aggregations.support.AggregatorSupplier;
29+
import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
2830
import org.elasticsearch.search.aggregations.support.ValuesSource;
2931
import org.elasticsearch.search.aggregations.support.ValuesSource.Numeric;
3032
import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
3133
import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
34+
import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry;
3235
import org.elasticsearch.search.internal.SearchContext;
3336

3437
import java.io.IOException;
@@ -50,6 +53,12 @@ class ExtendedStatsAggregatorFactory extends ValuesSourceAggregatorFactory {
5053
this.sigma = sigma;
5154
}
5255

56+
static void registerAggregators(ValuesSourceRegistry valuesSourceRegistry) {
57+
valuesSourceRegistry.register(ExtendedStatsAggregationBuilder.NAME,
58+
List.of(CoreValuesSourceType.NUMERIC, CoreValuesSourceType.DATE, CoreValuesSourceType.BOOLEAN),
59+
(ExtendedStatsAggregatorProvider) ExtendedStatsAggregator::new);
60+
}
61+
5362
@Override
5463
protected Aggregator createUnmapped(SearchContext searchContext,
5564
Aggregator parent,
@@ -61,16 +70,19 @@ protected Aggregator createUnmapped(SearchContext searchContext,
6170

6271
@Override
6372
protected Aggregator doCreateInternal(ValuesSource valuesSource,
64-
SearchContext searchContext,
65-
Aggregator parent,
66-
boolean collectsFromSingleBucket,
67-
List<PipelineAggregator> pipelineAggregators,
68-
Map<String, Object> metaData) throws IOException {
69-
if (valuesSource instanceof Numeric == false) {
70-
throw new AggregationExecutionException("ValuesSource type " + valuesSource.toString() + "is not supported for aggregation " +
71-
this.name());
73+
SearchContext searchContext,
74+
Aggregator parent,
75+
boolean collectsFromSingleBucket,
76+
List<PipelineAggregator> pipelineAggregators,
77+
Map<String, Object> metaData) throws IOException {
78+
AggregatorSupplier aggregatorSupplier = queryShardContext.getValuesSourceRegistry().getAggregator(config.valueSourceType(),
79+
ExtendedStatsAggregationBuilder.NAME);
80+
81+
if (aggregatorSupplier instanceof ExtendedStatsAggregatorProvider == false) {
82+
throw new AggregationExecutionException("Registry miss-match - expected ExtendedStatsAggregatorProvider, found [" +
83+
aggregatorSupplier.getClass().toString() + "]");
7284
}
73-
return new ExtendedStatsAggregator(name, (Numeric) valuesSource, config.format(), searchContext,
85+
return ((ExtendedStatsAggregatorProvider) aggregatorSupplier).build(name, (Numeric) valuesSource, config.format(), searchContext,
7486
parent, sigma, pipelineAggregators, metaData);
7587
}
7688
}

‎server/src/main/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregatorProvider.java‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Licensed to Elasticsearch under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package org.elasticsearch.search.aggregations.metrics;
20+
21+
import org.elasticsearch.search.DocValueFormat;
22+
import org.elasticsearch.search.aggregations.Aggregator;
23+
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
24+
import org.elasticsearch.search.aggregations.support.AggregatorSupplier;
25+
import org.elasticsearch.search.aggregations.support.ValuesSource;
26+
import org.elasticsearch.search.internal.SearchContext;
27+
28+
import java.io.IOException;
29+
import java.util.List;
30+
import java.util.Map;
31+
32+
public interface ExtendedStatsAggregatorProvider extends AggregatorSupplier {
33+
34+
Aggregator build(String name,
35+
ValuesSource.Numeric valuesSource,
36+
DocValueFormat formatter,
37+
SearchContext context,
38+
Aggregator parent,
39+
double sigma,
40+
List<PipelineAggregator> pipelineAggregators,
41+
Map<String, Object> metaData) throws IOException;
42+
}

0 commit comments

Comments
 (0)