Merge branch '3.0' into merge/mainto3.0

This commit is contained in:
Simon Guan 2025-03-17 22:28:22 +08:00
commit cee5ab4297
1 changed files with 4 additions and 3 deletions

View File

@ -236,8 +236,9 @@ int32_t ctgGetTbMeta(SCatalog* pCtg, SRequestConnInfo* pConn, SCtgTbMetaCtx* ctx
output->tbMeta->colRef = (SColRef *)((char *)output->tbMeta + metaSize + schemaExtSize);
TAOS_MEMCPY(output->tbMeta->colRef, output->vctbMeta->colRef, colRefSize);
} else {
TAOS_MEMCPY(output->tbMeta, output->vctbMeta, sizeof(SVCTableMeta) + colRefSize);
output->tbMeta->colRef = (SColRef *)((char *)output->tbMeta + sizeof(SVCTableMeta));
ctgError("tb:%s, tbmeta got, but tbMeta is NULL", output->tbName);
taosMemoryFreeClear(output->vctbMeta);
CTG_ERR_JRET(TSDB_CODE_CTG_INTERNAL_ERROR);
}
output->tbMeta->numOfColRefs = output->vctbMeta->numOfColRefs;
taosMemoryFreeClear(output->vctbMeta);