From 52c244d9ec0a9ce286a25379b3516159f0380222 Mon Sep 17 00:00:00 2001
From: Bob Liu <bobliu@taosdata.com>
Date: Sun, 24 Dec 2023 23:48:37 +0800
Subject: [PATCH] adjust

---
 source/libs/planner/src/planPhysiCreater.c   | 22 +++++++++++++++-----
 tests/system-test/2-query/count.py           |  2 +-
 tests/system-test/2-query/group_partition.py | 10 ++++++++-
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/source/libs/planner/src/planPhysiCreater.c b/source/libs/planner/src/planPhysiCreater.c
index 9c4e9f97ab..5c78ff4432 100644
--- a/source/libs/planner/src/planPhysiCreater.c
+++ b/source/libs/planner/src/planPhysiCreater.c
@@ -595,13 +595,25 @@ static bool calcNeedCountEmpty(SPhysiPlanContext* pCxt, SScanLogicNode* pScanLog
   }
   // limit: root node is select
   SNode* pRoot = pCxt->pPlanCxt->pAstRoot;
-  if (QUERY_NODE_SELECT_STMT == nodeType(pRoot)
-      && pCxt->pNode && QUERY_NODE_LOGIC_PLAN_AGG == nodeType(pCxt->pNode)) {
-    SAggLogicNode* pNode = (SAggLogicNode*)pCxt->pNode;
-    if (pNode->isCountByTag) {
-      return true;
+  if (QUERY_NODE_SELECT_STMT == nodeType(pRoot)) {
+    // case1 root select
+    SSelectStmt* pSelect = (SSelectStmt*)pRoot;
+    if (pSelect->hasCountFunc) {
+      if (NULL != pSelect->pGroupByList) {
+        return !keysHasCol(pSelect->pGroupByList);
+      } else if (NULL != pSelect->pPartitionByList) {
+        return !keysHasCol(pSelect->pPartitionByList);
+      }
+    }
+    // case2 inner agg
+    if (pCxt->pNode && QUERY_NODE_LOGIC_PLAN_AGG == nodeType(pCxt->pNode)) {
+      SAggLogicNode* pNode = (SAggLogicNode*)pCxt->pNode;
+      if (pNode->isCountByTag) {
+        return true;
+      }
     }
   }
+
   return false;
 }
 
diff --git a/tests/system-test/2-query/count.py b/tests/system-test/2-query/count.py
index 0e1d332d89..a80c6f07e9 100644
--- a/tests/system-test/2-query/count.py
+++ b/tests/system-test/2-query/count.py
@@ -123,7 +123,7 @@ class TDTestCase:
               tdSql.checkData(0, 1, 2)
             elif 'hyperloglog' == function_name:
               tdSql.checkData(0, 0, 0)
-              tdSql.checkData(0, 0, 0)
+              tdSql.checkData(0, 1, None)
 
     def query_empty_ntb(self):
         tdSql.query(f'select count(*) from {self.ntbname}')
diff --git a/tests/system-test/2-query/group_partition.py b/tests/system-test/2-query/group_partition.py
index 58be8563fa..c08ea98ef6 100644
--- a/tests/system-test/2-query/group_partition.py
+++ b/tests/system-test/2-query/group_partition.py
@@ -83,6 +83,10 @@ class TDTestCase:
         tdSql.query(f"select count(c1) from {self.dbname}.{self.stable} group by tbname ")
         tdSql.checkRows(check_num)
 
+        #inner select
+        tdSql.query(f"select * from (select count(c1) from {self.dbname}.{self.stable} group by tbname) ")
+        tdSql.checkRows(check_num)
+
         # count + sum(col)
         tdSql.query(f"select count(*), sum(c1) from {self.dbname}.{self.stable} group by tbname ")
         tdSql.checkRows(check_num)
@@ -146,6 +150,10 @@ class TDTestCase:
         tdSql.query(f"select count(c1) from {self.dbname}.{self.stable} partition by tbname ")
         tdSql.checkRows(check_num)
 
+        #inner select
+        tdSql.query(f"select * from (select count(c1) from {self.dbname}.{self.stable} partition by tbname) ")
+        tdSql.checkRows(check_num)
+
         tdSql.query(f"select count(c1) from {self.dbname}.{self.stable} partition by tbname interval(1d)")
         tdSql.checkRows(real_num)
 
@@ -196,4 +204,4 @@ class TDTestCase:
 
 
 tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
+tdCases.addLinux(__file__, TDTestCase())