forked from elastic/elasticsearch
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add parsing methods for Percentiles aggregations (elastic#24183)
- Loading branch information
Showing
14 changed files
with
407 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
...a/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.search.aggregations.metrics.percentiles.hdr; | ||
|
|
||
| import org.elasticsearch.common.xcontent.ObjectParser; | ||
| import org.elasticsearch.common.xcontent.XContentParser; | ||
| import org.elasticsearch.search.aggregations.metrics.percentiles.ParsedPercentiles; | ||
| import org.elasticsearch.search.aggregations.metrics.percentiles.Percentiles; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public class ParsedHDRPercentiles extends ParsedPercentiles implements Percentiles { | ||
|
|
||
| @Override | ||
| protected String getType() { | ||
| return InternalHDRPercentiles.NAME; | ||
| } | ||
|
|
||
| @Override | ||
| public double percentile(double percent) { | ||
| return getPercentile(percent); | ||
| } | ||
|
|
||
| @Override | ||
| public String percentileAsString(double percent) { | ||
| return getPercentileAsString(percent); | ||
| } | ||
|
|
||
| private static ObjectParser<ParsedHDRPercentiles, Void> PARSER = | ||
| new ObjectParser<>(ParsedHDRPercentiles.class.getSimpleName(), true, ParsedHDRPercentiles::new); | ||
| static { | ||
| ParsedPercentiles.declarePercentilesFields(PARSER); | ||
| } | ||
|
|
||
| public static ParsedHDRPercentiles fromXContent(XContentParser parser, String name) throws IOException { | ||
| ParsedHDRPercentiles aggregation = PARSER.parse(parser, null); | ||
| aggregation.setName(name); | ||
| return aggregation; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
...asticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.search.aggregations.metrics.percentiles.tdigest; | ||
|
|
||
| import org.elasticsearch.common.xcontent.ObjectParser; | ||
| import org.elasticsearch.common.xcontent.XContentParser; | ||
| import org.elasticsearch.search.aggregations.metrics.percentiles.ParsedPercentiles; | ||
| import org.elasticsearch.search.aggregations.metrics.percentiles.Percentiles; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public class ParsedTDigestPercentiles extends ParsedPercentiles implements Percentiles { | ||
|
|
||
| @Override | ||
| protected String getType() { | ||
| return InternalTDigestPercentiles.NAME; | ||
| } | ||
|
|
||
| @Override | ||
| public double percentile(double percent) { | ||
| return getPercentile(percent); | ||
| } | ||
|
|
||
| @Override | ||
| public String percentileAsString(double percent) { | ||
| return getPercentileAsString(percent); | ||
| } | ||
|
|
||
| private static ObjectParser<ParsedTDigestPercentiles, Void> PARSER = | ||
| new ObjectParser<>(ParsedTDigestPercentiles.class.getSimpleName(), true, ParsedTDigestPercentiles::new); | ||
| static { | ||
| ParsedPercentiles.declarePercentilesFields(PARSER); | ||
| } | ||
|
|
||
| public static ParsedTDigestPercentiles fromXContent(XContentParser parser, String name) throws IOException { | ||
| ParsedTDigestPercentiles aggregation = PARSER.parse(parser, null); | ||
| aggregation.setName(name); | ||
| return aggregation; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
...rg/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.search.aggregations.metrics.percentiles; | ||
|
|
||
| import com.carrotsearch.randomizedtesting.annotations.Repeat; | ||
| import org.elasticsearch.common.xcontent.XContentType; | ||
| import org.elasticsearch.search.DocValueFormat; | ||
| import org.elasticsearch.search.aggregations.InternalAggregation; | ||
| import org.elasticsearch.search.aggregations.InternalAggregationTestCase; | ||
| import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; | ||
| import org.junit.Before; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| public abstract class AbstractPercentilesTestCase<T extends InternalAggregation & Iterable<Percentile>> | ||
| extends InternalAggregationTestCase<T> { | ||
|
|
||
| private double[] percents; | ||
| private boolean keyed; | ||
| private DocValueFormat docValueFormat; | ||
|
|
||
| @Before | ||
| public void init() { | ||
| percents = randomPercents(); | ||
| keyed = randomBoolean(); | ||
| docValueFormat = randomNumericDocValueFormat(); | ||
| } | ||
|
|
||
| @Override | ||
| protected T createTestInstance(String name, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) { | ||
| int numValues = randomInt(100); | ||
| double[] values = new double[numValues]; | ||
| for (int i = 0; i < numValues; ++i) { | ||
| values[i] = randomDouble(); | ||
| } | ||
| return createTestInstance(name, pipelineAggregators, metaData, keyed, docValueFormat, percents, values); | ||
| } | ||
|
|
||
| protected abstract T createTestInstance(String name, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData, | ||
| boolean keyed, DocValueFormat format, double[] percents, double[] values); | ||
|
|
||
| protected abstract Class<? extends ParsedPercentiles> implementationClass(); | ||
|
|
||
| @Repeat(iterations = 1000) | ||
| public void testPercentilesIterators() throws IOException { | ||
| final T aggregation = createTestInstance(); | ||
| final Iterable<Percentile> parsedAggregation = parse(aggregation, randomFrom(XContentType.values()), randomBoolean(), false); | ||
|
|
||
| Iterator<Percentile> it = aggregation.iterator(); | ||
| Iterator<Percentile> parsedIt = parsedAggregation.iterator(); | ||
| while (it.hasNext()) { | ||
| assertEquals(it.next(), parsedIt.next()); | ||
| } | ||
| } | ||
|
|
||
| private static double[] randomPercents() { | ||
| List<Double> randomCdfValues = randomSubsetOf(randomIntBetween(1, 7), 0.01d, 0.05d, 0.25d, 0.50d, 0.75d, 0.95d, 0.99d); | ||
| double[] percents = new double[randomCdfValues.size()]; | ||
| for (int i = 0; i < randomCdfValues.size(); i++) { | ||
| percents[i] = randomCdfValues.get(i); | ||
| } | ||
| return percents; | ||
| } | ||
| } |
Oops, something went wrong.