Skip to content
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

Jump to bottom

SQL: use hasValue() methods from Elasticsearch's InspectionHelper classes #44745

Merged
merged 2 commits into from
Jul 24, 2019
Merged

SQL: use hasValue() methods from Elasticsearch's InspectionHelper classes #44745

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1e03f8
Use hasValue() methods from aggregations' InspectionHelpers to decide
astefan Jul 23, 2019
ebdf6be
Merge branch 'master' of https://github.com/elastic/elasticsearch int…
astefan Jul 23, 2019
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
48 changes: 32 additions & 16 deletions .../main/java/org/elasticsearch/xpack/sql/execution/search/extractor/MetricAggExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,16 @@
import org.elasticsearch.search.aggregations.InternalAggregation;
import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation.Bucket;
import org.elasticsearch.search.aggregations.bucket.filter.InternalFilter;
import org.elasticsearch.search.aggregations.matrix.stats.MatrixStats;
import org.elasticsearch.search.aggregations.matrix.stats.InternalMatrixStats;
import org.elasticsearch.search.aggregations.metrics.InternalAvg;
import org.elasticsearch.search.aggregations.metrics.InternalCardinality;
import org.elasticsearch.search.aggregations.metrics.InternalMax;
import org.elasticsearch.search.aggregations.metrics.InternalMin;
import org.elasticsearch.search.aggregations.metrics.InternalNumericMetricsAggregation;
import org.elasticsearch.search.aggregations.metrics.InternalNumericMetricsAggregation.SingleValue;
import org.elasticsearch.search.aggregations.metrics.InternalStats;
import org.elasticsearch.search.aggregations.metrics.PercentileRanks;
import org.elasticsearch.search.aggregations.metrics.Percentiles;
import org.elasticsearch.search.aggregations.metrics.InternalSum;
import org.elasticsearch.search.aggregations.metrics.InternalTDigestPercentileRanks;
import org.elasticsearch.search.aggregations.metrics.InternalTDigestPercentiles;
import org.elasticsearch.xpack.sql.SqlIllegalArgumentException;
import org.elasticsearch.xpack.sql.querydsl.agg.Aggs;
import org.elasticsearch.xpack.sql.util.DateUtils;
Expand All @@ -25,6 +29,9 @@
import java.util.Map;
import java.util.Objects;

import static org.elasticsearch.search.aggregations.matrix.stats.MatrixAggregationInspectionHelper.hasValue;
import static org.elasticsearch.search.aggregations.support.AggregationInspectionHelper.hasValue;

public class MetricAggExtractor implements BucketExtractor {

static final String NAME = "m";
Expand Down Expand Up @@ -123,26 +130,35 @@ private Object handleDateTime(Object object) {
/**
* Check if the given aggregate has been executed and has computed values
* or not (the bucket is null).
*
* Waiting on https://github.com/elastic/elasticsearch/issues/34903
*/
private static boolean containsValues(InternalAggregation agg) {
// Stats & ExtendedStats
if (agg instanceof InternalStats) {
return ((InternalStats) agg).getCount() != 0;
return hasValue((InternalStats) agg);
}
if (agg instanceof InternalMatrixStats) {
return hasValue((InternalMatrixStats) agg);
}
if (agg instanceof InternalMax) {
return hasValue((InternalMax) agg);
}
if (agg instanceof InternalMin) {
return hasValue((InternalMin) agg);
}
if (agg instanceof InternalAvg) {
return hasValue((InternalAvg) agg);
}
if (agg instanceof MatrixStats) {
return ((MatrixStats) agg).getDocCount() != 0;
if (agg instanceof InternalCardinality) {
return hasValue((InternalCardinality) agg);
}
// sum returns 0 even for null; since that's a common case, we return it as such
if (agg instanceof SingleValue) {
return Double.isFinite(((SingleValue) agg).value());
if (agg instanceof InternalSum) {
return hasValue((InternalSum) agg);
}
if (agg instanceof PercentileRanks) {
return Double.isFinite(((PercentileRanks) agg).percent(0));
if (agg instanceof InternalTDigestPercentileRanks) {
return hasValue((InternalTDigestPercentileRanks) agg);
}
if (agg instanceof Percentiles) {
return Double.isFinite(((Percentiles) agg).percentile(0));
if (agg instanceof InternalTDigestPercentiles) {
return hasValue((InternalTDigestPercentiles) agg);
}
return true;
}
Expand Down