From 43fd81e96af62a9996c9fe5148e7ac117b792251 Mon Sep 17 00:00:00 2001 From: Xiao__Ma Date: Fri, 16 Apr 2021 21:23:46 +0800 Subject: [PATCH] memory --- src/bin/pg_dump/pg_dump.cpp | 2 +- src/gausskernel/optimizer/plan/pgxcplan_single.cpp | 1 + src/gausskernel/runtime/executor/opfusion.cpp | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/pg_dump/pg_dump.cpp b/src/bin/pg_dump/pg_dump.cpp index efeb01f31..4d6856c82 100644 --- a/src/bin/pg_dump/pg_dump.cpp +++ b/src/bin/pg_dump/pg_dump.cpp @@ -728,7 +728,7 @@ int main(int argc, char** argv) errorMessages = ConnectDatabase(fout, dbname, pghost, pgport, username, prompt_password, false); if (errorMessages != NULL) { (void)remove(filename); - filename = NULL; + GS_FREE(filename); exit_horribly(NULL, "connection to database \"%s\" failed: %s ", ((dbname != NULL) ? dbname : ""), errorMessages); } diff --git a/src/gausskernel/optimizer/plan/pgxcplan_single.cpp b/src/gausskernel/optimizer/plan/pgxcplan_single.cpp index c7d78bf99..1fdefe4ea 100644 --- a/src/gausskernel/optimizer/plan/pgxcplan_single.cpp +++ b/src/gausskernel/optimizer/plan/pgxcplan_single.cpp @@ -174,6 +174,7 @@ PlannedStmt* pgxc_planner(Query* query, int cursorOptions, ParamListInfo boundPa result->ng_use_planA = use_planA; ReSetNgQueryMem(result); } + /* release resource applied in standard_planner */ t_thrd.utils_cxt.CurrentResourceOwner = currentOwner; ResourceOwnerDelete(tempOwner); } diff --git a/src/gausskernel/runtime/executor/opfusion.cpp b/src/gausskernel/runtime/executor/opfusion.cpp index d45acc71b..7e4200d5f 100644 --- a/src/gausskernel/runtime/executor/opfusion.cpp +++ b/src/gausskernel/runtime/executor/opfusion.cpp @@ -1940,7 +1940,6 @@ bool DeleteFusion::execute(long max_rows, char* completionTag) ********************************/ HeapTuple oldtup = NULL; unsigned long nprocessed = 0; - m_tupDesc = RelationGetDescr(rel); while ((oldtup = m_scan->getTuple()) != NULL) { TM_Result result;