xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix ci error

This commit is contained in:
yihaoDeng 2024-04-01 01:39:50 +00:00
parent c852a8d092
commit 237ec5a46c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/dnode/vnode/src/meta/metaEntry.c
View File

@ -18,6 +18,7 @@
int meteEncodeColCmprEntry(SEncoder *pCoder, const SMetaEntry *pME) { int meteEncodeColCmprEntry(SEncoder *pCoder, const SMetaEntry *pME) {
const SColCmprWrapper *pw = &pME->colCmpr; const SColCmprWrapper *pw = &pME->colCmpr;
if (tEncodeI32v(pCoder, pw->nCols) < 0) return -1; if (tEncodeI32v(pCoder, pw->nCols) < 0) return -1;
uInfo("encode cols:%d");
if (tEncodeI32v(pCoder, pw->version) < 0) return -1; if (tEncodeI32v(pCoder, pw->version) < 0) return -1;
for (int32_t i = 0; i < pw->nCols; i++) { for (int32_t i = 0; i < pw->nCols; i++) {
@ -31,6 +32,7 @@ int meteDecodeColCmprEntry(SDecoder *pDecoder, SMetaEntry *pME) {
SColCmprWrapper *pWrapper = &pME->colCmpr; SColCmprWrapper *pWrapper = &pME->colCmpr;
if (tDecodeI32v(pDecoder, &pWrapper->nCols) < 0) return -1; if (tDecodeI32v(pDecoder, &pWrapper->nCols) < 0) return -1;
if (tDecodeI32v(pDecoder, &pWrapper->version) < 0) return -1; if (tDecodeI32v(pDecoder, &pWrapper->version) < 0) return -1;
uInfo("dencode cols:%d", pWrapper->nCols);
pWrapper->pColCmpr = (SColCmpr *)tDecoderMalloc(pDecoder, pWrapper->nCols * sizeof(SColCmpr)); pWrapper->pColCmpr = (SColCmpr *)tDecoderMalloc(pDecoder, pWrapper->nCols * sizeof(SColCmpr));
if (pWrapper->pColCmpr == NULL) return -1; if (pWrapper->pColCmpr == NULL) return -1;
@ -42,7 +44,7 @@ int meteDecodeColCmprEntry(SDecoder *pDecoder, SMetaEntry *pME) {
} }
return 0; return 0;
END: END:
taosMemoryFree(pWrapper->pColCmpr); // taosMemoryFree(pWrapper->pColCmpr);
return -1; return -1;
} }
static FORCE_INLINE void metatInitDefaultSColCmprWrapper(SDecoder *pDecoder, SColCmprWrapper *pCmpr, static FORCE_INLINE void metatInitDefaultSColCmprWrapper(SDecoder *pDecoder, SColCmprWrapper *pCmpr,
@ -98,10 +100,7 @@ int metaEncodeEntry(SEncoder *pCoder, const SMetaEntry *pME) {
return -1; return -1;
} }
if (meteEncodeColCmprEntry(pCoder, pME) < 0) return -1;
if (TABLE_IS_COL_COMPRESSED(pME->flags)) {
if (meteEncodeColCmprEntry(pCoder, pME) < 0) return -1;
}
tEndEncode(pCoder); tEndEncode(pCoder);
return 0; return 0;
@ -152,9 +151,11 @@ int metaDecodeEntry(SDecoder *pCoder, SMetaEntry *pME) {
return -1; return -1;
} }
if (!tDecodeIsEnd(pCoder)) { if (!tDecodeIsEnd(pCoder)) {
uInfo("set default, type: %d", pME->type, pME->name);
if (meteDecodeColCmprEntry(pCoder, pME) < 0) return -1; if (meteDecodeColCmprEntry(pCoder, pME) < 0) return -1;
TABLE_SET_COL_COMPRESSED(pME->flags); TABLE_SET_COL_COMPRESSED(pME->flags);
} else { } else {
uInfo("set default, type: %d", pME->type, pME->name);
if (pME->type == TSDB_SUPER_TABLE) { if (pME->type == TSDB_SUPER_TABLE) {
metatInitDefaultSColCmprWrapper(pCoder, &pME->colCmpr, &pME->stbEntry.schemaRow); metatInitDefaultSColCmprWrapper(pCoder, &pME->colCmpr, &pME->stbEntry.schemaRow);
} else if (pME->type == TSDB_NORMAL_TABLE) { } else if (pME->type == TSDB_NORMAL_TABLE) {

2
source/libs/qcom/src/queryUtil.c
View File

@ -472,7 +472,7 @@ int32_t cloneTableMeta(STableMeta* pSrc, STableMeta** pDst) {
return TSDB_CODE_OUT_OF_MEMORY; return TSDB_CODE_OUT_OF_MEMORY;
} }
memcpy(*pDst, pSrc, metaSize); memcpy(*pDst, pSrc, metaSize);
if (useCompress(pSrc->tableType) && pSrc->schemaExt) { if (useCompress(pSrc->tableType) && pSrc->schemaExt ) {
(*pDst)->schemaExt = (SSchemaExt*)((char*)*pDst + metaSize); (*pDst)->schemaExt = (SSchemaExt*)((char*)*pDst + metaSize);
memcpy((*pDst)->schemaExt, pSrc->schemaExt, schemaExtSize); memcpy((*pDst)->schemaExt, pSrc->schemaExt, schemaExtSize);
} else { } else {