to fix COUNT(*)

Author: fupelaqu

bridge/src/main/scala/app/softnetwork/elastic/sql/bridge/ElasticAggregation.scala

@@ -145,10 +145,15 @@ object ElasticAggregation {
     val _agg =
       aggType match {
         case COUNT =>
+          val field =
+            sourceField match {
+              case "*" | "_id" | "_index" | "_type" => "_id"
+              case _                                => sourceField
+            }
           if (distinct)
-            cardinalityAgg(aggName, sourceField)
+            cardinalityAgg(aggName, field)
           else {
-            valueCountAgg(aggName, sourceField)
+            valueCountAgg(aggName, field)
           }
         case MIN => aggWithFieldOrScript(minAgg, (name, s) => minAgg(name, sourceField).script(s))
         case MAX => aggWithFieldOrScript(maxAgg, (name, s) => maxAgg(name, sourceField).script(s))

core/src/main/scala/app/softnetwork/elastic/client/SearchApi.scala

@@ -137,7 +137,7 @@ trait SearchApi extends ElasticConversion with ElasticClientHelpers {
     val indices = elasticQuery.indices.mkString(",")
 
     logger.debug(
-      s"Searching with query \n${sql.getOrElse(query)}\nin indices '$indices'"
+      s"🔍 Searching with query \n${sql.getOrElse(query)}\nin indices '$indices'"
     )
 
     executeSingleSearch(elasticQuery) match {
@@ -236,7 +236,7 @@ trait SearchApi extends ElasticConversion with ElasticClientHelpers {
     )
 
     logger.debug(
-      s"Multi-searching with query \n${sql.getOrElse(query)}"
+      s"🔍 Multi-searching with query \n${sql.getOrElse(query)}"
     )
 
     executeMultiSearch(elasticQueries) match {

es6/bridge/src/main/scala/app/softnetwork/elastic/sql/bridge/ElasticAggregation.scala

@@ -145,10 +145,15 @@ object ElasticAggregation {
     val _agg =
       aggType match {
         case COUNT =>
+          val field =
+            sourceField match {
+              case "*" | "_id" | "_index" | "_type" => "_id"
+              case _                                => sourceField
+            }
           if (distinct)
-            cardinalityAgg(aggName, sourceField)
+            cardinalityAgg(aggName, field)
           else {
-            valueCountAgg(aggName, sourceField)
+            valueCountAgg(aggName, field)
           }
         case MIN => aggWithFieldOrScript(minAgg, (name, s) => minAgg(name, sourceField).script(s))
         case MAX => aggWithFieldOrScript(maxAgg, (name, s) => maxAgg(name, sourceField).script(s))

testkit/src/main/scala/app/softnetwork/elastic/client/WindowFunctionSpec.scala

@@ -463,7 +463,6 @@ trait WindowFunctionSpec
           COUNT(*) AS employee_count
         FROM emp
         GROUP BY department
-        ORDER BY avg_salary DESC
       """)
 
     results match {
@@ -474,7 +473,7 @@ trait WindowFunctionSpec
         engineering shouldBe defined
         engineering.get.max_salary shouldBe 130000 // Sam Turner
         engineering.get.min_salary shouldBe 75000 // Eve Davis
-        engineering.get.employee_count shouldBe 6
+        engineering.get.employee_count shouldBe 7
 
       case ElasticFailure(error) =>
         fail(s"Query failed: ${error.message}")