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

修改IsDuplicatePid和IsEligiblePid入参的pid类型

Browse Source
This commit is contained in:
siven
2021-02-25 12:05:00 +08:00
parent 5a61d23618
commit 4334a2bd4b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gausskernel/optimizer/commands/user.cpp
View File

@ -97,8 +97,8 @@ static void DelRoleMems(const char* rolename, Oid roleid, const List* memberName
/* to check whether the current schema belongs to one of the role in the llist */ /* to check whether the current schema belongs to one of the role in the llist */
static bool IsLockOnRelation(const LockInstanceData* instance); static bool IsLockOnRelation(const LockInstanceData* instance);
static List* GetCancelQuery(const char* user_name); static List* GetCancelQuery(const char* user_name);
static bool IsEligiblePid(Oid rel_oid, Oid nsp_oid, Oid pid, Oid db_oid, Form_pg_class form, List* query_list); static bool IsEligiblePid(Oid rel_oid, Oid nsp_oid, ThreadId pid, Oid db_oid, Form_pg_class form, List* query_list);
static bool IsDuplicatePid(const List* query_list, Oid pid); static bool IsDuplicatePid(const List* query_list, ThreadId pid);
static void CancelQuery(const char* user_name); static void CancelQuery(const char* user_name);
extern void cancel_backend(ThreadId pid); extern void cancel_backend(ThreadId pid);
static bool IsCurrentSchemaAttachRoles(List* roles); static bool IsCurrentSchemaAttachRoles(List* roles);
@ -4022,7 +4022,7 @@ static List* GetCancelQuery(const char* user_name)
} }
// check weather the pid is recorded already // check weather the pid is recorded already
static bool IsDuplicatePid(const List* query_list, Oid pid) static bool IsDuplicatePid(const List* query_list, ThreadId pid)
{ {
LockInfoBuck* lock_info = NULL; LockInfoBuck* lock_info = NULL;
ListCell* curcell = NULL; ListCell* curcell = NULL;
@ -4046,7 +4046,7 @@ static bool IsDuplicatePid(const List* query_list, Oid pid)
// : the relation is an ordinary table or is a sequence // : the relation is an ordinary table or is a sequence
// : the oid of the relation is equale to the field 'relfilenode' in pg_class // : the oid of the relation is equale to the field 'relfilenode' in pg_class
// : the pid locked the relation is unique for the existing records // : the pid locked the relation is unique for the existing records
static bool IsEligiblePid(Oid rel_oid, Oid nsp_oid, Oid pid, Oid db_oid, const Form_pg_class form, List* query_list) static bool IsEligiblePid(Oid rel_oid, Oid nsp_oid, ThreadId pid, Oid db_oid, const Form_pg_class form, List* query_list)
{ {
if (db_oid && pid && rel_oid && (nsp_oid == form->relnamespace) && ('r' == form->relkind || 'S' == form->relkind) && if (db_oid && pid && rel_oid && (nsp_oid == form->relnamespace) && ('r' == form->relkind || 'S' == form->relkind) &&
(rel_oid == form->relfilenode) && (u_sess->proc_cxt.MyDatabaseId == db_oid) && !IsDuplicatePid(query_list, pid)) (rel_oid == form->relfilenode) && (u_sess->proc_cxt.MyDatabaseId == db_oid) && !IsDuplicatePid(query_list, pid))