Fixbug NLPchina#479

zhaolihe · zhaolihe · commit 5fe2b36d19ee · 2017-08-10T23:53:11.000+08:00
diff --git a/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java b/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java
@@ -140,13 +140,22 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {
                     lastAgg = subAgg;
                 }
             }
+
+            // add aggregation function to each groupBy
+            explanFields(request, select.getFields(), lastAgg);
+        }
+
+        if (select.getGroupBys().size() < 1) {
+            //add aggregation when having no groupBy script
+            explanFields(request, select.getFields(), lastAgg);
+
         }
 
         Map<String, KVValue> groupMap = aggMaker.getGroupMap();
         // add field
         if (select.getFields().size() > 0) {
             setFields(select.getFields());
-            explanFields(request, select.getFields(), lastAgg);
+//            explanFields(request, select.getFields(), lastAgg);
         }
 
         // add order

Original file line number	Diff line number	Diff line change
`@@ -140,13 +140,22 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {`
`140`	`140`	`lastAgg = subAgg;`
`141`	`141`	`}`
`142`	`142`	`}`
	`143`	`+`
	`144`	`+ // add aggregation function to each groupBy`
	`145`	`+ explanFields(request, select.getFields(), lastAgg);`
	`146`	`+ }`
	`147`	`+`
	`148`	`+ if (select.getGroupBys().size() < 1) {`
	`149`	`+ //add aggregation when having no groupBy script`
	`150`	`+ explanFields(request, select.getFields(), lastAgg);`
	`151`	`+`
`143`	`152`	`}`
`144`	`153`
`145`	`154`	`Map<String, KVValue> groupMap = aggMaker.getGroupMap();`
`146`	`155`	`// add field`
`147`	`156`	`if (select.getFields().size() > 0) {`
`148`	`157`	`setFields(select.getFields());`
`149`		`- explanFields(request, select.getFields(), lastAgg);`
	`158`	`+// explanFields(request, select.getFields(), lastAgg);`
`150`	`159`	`}`
`151`	`160`
`152`	`161`	`// add order`