Merge pull request NLPchina#5 from NLPchina/master

TerryJayChan · web-flow · commit 23e837919e25 · 2017-10-30T15:16:32.000+08:00
NLPchina#538 support extended_bounds in date_histogram
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>5.6.3.1</version>
+	<version>5.6.3.2</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
diff --git a/src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java b/src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java
@@ -12,10 +12,7 @@
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.geogrid.GeoGridAggregationBuilder;
 
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
-import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.*;
 import org.elasticsearch.search.aggregations.bucket.nested.ReverseNestedAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeAggregationBuilder;
@@ -472,6 +469,12 @@ private DateHistogramAggregationBuilder dateHistogram(MethodField field) throws
                 case "order":
                     dateHistogram.order("desc".equalsIgnoreCase(value) ? Histogram.Order.KEY_DESC : Histogram.Order.KEY_ASC);
                     break;
+                case "extended_bounds":
+                    String[] bounds = value.split(":");
+                    if (bounds.length == 2) {
+                        dateHistogram.extendedBounds(new ExtendedBounds(bounds[0], bounds[1]));
+                    }
+                    break;
 
                 case "alias":
                 case "nested":
