From 7acbe8ddcce3b4c38274603184e0a8641acefa70 Mon Sep 17 00:00:00 2001
From: wuyuechuan <wuych9@mail2.sysu.edu.cn>
Date: Wed, 8 Jun 2022 19:32:34 +0800
Subject: [PATCH] memcheck bugfix

---
 src/bin/psql/describe.cpp                              |  1 +
 src/common/backend/utils/cache/knl_localsysdbcache.cpp | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/bin/psql/describe.cpp b/src/bin/psql/describe.cpp
index 929735c0d..5b0ae15f2 100644
--- a/src/bin/psql/describe.cpp
+++ b/src/bin/psql/describe.cpp
@@ -2951,6 +2951,7 @@ error_return:
      */
     if (unlikely(uppercaseIsOn)) {
         printfPQExpBuffer(&buf, "set uppercase_attribute_name=on;");
+        PQclear(res);
         res = PSQLexec(buf.data, false);
     }
 #endif
diff --git a/src/common/backend/utils/cache/knl_localsysdbcache.cpp b/src/common/backend/utils/cache/knl_localsysdbcache.cpp
index 71c956b4d..93d0ba426 100644
--- a/src/common/backend/utils/cache/knl_localsysdbcache.cpp
+++ b/src/common/backend/utils/cache/knl_localsysdbcache.cpp
@@ -34,7 +34,7 @@
 #include "utils/relfilenodemap.h"
 #include "postmaster/bgworker.h"
 #include "storage/lmgr.h"
-#ifdef USE_ASSERT_CHECKING
+#if defined(USE_ASSERT_CHECKING) && !defined(ENABLE_MEMORY_CHECK)
 class LSCCloseCheck {
 public:
     LSCCloseCheck()
@@ -225,11 +225,9 @@ void CreateLocalSysDBCache()
     if (!t_thrd.lsc_cxt.enable_lsc) {
         t_thrd.lsc_cxt.FetchTupleFromCatCList = GetTupleFromSessCatList;
         t_thrd.lsc_cxt.lsc->is_closed = true;
-#ifdef USE_ASSERT_CHECKING
+#if defined(USE_ASSERT_CHECKING) && !defined(ENABLE_MEMORY_CHECK)
         lsc_close_check.setCloseFlag(true);
-#endif
     } else {
-#ifdef USE_ASSERT_CHECKING
         lsc_close_check.setCloseFlag(false);
 #endif
     }
@@ -722,7 +720,7 @@ void LocalSysDBCache::CloseLocalSysDBCache()
     LocalSysDBCacheReleaseCritialReSource(true);
     is_inited = false;
     is_closed = true;
-#ifdef USE_ASSERT_CHECKING
+#if defined(USE_ASSERT_CHECKING) && !defined(ENABLE_MEMORY_CHECK)
     lsc_close_check.setCloseFlag(true);
 #endif
 }
@@ -973,7 +971,7 @@ LocalSysDBCache::LocalSysDBCache()
     is_lsc_catbucket_created = false;
     is_closed = false;
     is_inited = false;
-#ifdef USE_ASSERT_CHECKING
+#if defined(USE_ASSERT_CHECKING) && !defined(ENABLE_MEMORY_CHECK)
     lsc_close_check.setCloseFlag(false);
 #endif
 }