From ccd674c159b7b53a18f82607f28b0c043d36ec74 Mon Sep 17 00:00:00 2001
From: chenxiaobin19 <1025221611@qq.com>
Date: Fri, 8 Apr 2022 11:11:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Denable=5Fglobal=5Fsyscache?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=97=B6=E8=BF=9E=E6=8E=A5B=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E6=80=A7=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84core?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/gausskernel/process/tcop/postgres.cpp                | 5 +----
 src/gausskernel/process/threadpool/threadpool_worker.cpp | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/gausskernel/process/tcop/postgres.cpp b/src/gausskernel/process/tcop/postgres.cpp
index d862d5f1a..cfe867e63 100755
--- a/src/gausskernel/process/tcop/postgres.cpp
+++ b/src/gausskernel/process/tcop/postgres.cpp
@@ -827,9 +827,6 @@ void InitBSqlPluginHookIfNeeded()
 {
     const char* b_sql_plugin = "b_sql_plugin";
     CFunInfo tmpCF;
-    if (!CheckIfExtensionExists(b_sql_plugin)) {
-        return;
-    }
 
     tmpCF = load_external_function(b_sql_plugin, INIT_PLUGIN_OBJECT, false, false);
     if (tmpCF.user_fn != NULL) {
@@ -7574,7 +7571,7 @@ int PostgresMain(int argc, char* argv[], const char* dbname, const char* usernam
         init_set_params_htab();
 
 #ifndef ENABLE_MULTIPLE_NODES
-    if (u_sess->proc_cxt.MyDatabaseId != InvalidOid && DB_IS_CMPT(B_FORMAT)) {
+    if (u_sess->proc_cxt.MyDatabaseId != InvalidOid && DB_IS_CMPT(B_FORMAT) && u_sess->attr.attr_sql.b_sql_plugin) {
         InitBSqlPluginHookIfNeeded();
     }
 #endif
diff --git a/src/gausskernel/process/threadpool/threadpool_worker.cpp b/src/gausskernel/process/threadpool/threadpool_worker.cpp
index 47ee1a6e3..bd4964502 100644
--- a/src/gausskernel/process/threadpool/threadpool_worker.cpp
+++ b/src/gausskernel/process/threadpool/threadpool_worker.cpp
@@ -848,7 +848,7 @@ static bool InitSession(knl_session_context* session)
     t_thrd.proc_cxt.PostInit->InitSession();
 
 #ifndef ENABLE_MULTIPLE_NODES
-    if (u_sess->proc_cxt.MyDatabaseId != InvalidOid && DB_IS_CMPT(B_FORMAT)) {
+    if (u_sess->proc_cxt.MyDatabaseId != InvalidOid && DB_IS_CMPT(B_FORMAT) && u_sess->attr.attr_sql.b_sql_plugin) {
         InitBSqlPluginHookIfNeeded();
     }
 #endif