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

fix: check return code

This commit is contained in:
Hongze Cheng 2024-12-09 19:16:42 +08:00
parent 57f16a6f24
commit 4458956f6a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,16 +228,16 @@ static void metaCloneSchemaFree(SSchemaWrapper *pSchema) {
} }
} }
int32_t metaCloneEntryFree(SMetaEntry **ppEntry) { void metaCloneEntryFree(SMetaEntry **ppEntry) {
if (ppEntry == NULL || *ppEntry == NULL) { if (ppEntry == NULL || *ppEntry == NULL) {
return TSDB_CODE_SUCCESS; return;
} }
taosMemoryFreeClear((*ppEntry)->name); taosMemoryFreeClear((*ppEntry)->name);
if ((*ppEntry)->type < 0) { if ((*ppEntry)->type < 0) {
taosMemoryFreeClear(*ppEntry); taosMemoryFreeClear(*ppEntry);
return TSDB_CODE_SUCCESS; return;
} }
if (TSDB_SUPER_TABLE == (*ppEntry)->type) { if (TSDB_SUPER_TABLE == (*ppEntry)->type) {
@ -250,12 +250,12 @@ int32_t metaCloneEntryFree(SMetaEntry **ppEntry) {
metaCloneSchemaFree(&(*ppEntry)->ntbEntry.schemaRow); metaCloneSchemaFree(&(*ppEntry)->ntbEntry.schemaRow);
taosMemoryFreeClear((*ppEntry)->ntbEntry.comment); taosMemoryFreeClear((*ppEntry)->ntbEntry.comment);
} else { } else {
return TSDB_CODE_INVALID_PARA; return;
} }
metaCloneColCmprFree(&(*ppEntry)->colCmpr); metaCloneColCmprFree(&(*ppEntry)->colCmpr);
taosMemoryFreeClear(*ppEntry); taosMemoryFreeClear(*ppEntry);
return TSDB_CODE_SUCCESS; return;
} }
int32_t metaCloneEntry(const SMetaEntry *pEntry, SMetaEntry **ppEntry) { int32_t metaCloneEntry(const SMetaEntry *pEntry, SMetaEntry **ppEntry) {

4
source/dnode/vnode/src/meta/metaEntry2.c
View File

@ -11,7 +11,7 @@
#include "meta.h" #include "meta.h"
int32_t metaCloneEntry(const SMetaEntry *pEntry, SMetaEntry **ppEntry); int32_t metaCloneEntry(const SMetaEntry *pEntry, SMetaEntry **ppEntry);
int32_t metaCloneEntryFree(SMetaEntry **ppEntry); void metaCloneEntryFree(SMetaEntry **ppEntry);
void metaDestroyTagIdxKey(STagIdxKey *pTagIdxKey); void metaDestroyTagIdxKey(STagIdxKey *pTagIdxKey);
int metaSaveJsonVarToIdx(SMeta *pMeta, const SMetaEntry *pCtbEntry, const SSchema *pSchema); int metaSaveJsonVarToIdx(SMeta *pMeta, const SMetaEntry *pCtbEntry, const SSchema *pSchema);
@ -128,7 +128,7 @@ static int32_t metaFetchEntryByName(SMeta *pMeta, const char *name, SMetaEntry *
return code; return code;
} }
static int32_t metaFetchEntryFree(SMetaEntry **ppEntry) { return metaCloneEntryFree(ppEntry); } static void metaFetchEntryFree(SMetaEntry **ppEntry) { metaCloneEntryFree(ppEntry); }
// Entry Table // Entry Table
static int32_t metaEntryTableUpsert(SMeta *pMeta, const SMetaHandleParam *pParam, EMetaTableOp op) { static int32_t metaEntryTableUpsert(SMeta *pMeta, const SMetaHandleParam *pParam, EMetaTableOp op) {