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

refact: free func update when build submit req

This commit is contained in:
kailixu 2022-12-03 21:47:08 +08:00
parent 79c047c5d0
commit 614462b878
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/common/tmsg.h
View File

@ -3264,7 +3264,8 @@ void tDestroySSubmitRsp2(SSubmitRsp2* pRsp, int32_t flag);
#define TSDB_MSG_FLG_ENCODE 0x1 #define TSDB_MSG_FLG_ENCODE 0x1
#define TSDB_MSG_FLG_DECODE 0x2 #define TSDB_MSG_FLG_DECODE 0x2
int32_t tBuildSubmitReq(int32_t vgId, SSubmitReq2* pReq, void** pData, uint32_t* pLen, __tmalloc_fn_t fp); int32_t tBuildSubmitReq(int32_t vgId, SSubmitReq2* pReq, void** pData, uint32_t* pLen, __tmalloc_fn_t fp,
__tfree_fn_t ff);
#pragma pack(pop) #pragma pack(pop)

1
include/os/osMemory.h
View File

@ -48,6 +48,7 @@ void *taosMemoryMallocAlign(uint32_t alignment, int64_t size);
} while (0) } while (0)
typedef void *(*__tmalloc_fn_t)(int64_t); typedef void *(*__tmalloc_fn_t)(int64_t);
typedef void (*__tfree_fn_t)(void *);
#ifdef __cplusplus #ifdef __cplusplus
} }

4
source/common/src/tmsg.c
View File

@ -7001,7 +7001,7 @@ void tDestroySSubmitRsp2(SSubmitRsp2 *pRsp, int32_t flag) {
} }
} }
int32_t tBuildSubmitReq(int32_t vgId, SSubmitReq2 *pReq, void **pData, uint32_t *pLen, __tmalloc_fn_t fp) { int32_t tBuildSubmitReq(int32_t vgId, SSubmitReq2 *pReq, void **pData, uint32_t *pLen, __tmalloc_fn_t fp, __tfree_fn_t ff) {
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
uint32_t len = 0; uint32_t len = 0;
void *pBuf = NULL; void *pBuf = NULL;
@ -7024,7 +7024,7 @@ int32_t tBuildSubmitReq(int32_t vgId, SSubmitReq2 *pReq, void **pData, uint32_t
*pData = pBuf; *pData = pBuf;
*pLen = len; *pLen = len;
} else { } else {
taosMemoryFree(pBuf); (*ff)(pBuf);
} }
return code; return code;
} }

2
source/dnode/vnode/src/tq/tqSink.c
View File

@ -463,7 +463,7 @@ int32_t tqBlockToSubmit(SVnode* pVnode, const SArray* pBlocks, const STSchema* p
taosArrayPush(pReq->aSubmitTbData, pTbData); taosArrayPush(pReq->aSubmitTbData, pTbData);
} }
terrno = tBuildSubmitReq(TD_VID(pVnode), pReq, ppData, pLen, rpcMallocCont); terrno = tBuildSubmitReq(TD_VID(pVnode), pReq, ppData, pLen, rpcMallocCont, rpcFreeCont);
_end: _end:
taosArrayDestroy(tagArray); taosArrayDestroy(tagArray);