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

修改函数memTracker_ReserveMemChunks的逻辑

Browse Source
This commit is contained in:
cca5507
2023-03-03 17:40:13 +08:00
parent d23784b4de
commit 7a5a56852f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/backend/utils/mmgr/memprot.cpp
View File

@ -580,16 +580,6 @@ static bool memTracker_ReserveMemChunks(int32 numChunksToReserve, bool needProte
Assert(0 < numChunksToReserve);
/* query level memory verification */
if (t_thrd.shemem_ptr_cxt.mySessionMemoryEntry && type != MEM_SHRD) {
/* 1. increase memory in chunk at query level */
total = gs_atomic_add_32(&(t_thrd.shemem_ptr_cxt.mySessionMemoryEntry->queryMemInChunks), numChunksToReserve);
/* 2. update the peak memory of the query */
if (t_thrd.shemem_ptr_cxt.mySessionMemoryEntry->peakChunksQuery < total)
gs_lock_test_and_set(&(t_thrd.shemem_ptr_cxt.mySessionMemoryEntry->peakChunksQuery), total);
}
/* increase chunk quota at global gaussdb process level */
if (t_thrd.utils_cxt.backend_reserved) {
currSize = &backendUsedMemInChunk;
@ -611,6 +601,16 @@ static bool memTracker_ReserveMemChunks(int32 numChunksToReserve, bool needProte
t_thrd.utils_cxt.beyondChunk = 0;
}
/* query level memory verification */
if (t_thrd.shemem_ptr_cxt.mySessionMemoryEntry && type != MEM_SHRD) {
/* 1. increase memory in chunk at query level */
total = gs_atomic_add_32(&(t_thrd.shemem_ptr_cxt.mySessionMemoryEntry->queryMemInChunks), numChunksToReserve);
/* 2. update the peak memory of the query */
if (t_thrd.shemem_ptr_cxt.mySessionMemoryEntry->peakChunksQuery < total)
gs_lock_test_and_set(&(t_thrd.shemem_ptr_cxt.mySessionMemoryEntry->peakChunksQuery), total);
}
if (peakChunksPerProcess < processMemInChunks + backendUsedMemInChunk) {
peakChunksPerProcess = processMemInChunks + backendUsedMemInChunk;