From deb4b5a5f72fad05155fcbd51069cc42797a8c8e Mon Sep 17 00:00:00 2001
From: chenxiaobin19 <1025221611@qq.com>
Date: Sun, 8 Oct 2023 19:25:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DB=E5=85=BC=E5=AE=B9=E6=80=A7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=80=BB=E8=BE=91=E8=A7=A3=E7=A0=81?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/backend/catalog/pg_builtin_proc.cpp    | 3 ++-
 src/common/backend/utils/init/postinit.cpp        | 4 ++++
 src/gausskernel/process/job/job_worker.cpp        | 4 ++++
 src/gausskernel/storage/replication/walsender.cpp | 7 +++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/common/backend/catalog/pg_builtin_proc.cpp b/src/common/backend/catalog/pg_builtin_proc.cpp
index b544328e23..5e1427165a 100755
--- a/src/common/backend/catalog/pg_builtin_proc.cpp
+++ b/src/common/backend/catalog/pg_builtin_proc.cpp
@@ -39,7 +39,8 @@ static_assert(sizeof(true) == sizeof(char), "illegal bool size");
 static_assert(sizeof(false) == sizeof(char), "illegal bool size");
 
 #define CUR_THR_IS_WORKER() (t_thrd.role == WORKER || t_thrd.role == THREADPOOL_WORKER ||\
-    t_thrd.role == STREAM_WORKER || t_thrd.role == THREADPOOL_STREAM)
+    t_thrd.role == STREAM_WORKER || t_thrd.role == THREADPOOL_STREAM || t_thrd.role == WAL_DB_SENDER||\
+    t_thrd.role == PARALLEL_DECODE || t_thrd.role == JOB_WORKER)
 
 #ifdef ENABLE_MULTIPLE_NODES
     FuncGroup g_func_groups[] = {
diff --git a/src/common/backend/utils/init/postinit.cpp b/src/common/backend/utils/init/postinit.cpp
index 5c4d74743a..0491eee36f 100644
--- a/src/common/backend/utils/init/postinit.cpp
+++ b/src/common/backend/utils/init/postinit.cpp
@@ -1288,6 +1288,8 @@ void PostgresInitializer::InitJobExecuteWorker()
 
     InitSettings();
 
+    InitExtensionVariable();
+
     FinishInit();
 }
 
@@ -1967,6 +1969,8 @@ void PostgresInitializer::InitWAL()
 
     InitSettings();
 
+    InitExtensionVariable();
+
     FinishInit();
 }
 
diff --git a/src/gausskernel/process/job/job_worker.cpp b/src/gausskernel/process/job/job_worker.cpp
index 22fdb86bee..b8784b934e 100755
--- a/src/gausskernel/process/job/job_worker.cpp
+++ b/src/gausskernel/process/job/job_worker.cpp
@@ -314,6 +314,10 @@ void JobExecuteWorkerMain()
     t_thrd.proc_cxt.PostInit->InitJobExecuteWorker();
     t_thrd.proc_cxt.PostInit->GetDatabaseName(u_sess->proc_cxt.MyProcPort->database_name);
 
+#if (!defined(ENABLE_MULTIPLE_NODES)) && (!defined(ENABLE_PRIVATEGAUSS))
+    LoadSqlPlugin();
+#endif
+
 #ifdef PGXC /* PGXC_COORD */
     /*
      * Initialize key pair to be used as object id while using advisory lock
diff --git a/src/gausskernel/storage/replication/walsender.cpp b/src/gausskernel/storage/replication/walsender.cpp
index 738d136e46..e96413c357 100755
--- a/src/gausskernel/storage/replication/walsender.cpp
+++ b/src/gausskernel/storage/replication/walsender.cpp
@@ -379,6 +379,13 @@ int WalSenderMain(void)
                                                                  ALLOCSET_DEFAULT_MINSIZE,
                                                                  ALLOCSET_DEFAULT_INITSIZE,
                                                                  ALLOCSET_DEFAULT_MAXSIZE);
+
+#if (!defined(ENABLE_MULTIPLE_NODES)) && (!defined(ENABLE_PRIVATEGAUSS))
+    if (AM_WAL_DB_SENDER) {
+        LoadSqlPlugin();
+    }
+#endif
+
     (void)MemoryContextSwitchTo(walsnd_context);
 
     /* Set up resource owner */
-- 
Gitee