From 392f9ce1f88ea0a609c05ea9d1bbd3738a25cd23 Mon Sep 17 00:00:00 2001 From: Colin Goodheart-Smithe Date: Mon, 13 Apr 2015 14:34:53 +0100 Subject: [PATCH] clean up --- .../index/query/CommonTermsQueryBuilder.java | 5 ++++- .../aggregations/AggregationBuilder.java | 22 +------------------ .../search/aggregations/Aggregator.java | 2 +- .../aggregations/AggregatorParsers.java | 1 - .../aggregations/reducers/BucketHelpers.java | 4 ++-- 5 files changed, 8 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java index 2dedbb44f8a..fef75c4e7fb 100644 --- a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java +++ b/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java @@ -19,6 +19,9 @@ package org.elasticsearch.index.query; +import org.apache.lucene.index.Term; +import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.similarities.Similarity; import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -27,7 +30,7 @@ import java.io.IOException; /** * CommonTermsQuery query is a query that executes high-frequency terms in a * optional sub-query to prevent slow queries due to "common" terms like - * stopwords. This query basically builds 2 queries off the {@link #addAggregator(Term) + * stopwords. This query basically builds 2 queries off the {@link #add(Term) * added} terms where low-frequency terms are added to a required boolean clause * and high-frequency terms are added to an optional boolean clause. The * optional clause is only executed if the required "low-frequency' clause diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java b/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java index cc3033e883f..d41daa7363f 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java +++ b/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java @@ -27,7 +27,6 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.search.aggregations.reducers.ReducerBuilder; import java.io.IOException; import java.util.List; @@ -39,7 +38,6 @@ import java.util.Map; public abstract class AggregationBuilder> extends AbstractAggregationBuilder { private List aggregations; - private List> reducers; private BytesReference aggregationsBinary; private Map metaData; @@ -62,18 +60,6 @@ public abstract class AggregationBuilder> extend return (B) this; } - /** - * Add a sub get to this bucket get. - */ - @SuppressWarnings("unchecked") - public B subAggregation(ReducerBuilder reducer) { - if (reducers == null) { - reducers = Lists.newArrayList(); - } - reducers.add(reducer); - return (B) this; - } - /** * Sets a raw (xcontent / json) sub addAggregation. */ @@ -135,7 +121,7 @@ public abstract class AggregationBuilder> extend builder.field(type); internalXContent(builder, params); - if (aggregations != null || aggregationsBinary != null || reducers != null) { + if (aggregations != null || aggregationsBinary != null) { builder.startObject("aggregations"); if (aggregations != null) { @@ -144,12 +130,6 @@ public abstract class AggregationBuilder> extend } } - if (reducers != null) { - for (ReducerBuilder subAgg : reducers) { - subAgg.toXContent(builder, params); - } - } - if (aggregationsBinary != null) { if (XContentFactory.xContentType(aggregationsBinary) == builder.contentType()) { builder.rawField("aggregations", aggregationsBinary); diff --git a/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java b/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java index bce1f9bc196..fd9519499a8 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java +++ b/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java @@ -105,7 +105,7 @@ public abstract class Aggregator extends BucketCollector implements Releasable { * Build an empty aggregation. */ public abstract InternalAggregation buildEmptyAggregation(); - + /** Aggregation mode for sub aggregations. */ public enum SubAggCollectionMode { diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregatorParsers.java b/src/main/java/org/elasticsearch/search/aggregations/AggregatorParsers.java index 62caa385585..1e1950a15c7 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/AggregatorParsers.java +++ b/src/main/java/org/elasticsearch/search/aggregations/AggregatorParsers.java @@ -197,7 +197,6 @@ public class AggregatorParsers { if (subFactories != null) { throw new SearchParseException(context, "Aggregation [" + aggregationName + "] cannot define sub-aggregations"); } - // TODO: should we validate here like aggs? factories.addReducer(reducerFactory); } } diff --git a/src/main/java/org/elasticsearch/search/aggregations/reducers/BucketHelpers.java b/src/main/java/org/elasticsearch/search/aggregations/reducers/BucketHelpers.java index 30d6fc0107e..b6955a086ab 100644 --- a/src/main/java/org/elasticsearch/search/aggregations/reducers/BucketHelpers.java +++ b/src/main/java/org/elasticsearch/search/aggregations/reducers/BucketHelpers.java @@ -150,9 +150,9 @@ public class BucketHelpers { } public static Double resolveBucketValue(InternalMultiBucketAggregation agg, - InternalMultiBucketAggregation.Bucket bucket, List aggPathsList, GapPolicy gapPolicy) { + InternalMultiBucketAggregation.Bucket bucket, List aggPathAsList, GapPolicy gapPolicy) { try { - Object propertyValue = bucket.getProperty(agg.getName(), aggPathsList); + Object propertyValue = bucket.getProperty(agg.getName(), aggPathAsList); if (propertyValue == null) { throw new AggregationExecutionException(DerivativeParser.BUCKETS_PATH.getPreferredName() + " must reference either a number value or a single value numeric metric aggregation");