Merge pull request NLPchina#862 from flame9012/master

shi-yuan · web-flow · commit 30fb22f7b69a · 2019-01-20T16:32:28.000+08:00
count(distinct a) 排序问题
diff --git a/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java b/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java
@@ -186,7 +186,13 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {
                     TermsAggregationBuilder termsBuilder = (TermsAggregationBuilder) temp.value;
                     switch (temp.key) {
                         case "COUNT":
-                            termsBuilder.order(BucketOrder.count(isASC(order)));
+                        	String orderName = order.getName();
+                        	if(isAliasFiled(orderName)) {
+                        		termsBuilder.order(BucketOrder.aggregation(orderName, isASC(order)));
+                        	}else {
+                        		termsBuilder.order(BucketOrder.count(isASC(order)));
+							}
+                            
                             break;
                         case "KEY":
                             termsBuilder.order(BucketOrder.key(isASC(order)));
@@ -475,4 +481,16 @@ private void setLimitFromHint(List<Hint> hints) {
         request.setFrom(from);
         request.setSize(size);
     }
+    //判断某个字段名称是否是别名
+    private boolean isAliasFiled(String filedName) {
+       if(select.getFields().size() > 0) {
+           for (Field field : select.getFields()) {
+	           if(null !=field.getAlias() &&  field.getAlias().equals(filedName)) {
+	               return true;
+	           }
+           }
+       }
+       return false;
+    }
+
 }
