!3527 t_thrd.utils_cxt.ExecutorMemoryTrack赋值前判空

Merge pull request !3527 from chenxiaobin/fixMemoryTrack
2023-06-09 11:40:15 +00:00
parent 14dfac7f00 e5b88f845c
commit 00b2eafbb7
1 changed files with 2 additions and 1 deletions
--- a/src/gausskernel/runtime/executor/execMain.cpp
+++ b/src/gausskernel/runtime/executor/execMain.cpp
@ -264,7 +264,8 @@ void standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
    queryDesc->estate = estate;

    /* record the init memory track of the executor engine */
-    if (u_sess->attr.attr_memory.memory_tracking_mode > MEMORY_TRACKING_NONE) {
+    if (u_sess->attr.attr_memory.memory_tracking_mode > MEMORY_TRACKING_NONE &&
+        t_thrd.utils_cxt.ExecutorMemoryTrack == NULL) {
 #ifndef ENABLE_MEMORY_CHECK
        t_thrd.utils_cxt.ExecutorMemoryTrack = ((AllocSet)(estate->es_query_cxt))->track;
 #else