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

Commit3435693

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 theable wouldn't be able to see it.Backpatch to 9.4, where this was added.
1 parent0bfce76 commit3435693

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);
@@ -4431,8 +4430,7 @@ heap_lock_tuple(Relation relation, HeapTuple tuple,
44314430
{
44324431
if (!ConditionalMultiXactIdWait((MultiXactId)xwait,
44334432
status,infomask,relation,
4434-
&tuple->t_data->t_ctid,
4435-
XLTW_Lock,NULL))
4433+
NULL))
44364434
ereport(ERROR,
44374435
(errcode(ERRCODE_LOCK_NOT_AVAILABLE),
44384436
errmsg("could not obtain lock on row in relation \"%s\"",
@@ -6244,11 +6242,10 @@ MultiXactIdWait(MultiXactId multi, MultiXactStatus status, uint16 infomask,
62446242
*/
62456243
staticbool
62466244
ConditionalMultiXactIdWait(MultiXactIdmulti,MultiXactStatusstatus,
6247-
uint16infomask,Relationrel,ItemPointerctid,
6248-
XLTW_Operoper,int*remaining)
6245+
uint16infomask,Relationrel,int*remaining)
62496246
{
62506247
returnDo_MultiXactIdWait(multi,status,infomask, true,
6251-
rel,ctid,oper,remaining);
6248+
rel,NULL,XLTW_None,remaining);
62526249
}
62536250

62546251
/*

0 commit comments

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