xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #28879 from taosdata/fix/TS-5677/rewriteGroupbyFunc 

fix: rewrite groupkey while using windows
This commit is contained in:
Shengliang Guan 2024-11-24 11:45:07 +08:00 committed by GitHub
parent 868a1ce80c ec8c077668
commit 062a8a2831
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/parser/src/parTranslater.c
View File

@ -3761,7 +3761,7 @@ static EDealRes doCheckExprForGroupBy(SNode** pNode, void* pContext) {
bool partionByTbname = hasTbnameFunction(pSelect->pPartitionByList);
FOREACH(pPartKey, pSelect->pPartitionByList) {
if (nodesEqualNode(pPartKey, *pNode)) {
return pSelect->hasAggFuncs ? rewriteExprToGroupKeyFunc(pCxt, pNode) : DEAL_RES_IGNORE_CHILD;
return (pSelect->hasAggFuncs || pSelect->pWindow) ? rewriteExprToGroupKeyFunc(pCxt, pNode) : DEAL_RES_IGNORE_CHILD;
}
if ((partionByTbname) && QUERY_NODE_COLUMN == nodeType(*pNode) &&
((SColumnNode*)*pNode)->colType == COLUMN_TYPE_TAG) {

35
tests/system-test/2-query/case_when.py
View File

@ -128,6 +128,41 @@ class TDTestCase:
self.constant_check(database,sql1,sql2,1)
self.constant_check(database,sql1,sql2,2)
#TS-5677
sql1 = "select tbname, _wstart, case when (q_tinyint >= 0) THEN 1 ELSE 0 END status from %s.stable_1 \
where ts < now partition by tbname state_window(case when q_tinyint>=0 then 1 else 0 end);" %database
sql2 = "select count(*), _wstart, case when (q_tinyint >= 0) THEN 1 ELSE 0 END status from %s.stable_1 \
where ts < now partition by tbname state_window(case when q_tinyint>=0 then 1 else 0 end);" %database
sql3 = "select tbname, max(q_int), _wstart, case when (q_tinyint >= 0) THEN 1 ELSE 0 END status from %s.stable_1 \
where ts < now partition by tbname state_window(case when q_tinyint>=0 then 1 else 0 end);" %database
sql3 = "select t_int, tbname, max(q_int), _wstart, case when (q_tinyint >= 0) THEN 1 ELSE 0 END status from %s.stable_1 \
where ts < now partition by tbname state_window(case when q_tinyint>=0 then 1 else 0 end);" %database
tdSql.query(sql1)
rows = tdSql.queryRows
tdSql.query(sql2)
tdSql.checkRows(rows)
tdSql.query(sql3)
tdSql.checkRows(rows)
sql1 = "select t_int, _wstart, case when (q_tinyint >= 0) THEN 1 ELSE 0 END status from %s.stable_1 \
where ts < now partition by t_int state_window(case when q_tinyint>=0 then 1 else 0 end);" %database
sql2 = "select count(*), _wstart, case when (q_tinyint >= 0) THEN 1 ELSE 0 END status from %s.stable_1 \
where ts < now partition by t_int state_window(case when q_tinyint>=0 then 1 else 0 end);" %database
tdSql.query(sql1)
rows = tdSql.queryRows
tdSql.query(sql2)
tdSql.checkRows(rows)
sql2 = "select t_int, count(*), _wstart, case when (q_tinyint >= 0) THEN 1 ELSE 0 END status from %s.stable_1 \
where ts < now partition by tbname, t_int state_window(case when q_tinyint>=0 then 1 else 0 end);" %database
sql2 = "select tbname, count(*), _wstart, case when (q_tinyint >= 0) THEN 1 ELSE 0 END status from %s.stable_1 \
where ts < now partition by tbname, t_int state_window(case when q_tinyint>=0 then 1 else 0 end);" %database
tdSql.query(sql1)
tdSql.query(sql1)
rows = tdSql.queryRows
tdSql.query(sql2)
tdSql.checkRows(rows)
def casewhen_list(self):
a1,a2,a3 = random.randint(-2147483647,2147483647),random.randint(-2147483647,2147483647),random.randint(-2147483647,2147483647)
casewhen_lists = ['first case when %d then %d end last' %(a1,a2) , #'first case when 3 then 4 end last' ,