From 61380b7822f7b576845b28132c8b8b7082c63474 Mon Sep 17 00:00:00 2001 From: kailixu Date: Thu, 6 Jul 2023 11:09:44 +0800 Subject: [PATCH] chore: test case adaption --- source/dnode/vnode/src/sma/smaRollup.c | 2 +- .../tsim/sma/rsmaPersistenceRecovery.sim | 40 +++++++++++-------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/source/dnode/vnode/src/sma/smaRollup.c b/source/dnode/vnode/src/sma/smaRollup.c index dece1f90a1..99a3fd1f46 100644 --- a/source/dnode/vnode/src/sma/smaRollup.c +++ b/source/dnode/vnode/src/sma/smaRollup.c @@ -647,7 +647,7 @@ static int32_t tdRSmaExecAndSubmitResult(SSma *pSma, qTaskInfo_t taskInfo, SRSma for (int32_t i = 0; i < taosArrayGetSize(pResList); ++i) { output = taosArrayGetP(pResList, i); - smaDebug("vgId:%d, result block, uid:%" PRIu64 ", groupid:%" PRIu64 ", rows:%d", SMA_VID(pSma), + smaDebug("vgId:%d, result block, uid:%" PRIu64 ", groupid:%" PRIu64 ", rows:%" PRIi64, SMA_VID(pSma), output->info.id.uid, output->info.id.groupId, output->info.rows); STsdb *sinkTsdb = (pItem->level == TSDB_RETENTION_L1 ? pSma->pRSmaTsdb[0] : pSma->pRSmaTsdb[1]); diff --git a/tests/script/tsim/sma/rsmaPersistenceRecovery.sim b/tests/script/tsim/sma/rsmaPersistenceRecovery.sim index eaab20962d..709d2ffda8 100644 --- a/tests/script/tsim/sma/rsmaPersistenceRecovery.sim +++ b/tests/script/tsim/sma/rsmaPersistenceRecovery.sim @@ -349,16 +349,18 @@ if $rows > 2 then endi if $data01 != 100 then - if $data01 != 50 then - print retention level 2 file/mem result $data01 != 100 or 50 + if $data01 != 10 then + print retention level 2 file/mem result $data01 != 100 or 10 return -1 endi endi if $data02 != 500.00000 then if $data02 != 100.00000 then - print retention level 1 file/mem result $data02 != 500.00000 or 100.00000 - return -1 + if $data02 != 10.00000 then + print retention level 1 file/mem result $data02 != 500.00000 or 100.00000 or 10.00000 + return -1 + endi endi endi @@ -371,16 +373,18 @@ if $rows > 2 then endi if $data01 != 100 then - if $data01 != 50 then - print retention level 2 file/mem result $data01 != 100 or 50 + if $data01 != 10 then + print retention level 2 file/mem result $data01 != 100 or 10 return -1 endi endi if $data02 != 500.00000 then if $data02 != 100.00000 then - print retention level 1 file/mem result $data02 != 500.00000 or 100.00000 - return -1 + if $data02 != 10.00000 then + print retention level 1 file/mem result $data02 != 500.00000 or 100.00000 or 10.00000 + return -1 + endi endi endi @@ -394,16 +398,18 @@ if $rows > 2 then endi if $data01 != 100 then - if $data01 != 50 then - print retention level 1 file/mem result $data01 != 100 or 50 + if $data01 != 10 then + print retention level 1 file/mem result $data01 != 100 or 10 return -1 endi endi if $data02 != 500.00000 then if $data02 != 100.00000 then - print retention level 1 file/mem result $data02 != 500.00000 or 100.00000 - return -1 + if $data02 != 10.00000 then + print retention level 1 file/mem result $data02 != 500.00000 or 100.00000 or 10.00000 + return -1 + endi endi endi @@ -416,16 +422,18 @@ if $rows > 2 then endi if $data01 != 100 then - if $data01 != 50 then - print retention level 1 file/mem result $data01 != 100 or 50 + if $data01 != 10 then + print retention level 1 file/mem result $data01 != 100 or 10 return -1 endi endi if $data02 != 500.00000 then if $data02 != 100.00000 then - print retention level 1 file/mem result $data02 != 500.00000 or 100.00000 - return -1 + if $data02 != 10.00000 then + print retention level 1 file/mem result $data02 != 500.00000 or 100.00000 or 10.00000 + return -1 + endi endi endi -- GitLab