add testcase for NLPchina#862

shi-yuan · shi-yuan · commit f6d0f477dd0d · 2019-01-20T17:24:40.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>6.5.4.4</version>
+	<version>6.5.4.5</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
diff --git a/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java b/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java
@@ -187,12 +187,11 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {
                     switch (temp.key) {
                         case "COUNT":
                         	String orderName = order.getName();
-                        	if(isAliasFiled(orderName)) {
-                        		termsBuilder.order(BucketOrder.aggregation(orderName, isASC(order)));
-                        	}else {
-                        		termsBuilder.order(BucketOrder.count(isASC(order)));
-							}
-                            
+                            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)));
@@ -481,16 +480,19 @@ 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;
+        if (select.getFields().size() > 0) {
+            for (Field field : select.getFields()) {
+                if (null != field.getAlias() && field.getAlias().equals(filedName)) {
+                    return true;
+                }
+            }
+        }
+        return false;
     }
 
 }
diff --git a/src/test/java/org/nlpcn/es4sql/ExplainTest.java b/src/test/java/org/nlpcn/es4sql/ExplainTest.java
@@ -96,6 +96,11 @@ public void testSpanNearQueryExplain() throws SqlParseException, SQLFeatureNotSu
         System.out.println(explain("SELECT * FROM index WHERE q=span_near(boost=10.0,slop=12,in_order=false,clauses='[{\"span_term\":{\"field\":\"value1\"}},{\"span_term\":{\"field\":\"value2\"}},{\"span_term\":{\"field\":\"value3\"}}]')"));
     }
 
+    @Test
+    public void testCountDistinctExplain() throws SqlParseException, SQLFeatureNotSupportedException {
+        System.out.println(explain("SELECT COUNT(DISTINCT sourceIP.keyword) AS size FROM dataflow WHERE startTime > 525757149439 AND startTime < 1525757449439 GROUP BY appName.keyword ORDER BY size DESC"));
+    }
+
     private String explain(String sql) throws SQLFeatureNotSupportedException, SqlParseException {
         SearchDao searchDao = MainTestSuite.getSearchDao();
         SqlElasticRequestBuilder requestBuilder = searchDao.explain(sql).explain();
