From dfdd43598c36f8cf1d2314f97447e2f092dadf6c Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Sun, 24 Apr 2022 15:02:32 +0800 Subject: [PATCH 1/6] run python test in 3.0 ci --- Jenkinsfile2 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 441cf89626..a2043797c0 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -88,6 +88,12 @@ def pre_test(){ cmake .. > /dev/null make -j4> /dev/null ''' + sh''' + cd ${WKPY} + git reset --hard + git pull + pip3 install . + ''' return 1 } @@ -97,6 +103,7 @@ pipeline { environment{ WK = '/var/lib/jenkins/workspace/TDinternal' WKC= '/var/lib/jenkins/workspace/TDengine' + WKPY= '/var/lib/jenkins/workspace/taos-connector-python' } stages { stage('pre_build'){ @@ -117,6 +124,11 @@ pipeline { ./test-all.sh b1fq ''' sh''' + export LD_LIBRARY_PATH=${WKC}/debug/build/lib + cd ${WKC}/tests/system-test + ./fulltest.sh + ''' + sh''' cd ${WKC}/debug ctest ''' From b430f4e56137ce1914cd8ce8d9de4d403523ea30 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Sun, 24 Apr 2022 16:01:05 +0800 Subject: [PATCH 2/6] fix(query): disable timestamp type arithmetic operation with var type TD-15094 --- source/libs/parser/src/parTranslater.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index 01a386427d..fecfb74947 100644 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -543,7 +543,9 @@ static EDealRes translateOperator(STranslateContext* pCxt, SOperatorNode* pOp) { TSDB_DATA_TYPE_BLOB == rdt.type) { return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, ((SExprNode*)(pOp->pRight))->aliasName); } - if (TSDB_DATA_TYPE_TIMESTAMP == ldt.type && TSDB_DATA_TYPE_TIMESTAMP == rdt.type) { + if ((TSDB_DATA_TYPE_TIMESTAMP == ldt.type && TSDB_DATA_TYPE_TIMESTAMP == rdt.type) || + (TSDB_DATA_TYPE_TIMESTAMP == ldt.type && IS_VAR_DATA_TYPE(rdt.type)) || + (TSDB_DATA_TYPE_TIMESTAMP == rdt.type && IS_VAR_DATA_TYPE(ldt.type))) { return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, ((SExprNode*)(pOp->pRight))->aliasName); } From 6f39f24c0cfa557db49ad537baf4497f4f027a06 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Sun, 24 Apr 2022 19:10:23 +0800 Subject: [PATCH 3/6] ci: stop valgrind test for a while --- tests/script/jenkins/basic.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 31b1fff826..f5314598e5 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -85,6 +85,6 @@ ./test.sh -f tsim/sma/tsmaCreateInsertData.sim # --- valgrind -./test.sh -f tsim/valgrind/checkError.sim -v +#./test.sh -f tsim/valgrind/checkError.sim -v #======================b1-end=============== From 28f9f135a9819086a87b5d33f0f7d9e246c66a92 Mon Sep 17 00:00:00 2001 From: tangfangzhi Date: Sun, 24 Apr 2022 19:12:25 +0800 Subject: [PATCH 4/6] change test order --- Jenkinsfile2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index a2043797c0..cca886d4af 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -120,8 +120,8 @@ pipeline { timeout(time: 45, unit: 'MINUTES'){ pre_test() sh''' - cd ${WKC}/tests - ./test-all.sh b1fq + cd ${WKC}/debug + ctest ''' sh''' export LD_LIBRARY_PATH=${WKC}/debug/build/lib @@ -129,8 +129,8 @@ pipeline { ./fulltest.sh ''' sh''' - cd ${WKC}/debug - ctest + cd ${WKC}/tests + ./test-all.sh b1fq ''' } } From 54a21692268b479f68af9b82a83b83f7c7fc12b7 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Sun, 24 Apr 2022 19:38:43 +0800 Subject: [PATCH 5/6] ci: remove tmq/basic.sim -m --- tests/script/jenkins/basic.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index f5314598e5..83bd016d2f 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -76,7 +76,7 @@ ./test.sh -f tsim/insert/backquote.sim -m ./test.sh -f tsim/parser/fourArithmetic-basic.sim -m ./test.sh -f tsim/query/interval-offset.sim -m -./test.sh -f tsim/tmq/basic1.sim -m +#./test.sh -f tsim/tmq/basic1.sim -m ./test.sh -f tsim/stable/vnode3.sim -m ./test.sh -f tsim/qnode/basic1.sim -m ./test.sh -f tsim/mnode/basic1.sim -m From faec53541443f473ff2118b4876578a2ba8db302 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Sun, 24 Apr 2022 20:03:48 +0800 Subject: [PATCH 6/6] fix(cluster): repair dmnodeTest --- source/dnode/mgmt/implement/src/dmHandle.c | 3 ++- source/dnode/mgmt/mgmt_mnode/src/mmInt.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/dnode/mgmt/implement/src/dmHandle.c b/source/dnode/mgmt/implement/src/dmHandle.c index 90e28f3c5b..af4b9d389e 100644 --- a/source/dnode/mgmt/implement/src/dmHandle.c +++ b/source/dnode/mgmt/implement/src/dmHandle.c @@ -17,7 +17,7 @@ #include "dmImp.h" static void dmUpdateDnodeCfg(SDnode *pDnode, SDnodeCfg *pCfg) { - if (pDnode->data.dnodeId == 0) { + if (pDnode->data.dnodeId == 0 || pDnode->data.clusterId == 0) { dInfo("set dnodeId:%d clusterId:%" PRId64, pCfg->dnodeId, pCfg->clusterId); taosWLockLatch(&pDnode->data.latch); pDnode->data.dnodeId = pCfg->dnodeId; @@ -57,6 +57,7 @@ void dmSendStatusReq(SDnode *pDnode) { req.dnodeVer = pDnode->data.dnodeVer; req.dnodeId = pDnode->data.dnodeId; req.clusterId = pDnode->data.clusterId; + if (req.clusterId == 0) req.dnodeId = 0; req.rebootTime = pDnode->data.rebootTime; req.updateTime = pDnode->data.updateTime; req.numOfCores = tsNumOfCores; diff --git a/source/dnode/mgmt/mgmt_mnode/src/mmInt.c b/source/dnode/mgmt/mgmt_mnode/src/mmInt.c index f707426ab4..db69b62e58 100644 --- a/source/dnode/mgmt/mgmt_mnode/src/mmInt.c +++ b/source/dnode/mgmt/mgmt_mnode/src/mmInt.c @@ -161,9 +161,9 @@ static int32_t mmOpen(SMgmtWrapper *pWrapper) { SMnodeOpt option = {0}; if (!deployed) { dInfo("mnode start to deploy"); - if (pWrapper->procType == DND_PROC_CHILD) { + // if (pWrapper->procType == DND_PROC_CHILD) { pWrapper->pDnode->data.dnodeId = 1; - } + // } mmBuildOptionForDeploy(pMgmt, &option); } else { dInfo("mnode start to open");