Skip to content

Commit f9e5255

Browse files
authored
fix percentile aggregation tests (#50712)
1 parent 538bae1 commit f9e5255

File tree

4 files changed

+4
-28
lines changed

4 files changed

+4
-28
lines changed

server/src/main/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksAggregatorFactory.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020
package org.elasticsearch.search.aggregations.metrics;
2121

2222
import org.elasticsearch.index.query.QueryShardContext;
23-
import org.elasticsearch.search.aggregations.AggregationExecutionException;
2423
import org.elasticsearch.search.aggregations.Aggregator;
2524
import org.elasticsearch.search.aggregations.AggregatorFactories;
2625
import org.elasticsearch.search.aggregations.AggregatorFactory;
2726
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
2827
import org.elasticsearch.search.aggregations.support.ValuesSource;
29-
import org.elasticsearch.search.aggregations.support.ValuesSource.Numeric;
3028
import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
3129
import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
3230
import org.elasticsearch.search.internal.SearchContext;
@@ -67,11 +65,7 @@ protected Aggregator doCreateInternal(ValuesSource valuesSource,
6765
List<PipelineAggregator> pipelineAggregators,
6866
Map<String, Object> metaData) throws IOException {
6967

70-
if (valuesSource instanceof Numeric == false) {
71-
throw new AggregationExecutionException("ValuesSource type " + valuesSource.toString() + "is not supported for aggregation " +
72-
this.name());
73-
}
74-
return new HDRPercentileRanksAggregator(name, (Numeric) valuesSource, searchContext, parent, values,
68+
return new HDRPercentileRanksAggregator(name, valuesSource, searchContext, parent, values,
7569
numberOfSignificantValueDigits, keyed, config.format(), pipelineAggregators, metaData);
7670
}
7771

server/src/main/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesAggregatorFactory.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020
package org.elasticsearch.search.aggregations.metrics;
2121

2222
import org.elasticsearch.index.query.QueryShardContext;
23-
import org.elasticsearch.search.aggregations.AggregationExecutionException;
2423
import org.elasticsearch.search.aggregations.Aggregator;
2524
import org.elasticsearch.search.aggregations.AggregatorFactories;
2625
import org.elasticsearch.search.aggregations.AggregatorFactory;
2726
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
2827
import org.elasticsearch.search.aggregations.support.ValuesSource;
29-
import org.elasticsearch.search.aggregations.support.ValuesSource.Numeric;
3028
import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
3129
import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
3230
import org.elasticsearch.search.internal.SearchContext;
@@ -72,11 +70,7 @@ protected Aggregator doCreateInternal(ValuesSource valuesSource,
7270
boolean collectsFromSingleBucket,
7371
List<PipelineAggregator> pipelineAggregators,
7472
Map<String, Object> metaData) throws IOException {
75-
if (valuesSource instanceof Numeric == false) {
76-
throw new AggregationExecutionException("ValuesSource type " + valuesSource.toString() + "is not supported for aggregation " +
77-
this.name());
78-
}
79-
return new HDRPercentilesAggregator(name, (Numeric) valuesSource, searchContext, parent, percents, numberOfSignificantValueDigits,
73+
return new HDRPercentilesAggregator(name, valuesSource, searchContext, parent, percents, numberOfSignificantValueDigits,
8074
keyed, config.format(), pipelineAggregators, metaData);
8175
}
8276

server/src/main/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksAggregatorFactory.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020
package org.elasticsearch.search.aggregations.metrics;
2121

2222
import org.elasticsearch.index.query.QueryShardContext;
23-
import org.elasticsearch.search.aggregations.AggregationExecutionException;
2423
import org.elasticsearch.search.aggregations.Aggregator;
2524
import org.elasticsearch.search.aggregations.AggregatorFactories;
2625
import org.elasticsearch.search.aggregations.AggregatorFactory;
2726
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
2827
import org.elasticsearch.search.aggregations.support.ValuesSource;
29-
import org.elasticsearch.search.aggregations.support.ValuesSource.Numeric;
3028
import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
3129
import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
3230
import org.elasticsearch.search.internal.SearchContext;
@@ -73,11 +71,7 @@ protected Aggregator doCreateInternal(ValuesSource valuesSource,
7371
boolean collectsFromSingleBucket,
7472
List<PipelineAggregator> pipelineAggregators,
7573
Map<String, Object> metaData) throws IOException {
76-
if (valuesSource instanceof Numeric == false) {
77-
throw new AggregationExecutionException("ValuesSource type " + valuesSource.toString() + "is not supported for aggregation " +
78-
this.name());
79-
}
80-
return new TDigestPercentileRanksAggregator(name, (Numeric) valuesSource, searchContext, parent,
74+
return new TDigestPercentileRanksAggregator(name, valuesSource, searchContext, parent,
8175
percents, compression, keyed, config.format(), pipelineAggregators, metaData);
8276
}
8377

server/src/main/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesAggregatorFactory.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020
package org.elasticsearch.search.aggregations.metrics;
2121

2222
import org.elasticsearch.index.query.QueryShardContext;
23-
import org.elasticsearch.search.aggregations.AggregationExecutionException;
2423
import org.elasticsearch.search.aggregations.Aggregator;
2524
import org.elasticsearch.search.aggregations.AggregatorFactories;
2625
import org.elasticsearch.search.aggregations.AggregatorFactory;
2726
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
2827
import org.elasticsearch.search.aggregations.support.ValuesSource;
29-
import org.elasticsearch.search.aggregations.support.ValuesSource.Numeric;
3028
import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
3129
import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
3230
import org.elasticsearch.search.internal.SearchContext;
@@ -67,11 +65,7 @@ protected Aggregator doCreateInternal(ValuesSource valuesSource,
6765
boolean collectsFromSingleBucket,
6866
List<PipelineAggregator> pipelineAggregators,
6967
Map<String, Object> metaData) throws IOException {
70-
if (valuesSource instanceof Numeric == false) {
71-
throw new AggregationExecutionException("ValuesSource type " + valuesSource.toString() + "is not supported for aggregation " +
72-
this.name());
73-
}
74-
return new TDigestPercentilesAggregator(name, (Numeric) valuesSource, searchContext, parent, percents, compression, keyed,
68+
return new TDigestPercentilesAggregator(name, valuesSource, searchContext, parent, percents, compression, keyed,
7569
config.format(), pipelineAggregators, metaData);
7670
}
7771

0 commit comments

Comments
 (0)