Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,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)));
Expand Down Expand Up @@ -487,4 +493,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;
}

}