fix count distinct

Author: shi-yuan

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>8.7.0.0</version>
+	<version>8.7.0.1</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>

src/main/java/org/nlpcn/es4sql/parse/FieldMaker.java

@@ -68,7 +68,8 @@ public static Field makeField(SQLExpr expr, String alias, String tableAlias) thr
                 return makeFieldSortMethodField(mExpr, alias);
             }
 
-            return makeMethodField(methodName, mExpr.getParameters(), null, alias, tableAlias, true);
+            SQLAggregateOption option = mExpr instanceof SQLAggregateExpr ? ((SQLAggregateExpr) mExpr).getOption() : null;
+            return makeMethodField(methodName, mExpr.getArguments(), option, alias, tableAlias, true);
         } else if (expr instanceof SQLAggregateExpr) {
             SQLAggregateExpr sExpr = (SQLAggregateExpr) expr;
             return makeMethodField(sExpr.getMethodName(), sExpr.getArguments(), sExpr.getOption(), alias, tableAlias, true);

src/test/java/org/nlpcn/es4sql/ExplainTest.java

@@ -102,8 +102,10 @@ public void testSpanNearQueryExplain() throws SqlParseException, SQLFeatureNotSu
     }
 
     @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"));
+    public void testCountDistinctExplain() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
+        String expectedOutput = Files.toString(new File("src/test/resources/expectedOutput/aggregation_cardinality_explain.json"), StandardCharsets.UTF_8).replaceAll("\r", "");
+        String result = explain("SELECT COUNT(DISTINCT sourceIP.keyword) AS size FROM dataflow WHERE startTime > 525757149439 AND startTime < 1525757449439 GROUP BY appName.keyword ORDER BY size DESC");
+        assertThat(result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
     }
 
     @Test

src/test/resources/expectedOutput/aggregation_cardinality_explain.json

@@ -0,0 +1,74 @@
+{
+  "from": 0,
+  "size": 0,
+  "query": {
+    "bool": {
+      "filter": [
+        {
+          "bool": {
+            "must": [
+              {
+                "bool": {
+                  "must": [
+                    {
+                      "range": {
+                        "startTime": {
+                          "gt": 525757149439,
+                          "boost": 1.0
+                        }
+                      }
+                    },
+                    {
+                      "range": {
+                        "startTime": {
+                          "lt": 1525757449439,
+                          "boost": 1.0
+                        }
+                      }
+                    }
+                  ],
+                  "boost": 1.0
+                }
+              }
+            ],
+            "boost": 1.0
+          }
+        }
+      ],
+      "boost": 1.0
+    }
+  },
+  "_source": {
+    "includes": [
+      "COUNT"
+    ],
+    "excludes": []
+  },
+  "aggregations": {
+    "appName.keyword": {
+      "terms": {
+        "field": "appName.keyword",
+        "size": 1000,
+        "shard_size": 20000,
+        "min_doc_count": 1,
+        "shard_min_doc_count": 0,
+        "show_term_doc_count_error": false,
+        "order": [
+          {
+            "size": "desc"
+          },
+          {
+            "_key": "asc"
+          }
+        ]
+      },
+      "aggregations": {
+        "size": {
+          "cardinality": {
+            "field": "sourceIP.keyword"
+          }
+        }
+      }
+    }
+  }
+}