From 1181f9de2839c582abefed09ce99736803e4794e Mon Sep 17 00:00:00 2001 From: Yihao Deng Date: Wed, 24 Apr 2024 08:22:54 +0000 Subject: [PATCH] Fix metaGetColCmpr function and remove commented code --- source/dnode/vnode/src/meta/metaTable.c | 2 ++ source/dnode/vnode/src/tsdb/tsdbFSetRW.c | 14 +------------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c index f89ed73ac9..df54591ae8 100644 --- a/source/dnode/vnode/src/meta/metaTable.c +++ b/source/dnode/vnode/src/meta/metaTable.c @@ -2661,6 +2661,8 @@ int32_t metaGetColCmpr(SMeta *pMeta, tb_uid_t uid, SHashObj **ppColCmprObj) { SMetaEntry e = {0}; SDecoder dc = {0}; + *ppColCmprObj = NULL; + metaRLock(pMeta); rc = tdbTbGet(pMeta->pUidIdx, &uid, sizeof(uid), &pData, &nData); if (rc < 0) { diff --git a/source/dnode/vnode/src/tsdb/tsdbFSetRW.c b/source/dnode/vnode/src/tsdb/tsdbFSetRW.c index 304e4ccb9b..f6ca515d1e 100644 --- a/source/dnode/vnode/src/tsdb/tsdbFSetRW.c +++ b/source/dnode/vnode/src/tsdb/tsdbFSetRW.c @@ -46,7 +46,7 @@ static int32_t tsdbFSetWriteTableDataBegin(SFSetWriter *writer, const TABLEID *t code = tsdbUpdateSkmTb(writer->config->tsdb, writer->ctx->tbid, writer->skmTb); code = metaGetColCmpr(writer->config->tsdb->pVnode->pMeta, tbid->suid ? tbid->suid : tbid->uid, &writer->pColCmprObj); - TSDB_CHECK_CODE(code, lino, _exit); + // TSDB_CHECK_CODE(code, lino, _exit); writer->blockDataIdx = 0; for (int32_t i = 0; i < ARRAY_SIZE(writer->blockData); i++) { @@ -301,15 +301,3 @@ _exit: } return code; } -// int32_t tsdbGetCompressByUid(SFSetWriter *writer, tb_uid_t uid, struct SColCompressInfo *info) { -// SHashObj *p = NULL; -// int32_t code = metaGetColCmpr(writer->config->tsdb->pVnode->pMeta, uid, &p); -// if (code < 0) { -// ASSERT(0); -// taosHashCleanup(p); -// p = NULL; -// } else { -// } -// info->pColCmpr = p; -// return code; -// }