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

fix: nodes free issue

This commit is contained in:
dapan1121 2023-04-17 15:44:15 +08:00
parent 31d187444e
commit ed3778dc9f
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libs/nodes/nodes.h
View File

@ -306,6 +306,7 @@ void nodesDestroyAllocator(int64_t allocatorId);
SNode* nodesMakeNode(ENodeType type); SNode* nodesMakeNode(ENodeType type);
void nodesDestroyNode(SNode* pNode); void nodesDestroyNode(SNode* pNode);
void nodesFree(void* p);
SNodeList* nodesMakeList(); SNodeList* nodesMakeList();
int32_t nodesListAppend(SNodeList* pList, SNode* pNode); int32_t nodesListAppend(SNodeList* pList, SNode* pNode);

2
source/libs/executor/src/executil.c
View File

@ -486,7 +486,7 @@ int32_t getColInfoResultForGroupby(void* metaHandle, SNodeList* group, STableLis
SNodeListNode* listNode = (SNodeListNode*)nodesMakeNode(QUERY_NODE_NODE_LIST); SNodeListNode* listNode = (SNodeListNode*)nodesMakeNode(QUERY_NODE_NODE_LIST);
listNode->pNodeList = group; listNode->pNodeList = group;
genTagFilterDigest((SNode *)listNode, &context); genTagFilterDigest((SNode *)listNode, &context);
taosMemoryFree(listNode); nodesFree(listNode);
if (lastTableList && (0 == memcmp(context.digest, lastMd5.digest, sizeof(lastMd5.digest)) && (taosArrayGetSize(pTableListInfo->pTableList) == taosArrayGetSize(lastTableList)))) { if (lastTableList && (0 == memcmp(context.digest, lastMd5.digest, sizeof(lastMd5.digest)) && (taosArrayGetSize(pTableListInfo->pTableList) == taosArrayGetSize(lastTableList)))) {
pTableListInfo->pTableList = taosArrayDup(lastTableList, NULL); pTableListInfo->pTableList = taosArrayDup(lastTableList, NULL);

2
source/libs/nodes/src/nodesUtilFuncs.c
View File

@ -87,7 +87,7 @@ static void* nodesCalloc(int32_t num, int32_t size) {
return (char*)p + 1; return (char*)p + 1;
} }
static void nodesFree(void* p) { void nodesFree(void* p) {
char* ptr = (char*)p - 1; char* ptr = (char*)p - 1;
if (0 == *ptr) { if (0 == *ptr) {
taosMemoryFree(ptr); taosMemoryFree(ptr);