From 2077c9e5617a97ba71380ecb370a74b95e0ce6fb Mon Sep 17 00:00:00 2001
From: factosea <285808407@qq.com>
Date: Thu, 21 Nov 2024 14:20:08 +0800
Subject: [PATCH 1/2] fix: group by value

---
 source/libs/executor/src/executorInt.c     |  1 +
 source/libs/parser/src/parCalcConst.c      | 16 +++++++++----
 tests/system-test/2-query/project_group.py | 27 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/source/libs/executor/src/executorInt.c b/source/libs/executor/src/executorInt.c
index 1b823bf69d..eb49c90035 100644
--- a/source/libs/executor/src/executorInt.c
+++ b/source/libs/executor/src/executorInt.c
@@ -359,6 +359,7 @@ static int32_t doSetInputDataBlock(SExprSupp* pExprSup, SSDataBlock* pBlock, int
       SFunctParam* pFuncParam = &pOneExpr->base.pParam[j];
       if (pFuncParam->type == FUNC_PARAM_TYPE_COLUMN) {
         int32_t slotId = pFuncParam->pCol->slotId;
+        QUERY_CHECK_CONDITION((slotId < pBlock->pDataBlock->size), code, lino, _end, TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR);
         pInput->pData[j] = taosArrayGet(pBlock->pDataBlock, slotId);
         pInput->totalRows = pBlock->info.rows;
         pInput->numOfRows = pBlock->info.rows;
diff --git a/source/libs/parser/src/parCalcConst.c b/source/libs/parser/src/parCalcConst.c
index 9702c2e760..a2e98bece7 100644
--- a/source/libs/parser/src/parCalcConst.c
+++ b/source/libs/parser/src/parCalcConst.c
@@ -329,16 +329,22 @@ static int32_t calcConstGroupBy(SCalcConstContext* pCxt, SSelectStmt* pSelect) {
   if (TSDB_CODE_SUCCESS == code) {
     SNode* pNode = NULL;
     FOREACH(pNode, pSelect->pGroupByList) {
+      bool   hasNotValue = false;
       SNode* pGroupPara = NULL;
       FOREACH(pGroupPara, ((SGroupingSetNode*)pNode)->pParameterList) {
         if (QUERY_NODE_VALUE != nodeType(pGroupPara)) {
-          return code;
+          hasNotValue = true;
+          break;
+        }
+      }
+      if (!hasNotValue) {
+        if (pSelect->hasAggFuncs) {
+          ERASE_NODE(pSelect->pGroupByList);
+        } else {
+          if (!cell->pPrev && !cell->pNext) continue;
+          ERASE_NODE(pSelect->pGroupByList);
         }
       }
-    }
-    FOREACH(pNode, pSelect->pGroupByList) {
-      if (!cell->pPrev) continue;
-      ERASE_NODE(pSelect->pGroupByList);
     }
   }
   return code;
diff --git a/tests/system-test/2-query/project_group.py b/tests/system-test/2-query/project_group.py
index 19fe8b1cf0..a251854213 100644
--- a/tests/system-test/2-query/project_group.py
+++ b/tests/system-test/2-query/project_group.py
@@ -15,6 +15,30 @@ class TDTestCase:
         self.batchNum = 5
         self.ts = 1537146000000
 
+    def groupby_value(self):
+        tdSql.query('select 1 from stb group by now')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1)
+        tdSql.query('select 1 from stb group by "1"')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1)
+        tdSql.query('select count(*) from stb group by now')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 12)
+        tdSql.query('select count(*) from stb group by now+1')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 12)
+        tdSql.query('select 1, count(*) from stb group by now, "1"')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 1)
+        tdSql.checkData(0, 1, 12)
+        tdSql.query('select count(*) as cc from sta1 as a join sta2 as b on a.ts = b.ts group by now')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 0, 3)
+        tdSql.query('select a.tbname, count(*) as cc from sta1 as a join sta2 as b on a.ts = b.ts group by a.tbname, "1"')
+        tdSql.checkRows(1)
+        tdSql.checkData(0, 1, 3)
+
     def run(self):
         dbname = "db"
         tdSql.prepare()
@@ -59,6 +83,9 @@ class TDTestCase:
         tdSql.checkRows(2)
         tdSql.query('select col1 > 0 and col2 > 0 from stb')
         tdSql.checkRows(12)
+
+        self.groupby_value()
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

From bd9b20d30fd77b84da7299b2229ff11ff4c61a5a Mon Sep 17 00:00:00 2001
From: facetosea <25808407@qq.com>
Date: Thu, 21 Nov 2024 14:44:27 +0800
Subject: [PATCH 2/2] delete unused code

---
 source/libs/executor/src/executorInt.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/libs/executor/src/executorInt.c b/source/libs/executor/src/executorInt.c
index eb49c90035..1b823bf69d 100644
--- a/source/libs/executor/src/executorInt.c
+++ b/source/libs/executor/src/executorInt.c
@@ -359,7 +359,6 @@ static int32_t doSetInputDataBlock(SExprSupp* pExprSup, SSDataBlock* pBlock, int
       SFunctParam* pFuncParam = &pOneExpr->base.pParam[j];
       if (pFuncParam->type == FUNC_PARAM_TYPE_COLUMN) {
         int32_t slotId = pFuncParam->pCol->slotId;
-        QUERY_CHECK_CONDITION((slotId < pBlock->pDataBlock->size), code, lino, _end, TSDB_CODE_QRY_EXECUTOR_INTERNAL_ERROR);
         pInput->pData[j] = taosArrayGet(pBlock->pDataBlock, slotId);
         pInput->totalRows = pBlock->info.rows;
         pInput->numOfRows = pBlock->info.rows;