hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!2664 【轻量级 PR】：修复加载dolphin插件场景下，重启导致的死锁问题

Browse Source 
Merge pull request !2664 from pengjiong/N/A
This commit is contained in:
opengauss-bot
2022-12-22 08:17:10 +00:00
committed by Gitee
parent 1b97274b24 21d6ae2954
commit 5d56e686e6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/backend/catalog/pg_builtin_proc.cpp
View File

@ -38,6 +38,9 @@
static_assert(sizeof(true) == sizeof(char), "illegal bool size"); static_assert(sizeof(true) == sizeof(char), "illegal bool size");
static_assert(sizeof(false) == 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)
#ifdef ENABLE_MULTIPLE_NODES #ifdef ENABLE_MULTIPLE_NODES
FuncGroup g_func_groups[] = { FuncGroup g_func_groups[] = {
#include "builtin_funcs.ini" #include "builtin_funcs.ini"
@ -115,9 +118,9 @@ static void InitHashTable(int size)
static HTAB* get_name_hash_table_type() static HTAB* get_name_hash_table_type()
{ {
#if (!defined(ENABLE_MULTIPLE_NODES)) && (!defined(ENABLE_PRIVATEGAUSS)) #if (!defined(ENABLE_MULTIPLE_NODES)) && (!defined(ENABLE_PRIVATEGAUSS))
if (a_nameHash != NULL && DB_IS_CMPT(A_FORMAT)) { if (a_nameHash != NULL && DB_IS_CMPT(A_FORMAT) && CUR_THR_IS_WORKER()) {
return a_nameHash; return a_nameHash;
} else if (b_nameHash != NULL && DB_IS_CMPT(B_FORMAT)) { } else if (b_nameHash != NULL && DB_IS_CMPT(B_FORMAT) && CUR_THR_IS_WORKER()) {
return b_nameHash; return b_nameHash;
} }
#endif #endif
@ -127,9 +130,9 @@ static HTAB* get_name_hash_table_type()
static HTAB* get_oid_hash_table_type() static HTAB* get_oid_hash_table_type()
{ {
#if (!defined(ENABLE_MULTIPLE_NODES)) && (!defined(ENABLE_PRIVATEGAUSS)) #if (!defined(ENABLE_MULTIPLE_NODES)) && (!defined(ENABLE_PRIVATEGAUSS))
if (a_oidHash != NULL && DB_IS_CMPT(A_FORMAT)) { if (a_oidHash != NULL && DB_IS_CMPT(A_FORMAT) && CUR_THR_IS_WORKER()) {
return a_oidHash; return a_oidHash;
} else if (b_oidHash != NULL && DB_IS_CMPT(B_FORMAT)) { } else if (b_oidHash != NULL && DB_IS_CMPT(B_FORMAT) && CUR_THR_IS_WORKER()) {
return b_oidHash; return b_oidHash;
} }
#endif #endif