terms aggregation - min_doc_count support NLPchina#178

eliranmoyal · eliranmoyal · commit c714d29a4b19 · 2016-03-25T19:35:32.000+03:00
diff --git a/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java b/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java
@@ -56,7 +56,8 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {
 				Field field = groupBy.get(0);
 				lastAgg = aggMaker.makeGroupAgg(field);
 
-				if (lastAgg != null && lastAgg instanceof TermsBuilder) {
+				if (lastAgg != null && lastAgg instanceof TermsBuilder && !(field instanceof MethodField )) {
+
 					((TermsBuilder) lastAgg).size(select.getRowCount());
 				}
 
diff --git a/src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java b/src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java
@@ -229,6 +229,9 @@ private AggregationBuilder<?> termsAgg(MethodField field) throws SqlParseExcepti
                 case "shard_size":
                     terms.shardSize(Integer.parseInt(value));
                     break;
+                case "min_doc_count":
+                    terms.minDocCount(Integer.parseInt(value));
+                    break;
                 case "alias":
                 case "nested":
                 case "reverse_nested":
diff --git a/src/test/java/org/nlpcn/es4sql/AggregationTest.java b/src/test/java/org/nlpcn/es4sql/AggregationTest.java
@@ -254,6 +254,16 @@ public void multipleGroupBysWithSize() throws Exception {
 
     }
 
+    @Test
+    public void termsWithSize() throws Exception {
+
+        Map<String, Set<Integer>> buckets = new HashMap<>();
+
+        Aggregations result = query(String.format("SELECT COUNT(*) FROM %s/account GROUP BY terms('alias'='ageAgg','field'='age','size'=3)", TEST_INDEX));
+        Terms gender = result.get("ageAgg");
+        Assert.assertEquals(3,gender.getBuckets().size());
+
+    }
 
 
     @Test
@@ -466,7 +476,7 @@ public void geoHashGrid() throws SQLFeatureNotSupportedException, SqlParseExcept
         InternalGeoHashGrid grid = result.get("geohash_grid(field=center,precision=5)");
         Collection<GeoHashGrid.Bucket> buckets = grid.getBuckets();
         for (GeoHashGrid.Bucket bucket : buckets) {
-            Assert.assertTrue(bucket.getKey().toString().equals("[4.98779296875, 105.00732421875]") || bucket.getKey().toString().equals("[0.50537109375, 100.48095703125]") );
+            Assert.assertTrue(bucket.getKey().toString().equals("[4.9658203125, 104.9853515625]") || bucket.getKey().toString().equals("[0.4833984375, 100.458984375]") );
             Assert.assertEquals(1,bucket.getDocCount());
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {`
`56`	`56`	`Field field = groupBy.get(0);`
`57`	`57`	`lastAgg = aggMaker.makeGroupAgg(field);`
`58`	`58`
`59`		`- if (lastAgg != null && lastAgg instanceof TermsBuilder) {`
	`59`	`+ if (lastAgg != null && lastAgg instanceof TermsBuilder && !(field instanceof MethodField )) {`
	`60`	`+`
`60`	`61`	`((TermsBuilder) lastAgg).size(select.getRowCount());`
`61`	`62`	`}`
`62`	`63`