From d1101a03250f2fd1f8eecea3efc18341d772a088 Mon Sep 17 00:00:00 2001 From: wangjiaming0909 <604227650@qq.com> Date: Mon, 18 Mar 2024 17:54:50 +0800 Subject: [PATCH] support filter out tsma res tbs when show stables/tables --- include/common/tcommon.h | 8 ++++++++ source/dnode/mnode/impl/src/mndStb.c | 5 +++++ source/libs/executor/src/sysscanoperator.c | 5 +++++ 3 files changed, 18 insertions(+) diff --git a/include/common/tcommon.h b/include/common/tcommon.h index 30209fe607..a216c31ad4 100644 --- a/include/common/tcommon.h +++ b/include/common/tcommon.h @@ -416,6 +416,14 @@ int32_t taosGenCrashJsonMsg(int signum, char **pMsg, int64_t clusterId, int64_t #define TSMA_RES_STB_POSTFIX "_tsma_res_stb_" +static inline bool isTsmaResSTb(const char* stbName) { + const char* pos = strstr(stbName, TSMA_RES_STB_POSTFIX); + if (pos && strlen(stbName) == (pos - stbName) + strlen(TSMA_RES_STB_POSTFIX)) { + return true; + } + return false; +} + #ifdef __cplusplus } #endif diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c index f85e38cf83..9d2beb05ad 100644 --- a/source/dnode/mnode/impl/src/mndStb.c +++ b/source/dnode/mnode/impl/src/mndStb.c @@ -3231,6 +3231,11 @@ static int32_t mndRetrieveStb(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBloc continue; } + if (isTsmaResSTb(pStb->name)) { + sdbRelease(pSdb, pStb); + continue; + } + cols = 0; SName name = {0}; diff --git a/source/libs/executor/src/sysscanoperator.c b/source/libs/executor/src/sysscanoperator.c index 25b8dcfe6e..659ab79eb4 100644 --- a/source/libs/executor/src/sysscanoperator.c +++ b/source/libs/executor/src/sysscanoperator.c @@ -1408,6 +1408,11 @@ static SSDataBlock* sysTableBuildUserTables(SOperatorInfo* pOperator) { T_LONG_JMP(pTaskInfo->env, terrno); } + if (isTsmaResSTb(mr.me.name)) { + pAPI->metaReaderFn.clearReader(&mr); + continue; + } + // number of columns pColInfoData = taosArrayGet(p->pDataBlock, 3); colDataSetVal(pColInfoData, numOfRows, (char*)&mr.me.stbEntry.schemaRow.nCols, false);