DATAES-180 - added faceted page back powered by aggregation

Author: akonczak

src/main/java/org/springframework/data/elasticsearch/core/FacetedPageImpl.java

@@ -24,11 +24,15 @@
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
 import org.elasticsearch.search.aggregations.bucket.range.Range;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
-import org.elasticsearch.search.aggregations.metrics.stats.Stats;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStats;
+import org.elasticsearch.search.aggregations.metrics.sum.Sum;
+import org.joda.time.DateTime;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
+import org.springframework.data.elasticsearch.core.facet.AbstractFacetRequest;
 import org.springframework.data.elasticsearch.core.facet.FacetResult;
+import org.springframework.data.elasticsearch.core.facet.request.RangeFacetRequest;
 import org.springframework.data.elasticsearch.core.facet.result.*;
 
 /**
@@ -88,24 +92,35 @@ private void processAggregations() {
 					for (Terms.Bucket t : ((Terms) agg).getBuckets()) {
 						terms.add(new Term(t.getKeyAsString(), t.getDocCount()));
 					}
-					addFacet(new TermResult(agg.getName(), terms, terms.size(), ((Terms) agg).getSumOfOtherDocCounts(), -1));
+					addFacet(new TermResult(agg.getName(), terms, terms.size(), ((Terms) agg).getSumOfOtherDocCounts(), 0));
 				}
 				if (agg instanceof Range) {
 					List<? extends Range.Bucket> buckets = ((Range) agg).getBuckets();
 					List<org.springframework.data.elasticsearch.core.facet.result.Range> ranges = new ArrayList<org.springframework.data.elasticsearch.core.facet.result.Range>();
 					for (Range.Bucket b : buckets) {
-						ranges.add(new org.springframework.data.elasticsearch.core.facet.result.Range((Double) b.getFrom(), (Double) b.getTo(), b.getDocCount(), 0, 0, 0, 0));
+						ExtendedStats rStats = (ExtendedStats) b.getAggregations().get(AbstractFacetRequest.INTERNAL_STATS);
+						if (rStats != null) {
+							Sum sum = (Sum) b.getAggregations().get(RangeFacetRequest.RANGE_INTERNAL_SUM);
+							ranges.add(new org.springframework.data.elasticsearch.core.facet.result.Range((Double) b.getFrom(), (Double) b.getTo(), b.getDocCount(), sum != null ? sum.getValue() : rStats.getSum(), rStats.getCount(), rStats.getMin(), rStats.getMax()));
+						} else {
+							ranges.add(new org.springframework.data.elasticsearch.core.facet.result.Range((Double) b.getFrom(), (Double) b.getTo(), b.getDocCount(), 0, 0, 0, 0));
+						}
 					}
 					addFacet(new RangeResult(agg.getName(), ranges));
 				}
-				if (agg instanceof Stats) {
-					Stats stats = (Stats) agg;
-					addFacet(new StatisticalResult(agg.getName(), stats.getCount(), stats.getMax(), stats.getMin(), stats.getAvg(), -1, -1, stats.getSum(), -1));
+				if (agg instanceof ExtendedStats) {
+					ExtendedStats stats = (ExtendedStats) agg;
+					addFacet(new StatisticalResult(agg.getName(), stats.getCount(), stats.getMax(), stats.getMin(), stats.getAvg(), stats.getStdDeviation(), stats.getSumOfSquares(), stats.getSum(), stats.getVariance()));
 				}
 				if (agg instanceof Histogram) {
 					List<IntervalUnit> intervals = new ArrayList<IntervalUnit>();
 					for (Histogram.Bucket h : ((Histogram) agg).getBuckets()) {
-						new IntervalUnit((Long) h.getKey(), h.getDocCount(), h.getDocCount(), -1, -1, -1, -1);
+						ExtendedStats hStats = (ExtendedStats) h.getAggregations().get(AbstractFacetRequest.INTERNAL_STATS);
+						if (hStats != null) {
+							intervals.add(new IntervalUnit(((DateTime) h.getKey()).getMillis(), h.getDocCount(), h.getDocCount(), hStats.getSum(), hStats.getAvg(), hStats.getMin(), hStats.getMax()));
+						} else {
+							intervals.add(new IntervalUnit(((DateTime) h.getKey()).getMillis(), h.getDocCount(), h.getDocCount(), 0, 0, 0, 0));
+						}
 					}
 					addFacet(new HistogramResult(agg.getName(), intervals));
 				}

src/main/java/org/springframework/data/elasticsearch/core/facet/AbstractFacetRequest.java

@@ -25,6 +25,8 @@
 @Deprecated
 public abstract class AbstractFacetRequest implements FacetRequest {
 
+	public static final String INTERNAL_STATS = "internal-stats";
+
 	private String name;
 	private boolean applyQueryFilter;
 

src/main/java/org/springframework/data/elasticsearch/core/facet/DefaultFacetMapper.java

@@ -66,6 +66,8 @@ public AbstractAggregationBuilder getFacet() {
 			dateHistogramBuilder.interval(interval);
 		}
 
+		dateHistogramBuilder.subAggregation(AggregationBuilders.extendedStats(INTERNAL_STATS));
+
 		return dateHistogramBuilder;
 	}
 }

src/main/java/org/springframework/data/elasticsearch/core/facet/request/HistogramFacetRequest.java

@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
@@ -35,6 +36,7 @@
 @Deprecated
 public class RangeFacetRequest extends AbstractFacetRequest {
 
+	public static final String RANGE_INTERNAL_SUM = "range-internal-sum";
 	private String field;
 	private String keyField;
 	private String valueField;
@@ -50,7 +52,8 @@ public void setField(String field) {
 	}
 
 	public void setFields(String keyField, String valueField) {
-		throw new UnsupportedOperationException("Native Facet are not supported in Elasticsearch 2.x - use Aggregation");
+		this.keyField = keyField;
+		this.valueField = valueField;
 	}
 
 	public void range(Double from, Double to) {
@@ -74,13 +77,18 @@ public AbstractAggregationBuilder getFacet() {
 		Assert.notNull(getName(), "Facet name can't be a null !!!");
 
 		RangeBuilder rangeBuilder = AggregationBuilders.range(getName());
-		rangeBuilder.field(field);
+		rangeBuilder.field(StringUtils.isNotBlank(keyField) ? keyField : field );
 
 		for (Entry entry : entries) {
 			DoubleEntry doubleEntry = (DoubleEntry) entry;
 			rangeBuilder.addRange(validateValue(doubleEntry.getFrom(), Double.NEGATIVE_INFINITY), validateValue(doubleEntry.getTo(), Double.POSITIVE_INFINITY));
 		}
 
+		rangeBuilder.subAggregation(AggregationBuilders.extendedStats(INTERNAL_STATS));
+		if(StringUtils.isNotBlank(valueField)){
+			rangeBuilder.subAggregation(AggregationBuilders.sum(RANGE_INTERNAL_SUM).field(valueField));
+		}
+
 		return rangeBuilder;
 	}
 

src/main/java/org/springframework/data/elasticsearch/core/facet/request/RangeFacetRequest.java

@@ -48,6 +48,6 @@ public void setFields(String... fields) {
 	public AbstractAggregationBuilder getFacet() {
 		Assert.notNull(getName(), "Facet name can't be a null !!!");
 		Assert.isTrue(StringUtils.isNotBlank(field) && fields == null, "Please select field or fields on which to build the facets !!!");
-		return AggregationBuilders.stats(getName()).field(field);
+		return AggregationBuilders.extendedStats(getName()).field(field);
 	}
 }

src/main/java/org/springframework/data/elasticsearch/core/facet/request/StatisticalFacetRequest.java

@@ -46,8 +46,8 @@ public TermFacetRequest(String name) {
 	}
 
 	public void setFields(String... fields) {
-		Assert.isTrue(ArrayUtils.isNotEmpty(fields), "Term agg need one field");
-		Assert.isTrue(ArrayUtils.getLength(fields) == 1, "Term agg need one field");
+		Assert.isTrue(ArrayUtils.isNotEmpty(fields), "Term agg need one field only");
+		Assert.isTrue(ArrayUtils.getLength(fields) == 1, "Term agg need one field only");
 		this.fields = fields;
 	}
 
@@ -84,11 +84,11 @@ public AbstractAggregationBuilder getFacet() {
 			case ascTerm:
 				termsBuilder.order(Terms.Order.term(true));
 				break;
-			case ascCount:
-				termsBuilder.order(Terms.Order.count(true));
+			case descCount:
+				termsBuilder.order(Terms.Order.count(false));
 				break;
 			default:
-				termsBuilder.order(Terms.Order.count(false));
+				termsBuilder.order(Terms.Order.count(true));
 		}
 		if (ArrayUtils.isNotEmpty(excludeTerms)) {
 			termsBuilder.exclude(excludeTerms);