From b589f9089c3956ddb354ee5666036b6bc06b6112 Mon Sep 17 00:00:00 2001 From: wangjiaming0909 <604227650@qq.com> Date: Mon, 18 Nov 2024 09:33:43 +0800 Subject: [PATCH] add test case --- source/libs/executor/src/scanoperator.c | 1 - source/libs/parser/src/parTranslater.c | 2 ++ tests/system-test/2-query/group_partition.py | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c index ecb6bd7aee..eac4f87b14 100644 --- a/source/libs/executor/src/scanoperator.c +++ b/source/libs/executor/src/scanoperator.c @@ -3043,7 +3043,6 @@ static int32_t setBlockIntoRes(SStreamScanInfo* pInfo, const SSDataBlock* pBlock } if (code) { - blockDataFreeRes((SSDataBlock*)pBlock); QUERY_CHECK_CODE(code, lino, _end); } diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index b77c349a78..9bea3491c3 100755 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -5531,6 +5531,7 @@ static int32_t translateGroupByList(STranslateContext* pCxt, SSelectStmt* pSelec SReplaceGroupByAliasCxt cxt = { .pTranslateCxt = pCxt, .pProjectionList = pSelect->pProjectionList}; nodesRewriteExprsPostOrder(pSelect->pGroupByList, translateGroupPartitionByImpl, &cxt); + return pCxt->errCode; } @@ -5542,6 +5543,7 @@ static int32_t translatePartitionByList(STranslateContext* pCxt, SSelectStmt* pS SReplaceGroupByAliasCxt cxt = { .pTranslateCxt = pCxt, .pProjectionList = pSelect->pProjectionList}; nodesRewriteExprsPostOrder(pSelect->pPartitionByList, translateGroupPartitionByImpl, &cxt); + return pCxt->errCode; } diff --git a/tests/system-test/2-query/group_partition.py b/tests/system-test/2-query/group_partition.py index b77cf3f8b7..74f5e86267 100644 --- a/tests/system-test/2-query/group_partition.py +++ b/tests/system-test/2-query/group_partition.py @@ -439,13 +439,16 @@ class TDTestCase: tdSql.checkRows(10) def test_TD_32883(self): - sql = "select avg(c1), t9 from stb group by t9,t9, tbname" + sql = "select avg(c1), t9 from db.stb group by t9,t9, tbname" tdSql.query(sql, queryTimes=1) tdSql.checkRows(5) - sql = "select avg(c1), t10 from stb group by t10,t10, tbname" + sql = "select avg(c1), t10 from db.stb group by t10,t10, tbname" tdSql.query(sql, queryTimes=1) tdSql.checkRows(5) - sql = "select avg(c1), t10 from stb partition by t10,t10, tbname" + sql = "select avg(c1), t10 from db.stb partition by t10,t10, tbname" + tdSql.query(sql, queryTimes=1) + tdSql.checkRows(5) + sql = "select avg(c1), concat(t9,t10) from db.stb group by concat(t9,t10), concat(t9,t10),tbname" tdSql.query(sql, queryTimes=1) tdSql.checkRows(5)