Missed a children case.

javadevmtl · javadevmtl · commit 91a565b89d52 · 2016-04-18T11:27:17.000-04:00
diff --git a/src/main/java/org/nlpcn/es4sql/parse/FieldMaker.java b/src/main/java/org/nlpcn/es4sql/parse/FieldMaker.java
@@ -169,12 +169,23 @@ private static MethodField makeMethodField(String name, List<SQLExpr> arguments,
                 }
                 else if(methodName.equals("nested") || methodName.equals("reverse_nested")){
                     NestedType nestedType = new NestedType();
+
                     if(!nestedType.tryFillFromExpr(object)){
                         throw new SqlParseException("failed parsing nested expr " + object);
                     }
+
                     paramers.add(new KVValue("nested",nestedType));
                 }
-                else throw new SqlParseException("only support script/nested as inner functions");
+                else if(methodName.equals("children")) {
+                	ChildrenType childrenType = new ChildrenType();
+
+                    if(!childrenType.tryFillFromExpr(object)){
+                        throw new SqlParseException("failed parsing children expr " + object);
+                    }
+
+                    paramers.add(new KVValue("children", childrenType));
+                }
+                else throw new SqlParseException("only support script/nested/children as inner functions");
             }else {
 				paramers.add(new KVValue(Util.expr2Object(object)));
 			}
diff --git a/src/main/java/org/nlpcn/es4sql/parse/SqlParser.java b/src/main/java/org/nlpcn/es4sql/parse/SqlParser.java
@@ -293,7 +293,7 @@ else if (methodName.toLowerCase().equals("children")){
             	ChildrenType childrenType = new ChildrenType();
 
                 if(!childrenType.tryFillFromExpr(expr)){
-                    throw new SqlParseException("could not fill nested from expr:" + expr);
+                    throw new SqlParseException("could not fill children from expr:" + expr);
                 }
 
                 Condition condition = new Condition(CONN.valueOf(opear), childrenType.childType, methodName.toUpperCase(), childrenType.where);
diff --git a/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java b/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java
@@ -80,7 +80,8 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {
                     else {
                     	childrenBuilder.subAggregation(lastAgg);
                     }
-                    request.addAggregation(wrapNestedIfNeeded(childrenBuilder, field.isChildren()));                	
+
+                    request.addAggregation(childrenBuilder);                	
                 }
                 else {
                     request.addAggregation(lastAgg);
@@ -95,15 +96,28 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {
 
                     if(field.isNested()){
                         AggregationBuilder nestedBuilder = createNestedAggregation(field);
-                        if(insertFilterIfExistsAfter(subAgg, groupBy, nestedBuilder,i+1)){
-                            groupBy.remove(i+1);
+
+                        if(insertFilterIfExistsAfter(subAgg, groupBy, nestedBuilder,i + 1)){
+                            groupBy.remove(i + 1);
                             i++;
                         }
                         else {
                             nestedBuilder.subAggregation(subAgg);
                         }
+
                         lastAgg.subAggregation(wrapNestedIfNeeded(nestedBuilder,field.isReverseNested()));
+                    } else if(field.isChildren()) {
+                        AggregationBuilder childrenBuilder = createChildrenAggregation(field);
+                        
+                        if(insertFilterIfExistsAfter(subAgg, groupBy, childrenBuilder, i + 1)){
+                            groupBy.remove(i + 1);
+                            i++;
+                        }
+                        else {
+                            childrenBuilder.subAggregation(subAgg);
+                        }
 
+                        lastAgg.subAggregation(childrenBuilder);
                     }
                     else {
                         lastAgg.subAggregation(subAgg);

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ else if (methodName.toLowerCase().equals("children")){`
`293`	`293`	`ChildrenType childrenType = new ChildrenType();`
`294`	`294`
`295`	`295`	`if(!childrenType.tryFillFromExpr(expr)){`
`296`		`- throw new SqlParseException("could not fill nested from expr:" + expr);`
	`296`	`+ throw new SqlParseException("could not fill children from expr:" + expr);`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`Condition condition = new Condition(CONN.valueOf(opear), childrenType.childType, methodName.toUpperCase(), childrenType.where);`