From bf33ef0c07db5e173c85b134a7d82967478ed08b Mon Sep 17 00:00:00 2001 From: kailixu Date: Fri, 27 Dec 2024 18:57:12 +0800 Subject: [PATCH] test: add test case for auto compact --- source/dnode/mnode/impl/src/mndDb.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c index e6a7a9cf6b..432d0329d1 100644 --- a/source/dnode/mnode/impl/src/mndDb.c +++ b/source/dnode/mnode/impl/src/mndDb.c @@ -2561,22 +2561,21 @@ static void mndDumpDbInfoData(SMnode *pMnode, SSDataBlock *pBlock, SDbObj *pDb, pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); TAOS_CHECK_GOTO(colDataSetVal(pColInfo, rows, (const char *)encryptAlgorithmVStr, false), &lino, _OVER); - formatDurationOrKeep(durationStr, sizeof(durationStr), pDb->cfg.compactInterval); - STR_WITH_MAXSIZE_TO_VARSTR(durationVstr, durationStr, sizeof(durationVstr)); - pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); - if (pColInfo) { - TAOS_CHECK_GOTO(colDataSetVal(pColInfo, rows, (const char *)durationVstr, false), &lino, _OVER); - } - - len = formatDurationOrKeep(durationStr, sizeof(durationStr), pDb->cfg.compactStartTime); - formatDurationOrKeep(durationVstr, sizeof(durationVstr), pDb->cfg.compactEndTime); - (void)snprintf(durationStr + len, sizeof(durationStr) - len, ",%s", durationVstr); + TAOS_UNUSED(formatDurationOrKeep(durationStr, sizeof(durationStr), pDb->cfg.compactInterval)); STR_WITH_MAXSIZE_TO_VARSTR(durationVstr, durationStr, sizeof(durationVstr)); if ((pColInfo = taosArrayGet(pBlock->pDataBlock, cols++))) { TAOS_CHECK_GOTO(colDataSetVal(pColInfo, rows, (const char *)durationVstr, false), &lino, _OVER); } - (void)snprintf(durationStr, sizeof(durationStr), "%dh", pDb->cfg.compactTimeOffset); + len = formatDurationOrKeep(durationStr, sizeof(durationStr), pDb->cfg.compactStartTime); + formatDurationOrKeep(durationVstr, sizeof(durationVstr), pDb->cfg.compactEndTime); + TAOS_UNUSED(snprintf(durationStr + len, sizeof(durationStr) - len, ",%s", durationVstr)); + STR_WITH_MAXSIZE_TO_VARSTR(durationVstr, durationStr, sizeof(durationVstr)); + if ((pColInfo = taosArrayGet(pBlock->pDataBlock, cols++))) { + TAOS_CHECK_GOTO(colDataSetVal(pColInfo, rows, (const char *)durationVstr, false), &lino, _OVER); + } + + TAOS_UNUSED(snprintf(durationStr, sizeof(durationStr), "%dh", pDb->cfg.compactTimeOffset)); STR_WITH_MAXSIZE_TO_VARSTR(durationVstr, durationStr, sizeof(durationVstr)); if ((pColInfo = taosArrayGet(pBlock->pDataBlock, cols++))) { TAOS_CHECK_GOTO(colDataSetVal(pColInfo, rows, (const char *)durationVstr, false), &lino, _OVER);