From 5b866edae7ac6dead24e3f966f37e27868605293 Mon Sep 17 00:00:00 2001
From: slzhou <shenglian_zhou@163.com>
Date: Fri, 12 May 2023 18:51:18 +0800
Subject: [PATCH] fix: disable table count scan optimized when filters and
 group by both exist

---
 source/libs/planner/src/planOptimizer.c | 6 ++++--
 tests/script/tsim/query/tableCount.sim  | 9 ++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index effbbc161e..931e762a8d 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -2596,11 +2596,13 @@ static bool tbCntScanOptIsEligibleConds(STbCntScanOptInfo* pInfo, SNode* pCondit
   }
 
   if (QUERY_NODE_LOGIC_CONDITION == nodeType(pConditions)) {
-    return tbCntScanOptIsEligibleLogicCond(pInfo, (SLogicConditionNode*)pConditions);
+    return tbCntScanOptIsEligibleLogicCond(pInfo, (SLogicConditionNode*)pConditions) &&
+                LIST_LENGTH(pInfo->pAgg->pGroupKeys) == 0;
   }
 
   if (QUERY_NODE_OPERATOR == nodeType(pConditions)) {
-    return tbCntScanOptIsEligibleOpCond((SOperatorNode*)pConditions);
+    return tbCntScanOptIsEligibleOpCond((SOperatorNode*)pConditions) &&
+                LIST_LENGTH(pInfo->pAgg->pGroupKeys) == 0;
   }
 
   return false;
diff --git a/tests/script/tsim/query/tableCount.sim b/tests/script/tsim/query/tableCount.sim
index ac5e23273a..6e65852dcc 100644
--- a/tests/script/tsim/query/tableCount.sim
+++ b/tests/script/tsim/query/tableCount.sim
@@ -103,7 +103,14 @@ endi
 if $data62 != 5 then
   return -1
 endi
-
+sql select count(table_name) from information_schema.ins_tables where db_name='db1' and stable_name='sta' group by stable_name
+print $rows , $data00
+if $rows != 1 then
+  return -1
+endi
+if $data00 != 8 then
+  return -1
+endi
 sql select distinct db_name from information_schema.ins_tables;
 print $rows
 if $rows != 4 then
-- 
GitLab