Merge commit '3a6699096f4809e14d200f1c1cd14acb5a1a7d75' into elastic2.0

eliranmoyal · eliranmoyal · commit eb5fe5f1e304 · 2015-12-30T11:21:23.000+02:00
Conflicts:
	src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java
diff --git a/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java b/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java
@@ -81,7 +81,7 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {
 				for (int i = 1; i < groupBy.size(); i++) {
 					field = groupBy.get(i);
 					AggregationBuilder<?> subAgg = aggMaker.makeGroupAgg(field);
-					if (subAgg instanceof TermsBuilder) {
+					if (subAgg instanceof TermsBuilder && !(field instanceof MethodField ) ) {
 						((TermsBuilder) subAgg).size(0);
 					}
 
diff --git a/src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java b/src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java
@@ -155,12 +155,41 @@ private AggregationBuilder<?> makeRangeGroup(MethodField field) throws SqlParseE
 			return histogram(field);
         case "geohash_grid":
             return geohashGrid(field);
+        case "terms":
+                return termsAgg(field);
 		default:
 			throw new SqlParseException("can define this method " + field);
 		}
 
 	}
 
+    private AggregationBuilder<?> termsAgg(MethodField field) throws SqlParseException {
+        String aggName = gettAggNameFromParamsOrAlias(field);
+        TermsBuilder terms = AggregationBuilders.terms(aggName);
+        String value = null;
+        for (KVValue kv : field.getParams()) {
+            value = kv.value.toString();
+            switch (kv.key.toLowerCase()) {
+                case "field":
+                    terms.field(value);
+                    break;
+                case "size":
+                    terms.size(Integer.parseInt(value));
+                    break;
+                case "shard_size":
+                    terms.shardSize(Integer.parseInt(value));
+                    break;
+                case "alias":
+                case "nested":
+                case "reverse_nested":
+                    break;
+                default:
+                    throw new SqlParseException("terms aggregation err or not define field " + kv.toString());
+            }
+        }
+        return terms;
+    }
+
     private AbstractAggregationBuilder scriptedMetric(MethodField field) throws SqlParseException {
         String aggName = gettAggNameFromParamsOrAlias(field);
         ScriptedMetricBuilder scriptedMetricBuilder = AggregationBuilders.scriptedMetric(aggName);
diff --git a/src/test/java/org/nlpcn/es4sql/AggregationTest.java b/src/test/java/org/nlpcn/es4sql/AggregationTest.java
@@ -224,8 +224,30 @@ public void multipleGroupByTest() throws Exception {
 		Assert.assertEquals(expectedAges, buckets.get("f"));
 	}
 
+    @Test
+    public void multipleGroupBysWithSize() throws Exception {
+        Set expectedAges = new HashSet<Integer>(ContiguousSet.create(Range.closed(20, 40), DiscreteDomain.integers()));
 
-	@Test
+        Map<String, Set<Integer>> buckets = new HashMap<>();
+
+        Aggregations result = query(String.format("SELECT COUNT(*) FROM %s/account GROUP BY gender, terms('alias'='ageAgg','field'='age','size'=3)", TEST_INDEX));
+        Terms gender = result.get("gender");
+        Assert.assertEquals(2,gender.getBuckets().size());
+        for(Terms.Bucket genderBucket : gender.getBuckets()) {
+
+            String genderKey = genderBucket.getKey();
+            buckets.put(genderKey, new HashSet<Integer>());
+            Terms ageBuckets = genderBucket.getAggregations().get("ageAgg");
+            Assert.assertEquals(3,ageBuckets.getBuckets().size());
+
+        }
+
+
+    }
+
+
+
+    @Test
 	public void orderByAscTest() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
 		ArrayList<Long> agesCount = new ArrayList<>();
 
@@ -345,7 +367,8 @@ private SqlElasticSearchRequestBuilder getSearchRequestBuilder(String query) thr
     @Test
 	public void testSubAggregations() throws  Exception {
 		Set expectedAges = new HashSet<>(ContiguousSet.create(Range.closed(20, 40), DiscreteDomain.integers()));
-		final String query = String.format("SELECT /*! DOCS_WITH_AGGREGATION(10) */ * FROM %s/account GROUP BY (gender, age), (state) LIMIT 0,10", TEST_INDEX);
+		final String query = String.format("SELECT /*! DOCS_WITH_AGGREGATION(10) */" +
+                " * FROM %s/account GROUP BY (gender, age), (state) LIMIT 0,10", TEST_INDEX);
 
 		Map<String, Set<Integer>> buckets = new HashMap<>();
 
diff --git a/src/test/java/org/nlpcn/es4sql/SqlParserTests.java b/src/test/java/org/nlpcn/es4sql/SqlParserTests.java
@@ -765,7 +765,7 @@ public void fieldsAsNumbersOnWhere() throws SqlParseException {
         Where where = wheres.get(0);
         Assert.assertEquals(Condition.class,where.getClass());
         Condition condition = (Condition) where;
-        int i=1;
+        Assert.assertEquals("3", condition.getName());
     }
 
     private SQLExpr queryToExpr(String query) {

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {`
`81`	`81`	`for (int i = 1; i < groupBy.size(); i++) {`
`82`	`82`	`field = groupBy.get(i);`
`83`	`83`	`AggregationBuilder<?> subAgg = aggMaker.makeGroupAgg(field);`
`84`		`- if (subAgg instanceof TermsBuilder) {`
	`84`	`+ if (subAgg instanceof TermsBuilder && !(field instanceof MethodField ) ) {`
`85`	`85`	`((TermsBuilder) subAgg).size(0);`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -765,7 +765,7 @@ public void fieldsAsNumbersOnWhere() throws SqlParseException {`
`765`	`765`	`Where where = wheres.get(0);`
`766`	`766`	`Assert.assertEquals(Condition.class,where.getClass());`
`767`	`767`	`Condition condition = (Condition) where;`
`768`		`- int i=1;`
	`768`	`+ Assert.assertEquals("3", condition.getName());`
`769`	`769`	`}`
`770`	`770`
`771`	`771`	`private SQLExpr queryToExpr(String query) {`