From d21341c9431d06cb57cb7ffcf146ef9337a7681d Mon Sep 17 00:00:00 2001 From: Yihao Deng Date: Thu, 18 Apr 2024 08:16:40 +0000 Subject: [PATCH] fix TD-29562 --- source/dnode/vnode/src/meta/metaEntry.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/source/dnode/vnode/src/meta/metaEntry.c b/source/dnode/vnode/src/meta/metaEntry.c index 7477833fe9..177bd60450 100644 --- a/source/dnode/vnode/src/meta/metaEntry.c +++ b/source/dnode/vnode/src/meta/metaEntry.c @@ -149,16 +149,13 @@ int metaDecodeEntry(SDecoder *pCoder, SMetaEntry *pME) { metaError("meta/entry: invalide table type: %" PRId8 " decode failed.", pME->type); return -1; } - if (!tDecodeIsEnd(pCoder)) { - uDebug("set type: %d, tableName:%s", pME->type, pME->name); + if (TABLE_IS_COL_COMPRESSED(pME->flags)) { if (meteDecodeColCmprEntry(pCoder, pME) < 0) return -1; - TABLE_SET_COL_COMPRESSED(pME->flags); } else { - uDebug("set default type: %d, tableName:%s", pME->type, pME->name); - if (pME->type == TSDB_SUPER_TABLE) { - metatInitDefaultSColCmprWrapper(pCoder, &pME->colCmpr, &pME->stbEntry.schemaRow); - } else if (pME->type == TSDB_NORMAL_TABLE) { - metatInitDefaultSColCmprWrapper(pCoder, &pME->colCmpr, &pME->ntbEntry.schemaRow); + int8_t type = pME->type; + if (type == TSDB_SUPER_TABLE || type == TSDB_NORMAL_TABLE) { + SSchemaWrapper *pWrapper = type == TSDB_SUPER_TABLE ? &pME->stbEntry.schemaRow : &pME->ntbEntry.schemaRow; + metatInitDefaultSColCmprWrapper(pCoder, &pME->colCmpr, pWrapper); } }