Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3adba73

Browse files
committed
Revert XactLockTableWait context setup in conditional multixact wait
There's no point in setting up a context error callback when doingconditional lock acquisition, because we never actually wait and so theuser wouldn't be able to see the context message anywhere. In fact,this is more in line with what ConditionalXactLockTableWait is doing.Backpatch to 9.4, where this was added.
1 parent6f82295 commit3adba73

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

‎src/backend/access/heap/heapam.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ static void MultiXactIdWait(MultiXactId multi, MultiXactStatus status, uint16 in
109109
Relationrel,ItemPointerctid,XLTW_Operoper,
110110
int*remaining);
111111
staticboolConditionalMultiXactIdWait(MultiXactIdmulti,MultiXactStatusstatus,
112-
uint16infomask,Relationrel,ItemPointerctid,
113-
XLTW_Operoper,int*remaining);
112+
uint16infomask,Relationrel,int*remaining);
114113
staticXLogRecPtrlog_heap_new_cid(Relationrelation,HeapTupletup);
115114
staticHeapTupleExtractReplicaIdentity(Relationrel,HeapTupletup,boolkey_modified,
116115
bool*copy);
@@ -4438,8 +4437,7 @@ heap_lock_tuple(Relation relation, HeapTuple tuple,
44384437
{
44394438
if (!ConditionalMultiXactIdWait((MultiXactId)xwait,
44404439
status,infomask,relation,
4441-
&tuple->t_data->t_ctid,
4442-
XLTW_Lock,NULL))
4440+
NULL))
44434441
ereport(ERROR,
44444442
(errcode(ERRCODE_LOCK_NOT_AVAILABLE),
44454443
errmsg("could not obtain lock on row in relation \"%s\"",
@@ -6246,11 +6244,10 @@ MultiXactIdWait(MultiXactId multi, MultiXactStatus status, uint16 infomask,
62466244
*/
62476245
staticbool
62486246
ConditionalMultiXactIdWait(MultiXactIdmulti,MultiXactStatusstatus,
6249-
uint16infomask,Relationrel,ItemPointerctid,
6250-
XLTW_Operoper,int*remaining)
6247+
uint16infomask,Relationrel,int*remaining)
62516248
{
62526249
returnDo_MultiXactIdWait(multi,status,infomask, true,
6253-
rel,ctid,oper,remaining);
6250+
rel,NULL,XLTW_None,remaining);
62546251
}
62556252

62566253
/*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp