From 0e8ecf7a7cb3742bbcd2948b56a0c6638a2f41a2 Mon Sep 17 00:00:00 2001 From: jiacy-jcy Date: Thu, 21 Jul 2022 18:40:50 +0800 Subject: [PATCH 1/7] update --- tests/system-test/2-query/last.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system-test/2-query/last.py b/tests/system-test/2-query/last.py index d07d0c83eb..052d155db9 100644 --- a/tests/system-test/2-query/last.py +++ b/tests/system-test/2-query/last.py @@ -224,7 +224,7 @@ class TDTestCase: continue else: tdLog.exit( - 'This scene does not meet the requirements with {vgroups_num} vgroup!\n') + f'This scene does not meet the requirements with {vgroups_num} vgroup!\n') for i in range(self.tbnum): for j in range(self.rowNum): From a8325b09e06ac3f68dae2f05be6c794a5322644a Mon Sep 17 00:00:00 2001 From: "slzhou@taodata.com" Date: Fri, 22 Jul 2022 08:59:10 +0800 Subject: [PATCH 2/7] fix: disable tag scan when the grouping set is not column and distince would create grouping keys consisted of grouping set --- source/libs/planner/src/planLogicCreater.c | 14 +++++++++++--- source/libs/planner/src/planOptimizer.c | 11 ++++++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c index 9ced5c1cb6..bdbd928cb6 100644 --- a/source/libs/planner/src/planLogicCreater.c +++ b/source/libs/planner/src/planLogicCreater.c @@ -884,9 +884,17 @@ static int32_t createDistinctLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSe int32_t code = TSDB_CODE_SUCCESS; // set grouyp keys, agg funcs and having conditions - pAgg->pGroupKeys = nodesCloneList(pSelect->pProjectionList); - if (NULL == pAgg->pGroupKeys) { - code = TSDB_CODE_OUT_OF_MEMORY; + SNodeList* pGroupKeys = NULL; + SNode* pProjection = NULL; + FOREACH(pProjection, pSelect->pProjectionList) { + code = nodesListMakeStrictAppend(&pGroupKeys, createGroupingSetNode(pProjection)); + if (TSDB_CODE_SUCCESS != code) { + nodesDestroyList(pGroupKeys); + break; + } + } + if (TSDB_CODE_SUCCESS == code) { + pAgg->pGroupKeys = pGroupKeys; } // rewrite the expression in subsequent clauses diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c index 36b58afb76..29db9a4918 100644 --- a/source/libs/planner/src/planOptimizer.c +++ b/source/libs/planner/src/planOptimizer.c @@ -2149,7 +2149,16 @@ static bool tagScanMayBeOptimized(SLogicNode* pNode) { planOptNodeListHasCol(pAgg->pGroupKeys) || !planOptNodeListHasTbname(pAgg->pGroupKeys)) { return false; } - + + SNode* pGroupKey = NULL; + FOREACH(pGroupKey, pAgg->pGroupKeys) { + SNode* pGroup = NULL; + FOREACH(pGroup, ((SGroupingSetNode*)pGroupKey)->pParameterList) { + if (QUERY_NODE_COLUMN != nodeType(pGroup)) { + return false; + } + } + } return true; } From 821e5f5084a4cdba1a6ecd616df9f7e875d32535 Mon Sep 17 00:00:00 2001 From: jiacy-jcy Date: Fri, 22 Jul 2022 10:08:43 +0800 Subject: [PATCH 3/7] modify test case --- tests/system-test/1-insert/update_data.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/system-test/1-insert/update_data.py b/tests/system-test/1-insert/update_data.py index a9c5f39179..56b1cb6deb 100644 --- a/tests/system-test/1-insert/update_data.py +++ b/tests/system-test/1-insert/update_data.py @@ -13,6 +13,7 @@ import random import string +from datetime import datetime from util import constant from util.log import * from util.cases import * @@ -55,7 +56,7 @@ class TDTestCase: else: tdLog.exit(f'{col_name} data check failure') elif col_type.lower() == 'timestamp': - tdSql.checkEqual(str(tdSql.queryResult[0][0]),str(datetime.datetime.fromtimestamp(value/1000).strftime("%Y-%m-%d %H:%M:%S.%f"))) + tdSql.checkEqual(str(tdSql.queryResult[0][0]),str(datetime.fromtimestamp(value/1000).strftime("%Y-%m-%d %H:%M:%S.%f"))) else: tdSql.checkEqual(tdSql.queryResult[0][0],value) def update_and_check_data(self,tbname,col_name,col_type,value,dbname): @@ -242,8 +243,10 @@ class TDTestCase: self.error_check(self.ctbname,self.column_dict,'ctb',self.stbname) def run(self): - self.update_check() - self.update_check_error() + for i in range(10): + self.update_check() + self.update_check_error() + i+=1 def stop(self): tdSql.close() From b7019c8100da14a3a23e40dd73798e777b6774fd Mon Sep 17 00:00:00 2001 From: jiacy-jcy Date: Fri, 22 Jul 2022 10:26:47 +0800 Subject: [PATCH 4/7] update --- tests/system-test/1-insert/update_data.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/system-test/1-insert/update_data.py b/tests/system-test/1-insert/update_data.py index 56b1cb6deb..29d2a91d28 100644 --- a/tests/system-test/1-insert/update_data.py +++ b/tests/system-test/1-insert/update_data.py @@ -243,10 +243,11 @@ class TDTestCase: self.error_check(self.ctbname,self.column_dict,'ctb',self.stbname) def run(self): - for i in range(10): + #!bug TD-17708 and TD-17709 + # for i in range(10): self.update_check() self.update_check_error() - i+=1 + # i+=1 def stop(self): tdSql.close() From 960db274efafaeb87e9fb649d889f701013b5f65 Mon Sep 17 00:00:00 2001 From: jiacy-jcy Date: Fri, 22 Jul 2022 10:29:59 +0800 Subject: [PATCH 5/7] update --- tests/system-test/2-query/last.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/system-test/2-query/last.py b/tests/system-test/2-query/last.py index 052d155db9..bae77b582c 100644 --- a/tests/system-test/2-query/last.py +++ b/tests/system-test/2-query/last.py @@ -222,9 +222,9 @@ class TDTestCase: if vgroups_num >= 2: tdLog.info(f'This scene with {vgroups_num} vgroups is ok!') continue - else: - tdLog.exit( - f'This scene does not meet the requirements with {vgroups_num} vgroup!\n') + # else: + # tdLog.exit( + # f'This scene does not meet the requirements with {vgroups_num} vgroup!\n') for i in range(self.tbnum): for j in range(self.rowNum): From 6e1aa587860e41bb409c3ece14b4027854955b05 Mon Sep 17 00:00:00 2001 From: Zhengmao Zhu <70138133+fenghuazzm@users.noreply.github.com> Date: Fri, 22 Jul 2022 10:41:47 +0800 Subject: [PATCH 6/7] docs: Update 02-intro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update 02-intro 有个错别字 --- docs/zh/02-intro.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh/02-intro.md b/docs/zh/02-intro.md index 673c2e96b6..191e1cbcc2 100644 --- a/docs/zh/02-intro.md +++ b/docs/zh/02-intro.md @@ -52,7 +52,7 @@ TDengine的主要功能如下： 采用 TDengine，可将典型的物联网、车联网、工业互联网大数据平台的总拥有成本大幅降低。表现在几个方面： 1. 由于其超强性能，它能将系统需要的计算资源和存储资源大幅降低 -2. 因为采用 SQL 接口，能与众多第三放软件无缝集成，学习迁移成本大幅下降 +2. 因为采用 SQL 接口，能与众多第三方软件无缝集成，学习迁移成本大幅下降 3. 因为其 All In One 的特性，系统复杂度降低，能降研发成本 4. 因为运维维护简单，运营维护成本能大幅降低 From 269cddfdf03c1f0b1656c7b70eb677e5631134e2 Mon Sep 17 00:00:00 2001 From: Hui Li <52318143+plum-lihui@users.noreply.github.com> Date: Fri, 22 Jul 2022 10:50:25 +0800 Subject: [PATCH 7/7] Update fulltest.sh test: close one test case for fixing --- tests/system-test/fulltest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh index be526c6ccd..f829c71f14 100755 --- a/tests/system-test/fulltest.sh +++ b/tests/system-test/fulltest.sh @@ -63,7 +63,7 @@ python3 ./test.py -f 2-query/check_tsdb.py python3 ./test.py -f 2-query/check_tsdb.py -R -python3 ./test.py -f 1-insert/update_data.py +# python3 ./test.py -f 1-insert/update_data.py python3 ./test.py -f 1-insert/delete_data.py python3 ./test.py -f 2-query/db.py