diff --git a/source/dnode/vnode/src/meta/metaEntry.c b/source/dnode/vnode/src/meta/metaEntry.c index 73a35d27c2..739f84f0d9 100644 --- a/source/dnode/vnode/src/meta/metaEntry.c +++ b/source/dnode/vnode/src/meta/metaEntry.c @@ -228,16 +228,16 @@ static void metaCloneSchemaFree(SSchemaWrapper *pSchema) { } } -int32_t metaCloneEntryFree(SMetaEntry **ppEntry) { +void metaCloneEntryFree(SMetaEntry **ppEntry) { if (ppEntry == NULL || *ppEntry == NULL) { - return TSDB_CODE_SUCCESS; + return; } taosMemoryFreeClear((*ppEntry)->name); if ((*ppEntry)->type < 0) { taosMemoryFreeClear(*ppEntry); - return TSDB_CODE_SUCCESS; + return; } if (TSDB_SUPER_TABLE == (*ppEntry)->type) { @@ -250,12 +250,12 @@ int32_t metaCloneEntryFree(SMetaEntry **ppEntry) { metaCloneSchemaFree(&(*ppEntry)->ntbEntry.schemaRow); taosMemoryFreeClear((*ppEntry)->ntbEntry.comment); } else { - return TSDB_CODE_INVALID_PARA; + return; } metaCloneColCmprFree(&(*ppEntry)->colCmpr); taosMemoryFreeClear(*ppEntry); - return TSDB_CODE_SUCCESS; + return; } int32_t metaCloneEntry(const SMetaEntry *pEntry, SMetaEntry **ppEntry) { diff --git a/source/dnode/vnode/src/meta/metaEntry2.c b/source/dnode/vnode/src/meta/metaEntry2.c index 9faf576183..869510c6f9 100644 --- a/source/dnode/vnode/src/meta/metaEntry2.c +++ b/source/dnode/vnode/src/meta/metaEntry2.c @@ -11,7 +11,7 @@ #include "meta.h" int32_t metaCloneEntry(const SMetaEntry *pEntry, SMetaEntry **ppEntry); -int32_t metaCloneEntryFree(SMetaEntry **ppEntry); +void metaCloneEntryFree(SMetaEntry **ppEntry); void metaDestroyTagIdxKey(STagIdxKey *pTagIdxKey); 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; } -static int32_t metaFetchEntryFree(SMetaEntry **ppEntry) { return metaCloneEntryFree(ppEntry); } +static void metaFetchEntryFree(SMetaEntry **ppEntry) { metaCloneEntryFree(ppEntry); } // Entry Table static int32_t metaEntryTableUpsert(SMeta *pMeta, const SMetaHandleParam *pParam, EMetaTableOp op) {