Skip to content

Merge Percentile interface with InternalPercentile class #24154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tlrx merged 1 commit into from
Apr 18, 2017
Merged

Merge Percentile interface with InternalPercentile class #24154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 0 additions & 41 deletions ...in/java/org/elasticsearch/search/aggregations/metrics/percentiles/InternalPercentile.java
View file
Open in desktop

This file was deleted.

37 changes: 34 additions & 3 deletions core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/Percentile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,41 @@

package org.elasticsearch.search.aggregations.metrics.percentiles;

public interface Percentile {
import java.util.Objects;

double getPercent();
public class Percentile {

double getValue();
private final double percent;
private final double value;

public Percentile(double percent, double value) {
this.percent = percent;
this.value = value;
}

public double getPercent() {
return percent;
}

public double getValue() {
return value;
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
Percentile that = (Percentile) o;
return Double.compare(that.percent, percent) == 0
&& Double.compare(that.value, value) == 0;
}

@Override
public int hashCode() {
return Objects.hash(percent, value);
}
}
3 changes: 1 addition & 2 deletions ...elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.HdrHistogram.DoubleHistogram;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.search.DocValueFormat;
import org.elasticsearch.search.aggregations.metrics.percentiles.InternalPercentile;
import org.elasticsearch.search.aggregations.metrics.percentiles.Percentile;
import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanks;
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
Expand Down Expand Up @@ -109,7 +108,7 @@ public boolean hasNext() {

@Override
public Percentile next() {
final Percentile next = new InternalPercentile(percentileRank(state, values[i]), values[i]);
final Percentile next = new Percentile(percentileRank(state, values[i]), values[i]);
++i;
return next;
}
Expand Down
3 changes: 1 addition & 2 deletions ...org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.HdrHistogram.DoubleHistogram;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.search.DocValueFormat;
import org.elasticsearch.search.aggregations.metrics.percentiles.InternalPercentile;
import org.elasticsearch.search.aggregations.metrics.percentiles.Percentile;
import org.elasticsearch.search.aggregations.metrics.percentiles.Percentiles;
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
Expand Down Expand Up @@ -99,7 +98,7 @@ public boolean hasNext() {

@Override
public Percentile next() {
final Percentile next = new InternalPercentile(percents[i], state.getValueAtPercentile(percents[i]));
final Percentile next = new Percentile(percents[i], state.getValueAtPercentile(percents[i]));
++i;
return next;
}
Expand Down
3 changes: 1 addition & 2 deletions ...earch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.search.DocValueFormat;
import org.elasticsearch.search.aggregations.metrics.percentiles.InternalPercentile;
import org.elasticsearch.search.aggregations.metrics.percentiles.Percentile;
import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanks;
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
Expand Down Expand Up @@ -106,7 +105,7 @@ public boolean hasNext() {

@Override
public Percentile next() {
final Percentile next = new InternalPercentile(percentileRank(state, values[i]), values[i]);
final Percentile next = new Percentile(percentileRank(state, values[i]), values[i]);
++i;
return next;
}
Expand Down
3 changes: 1 addition & 2 deletions ...ticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.search.DocValueFormat;
import org.elasticsearch.search.aggregations.metrics.percentiles.InternalPercentile;
import org.elasticsearch.search.aggregations.metrics.percentiles.Percentile;
import org.elasticsearch.search.aggregations.metrics.percentiles.Percentiles;
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
Expand Down Expand Up @@ -95,7 +94,7 @@ public boolean hasNext() {

@Override
public Percentile next() {
final Percentile next = new InternalPercentile(percents[i], state.quantile(percents[i] / 100));
final Percentile next = new Percentile(percents[i], state.quantile(percents[i] / 100));
++i;
return next;
}
Expand Down
3 changes: 1 addition & 2 deletions ...arch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.elasticsearch.search.aggregations.InternalAggregation;
import org.elasticsearch.search.aggregations.metrics.InternalNumericMetricsAggregation;
import org.elasticsearch.search.aggregations.metrics.max.InternalMax;
import org.elasticsearch.search.aggregations.metrics.percentiles.InternalPercentile;
import org.elasticsearch.search.aggregations.metrics.percentiles.Percentile;
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;

Expand Down Expand Up @@ -136,7 +135,7 @@ public boolean hasNext() {

@Override
public Percentile next() {
final Percentile next = new InternalPercentile(percents[i], percentiles[i]);
final Percentile next = new Percentile(percents[i], percentiles[i]);
++i;
return next;
}
Expand Down