hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!4521 修复一处limit聚集下推特性memcheck相关的问题

Browse Source 
Merge pull request !4521 from ljy/fix_sortgroup_memcheck
This commit is contained in:
opengauss_bot
2023-12-18 06:45:01 +00:00
committed by Gitee
parent 257bd08a3b 060e35baea
commit 97669ef5f8
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gausskernel/runtime/executor/nodeSortGroup.cpp
View File

@ -153,19 +153,25 @@ static void groupNodeReleaseTape(SortGroupStatePriv *state, GroupNode *group);
static TupleTableSlot *ExecSortGroup(PlanState *pstate);
static void dumpSortGroupState(SortGroupState *statee);
static inline int64 groupSortUsedMemory(SortGroupStatePriv *state)
{
AllocSetContext* maincontex = (AllocSetContext*)state->maincontext;
AllocSetContext* tuplecontext = (AllocSetContext*)state->tuplecontext;
int64 bytes = maincontex->totalSpace - maincontex->freeSpace;
static inline int64 getMemoryContextUsedSize(MemoryContext cxt) {
int64 bytes;
#ifndef ENABLE_MEMORY_CHECK
Assert(cxt->type == T_AllocSetContext);
AllocSetContext* aset = (AllocSetContext*) cxt;
bytes = aset->totalSpace - aset->freeSpace;
#else
Assert(cxt->type == T_AsanSetContext);
AsanSetContext* aset = (AsanSetContext*) cxt;
bytes = aset->totalSpace - aset->freeSpace;
#endif
return bytes;
}
Assert(maincontex->header.type == T_AllocSetContext);
if (tuplecontext) {
Assert(tuplecontext->header.type == T_AllocSetContext);
bytes += (tuplecontext->totalSpace - tuplecontext->freeSpace);
static inline int64 groupSortUsedMemory(SortGroupStatePriv *state) {
int64 bytes = getMemoryContextUsedSize(state->maincontext);
if (state->tuplecontext) {
bytes += getMemoryContextUsedSize(state->tuplecontext);
}
return bytes;
}