Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
1247ea28
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1247ea28
编写于
9月 16, 2013
作者:
A
Alvaro Herrera
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove `proc` argument from LockCheckConflicts
This has been unused since commit
8563ccae
. Noted by Antonin Houska
上级
dd778e9d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
8 deletion
+5
-8
src/backend/storage/lmgr/lock.c
src/backend/storage/lmgr/lock.c
+2
-3
src/backend/storage/lmgr/proc.c
src/backend/storage/lmgr/proc.c
+2
-4
src/include/storage/lock.h
src/include/storage/lock.h
+1
-1
未找到文件。
src/backend/storage/lmgr/lock.c
浏览文件 @
1247ea28
...
@@ -906,7 +906,7 @@ LockAcquireExtended(const LOCKTAG *locktag,
...
@@ -906,7 +906,7 @@ LockAcquireExtended(const LOCKTAG *locktag,
status
=
STATUS_FOUND
;
status
=
STATUS_FOUND
;
else
else
status
=
LockCheckConflicts
(
lockMethodTable
,
lockmode
,
status
=
LockCheckConflicts
(
lockMethodTable
,
lockmode
,
lock
,
proclock
,
MyProc
);
lock
,
proclock
);
if
(
status
==
STATUS_OK
)
if
(
status
==
STATUS_OK
)
{
{
...
@@ -1256,8 +1256,7 @@ int
...
@@ -1256,8 +1256,7 @@ int
LockCheckConflicts
(
LockMethod
lockMethodTable
,
LockCheckConflicts
(
LockMethod
lockMethodTable
,
LOCKMODE
lockmode
,
LOCKMODE
lockmode
,
LOCK
*
lock
,
LOCK
*
lock
,
PROCLOCK
*
proclock
,
PROCLOCK
*
proclock
)
PGPROC
*
proc
)
{
{
int
numLockModes
=
lockMethodTable
->
numLockModes
;
int
numLockModes
=
lockMethodTable
->
numLockModes
;
LOCKMASK
myLocks
;
LOCKMASK
myLocks
;
...
...
src/backend/storage/lmgr/proc.c
浏览文件 @
1247ea28
...
@@ -997,8 +997,7 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable)
...
@@ -997,8 +997,7 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable)
LockCheckConflicts
(
lockMethodTable
,
LockCheckConflicts
(
lockMethodTable
,
lockmode
,
lockmode
,
lock
,
lock
,
proclock
,
proclock
)
==
STATUS_OK
)
MyProc
)
==
STATUS_OK
)
{
{
/* Skip the wait and just grant myself the lock. */
/* Skip the wait and just grant myself the lock. */
GrantLock
(
lock
,
proclock
,
lockmode
);
GrantLock
(
lock
,
proclock
,
lockmode
);
...
@@ -1384,8 +1383,7 @@ ProcLockWakeup(LockMethod lockMethodTable, LOCK *lock)
...
@@ -1384,8 +1383,7 @@ ProcLockWakeup(LockMethod lockMethodTable, LOCK *lock)
LockCheckConflicts
(
lockMethodTable
,
LockCheckConflicts
(
lockMethodTable
,
lockmode
,
lockmode
,
lock
,
lock
,
proc
->
waitProcLock
,
proc
->
waitProcLock
)
==
STATUS_OK
)
proc
)
==
STATUS_OK
)
{
{
/* OK to waken */
/* OK to waken */
GrantLock
(
lock
,
proc
->
waitProcLock
,
lockmode
);
GrantLock
(
lock
,
proc
->
waitProcLock
,
lockmode
);
...
...
src/include/storage/lock.h
浏览文件 @
1247ea28
...
@@ -503,7 +503,7 @@ extern void AtPrepare_Locks(void);
...
@@ -503,7 +503,7 @@ extern void AtPrepare_Locks(void);
extern
void
PostPrepare_Locks
(
TransactionId
xid
);
extern
void
PostPrepare_Locks
(
TransactionId
xid
);
extern
int
LockCheckConflicts
(
LockMethod
lockMethodTable
,
extern
int
LockCheckConflicts
(
LockMethod
lockMethodTable
,
LOCKMODE
lockmode
,
LOCKMODE
lockmode
,
LOCK
*
lock
,
PROCLOCK
*
proclock
,
PGPROC
*
proc
);
LOCK
*
lock
,
PROCLOCK
*
proclock
);
extern
void
GrantLock
(
LOCK
*
lock
,
PROCLOCK
*
proclock
,
LOCKMODE
lockmode
);
extern
void
GrantLock
(
LOCK
*
lock
,
PROCLOCK
*
proclock
,
LOCKMODE
lockmode
);
extern
void
GrantAwaitedLock
(
void
);
extern
void
GrantAwaitedLock
(
void
);
extern
void
RemoveFromWaitQueue
(
PGPROC
*
proc
,
uint32
hashcode
);
extern
void
RemoveFromWaitQueue
(
PGPROC
*
proc
,
uint32
hashcode
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录