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

Commit386a5d4

Browse files
committed
Change tqual.c tests to use !TransactionIdIsCurrentTransactionId, rather than
TransactionIdDidAbort, when handling the case that xmin is one of the currenttransaction's XIDs and the tuple has been deleted. xmax must also be one ofthe current transaction's XIDs, since no one else can see it yet, and it'scheaper to look at local state than shared state to find out if xmax aborted.Per an idea of Heikki's.
1 parentda072ab commit386a5d4

File tree

1 file changed

+11
-22
lines changed

1 file changed

+11
-22
lines changed

‎src/backend/utils/time/tqual.c‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* Portions Copyright (c) 1994, Regents of the University of California
3232
*
3333
* IDENTIFICATION
34-
* $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.105 2007/09/08 20:31:15 tgl Exp $
34+
* $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.106 2007/09/21 18:24:28 tgl Exp $
3535
*
3636
*-------------------------------------------------------------------------
3737
*/
@@ -219,16 +219,14 @@ HeapTupleSatisfiesSelf(HeapTupleHeader tuple, Snapshot snapshot, Buffer buffer)
219219

220220
Assert(!(tuple->t_infomask&HEAP_XMAX_IS_MULTI));
221221

222-
/* deleting subtransaction aborted? */
223-
if (TransactionIdDidAbort(HeapTupleHeaderGetXmax(tuple)))
222+
if (!TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)))
224223
{
224+
/* deleting subtransaction must have aborted */
225225
SetHintBits(tuple,buffer,HEAP_XMAX_INVALID,
226226
InvalidTransactionId);
227227
return true;
228228
}
229229

230-
Assert(TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)));
231-
232230
return false;
233231
}
234232
elseif (TransactionIdIsInProgress(HeapTupleHeaderGetXmin(tuple)))
@@ -395,16 +393,14 @@ HeapTupleSatisfiesNow(HeapTupleHeader tuple, Snapshot snapshot, Buffer buffer)
395393

396394
Assert(!(tuple->t_infomask&HEAP_XMAX_IS_MULTI));
397395

398-
/* deleting subtransaction aborted? */
399-
if (TransactionIdDidAbort(HeapTupleHeaderGetXmax(tuple)))
396+
if (!TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)))
400397
{
398+
/* deleting subtransaction must have aborted */
401399
SetHintBits(tuple,buffer,HEAP_XMAX_INVALID,
402400
InvalidTransactionId);
403401
return true;
404402
}
405403

406-
Assert(TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)));
407-
408404
if (HeapTupleHeaderGetCmax(tuple) >=GetCurrentCommandId())
409405
return true;/* deleted after scan started */
410406
else
@@ -640,16 +636,14 @@ HeapTupleSatisfiesUpdate(HeapTupleHeader tuple, CommandId curcid,
640636

641637
Assert(!(tuple->t_infomask&HEAP_XMAX_IS_MULTI));
642638

643-
/* deleting subtransaction aborted? */
644-
if (TransactionIdDidAbort(HeapTupleHeaderGetXmax(tuple)))
639+
if (!TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)))
645640
{
641+
/* deleting subtransaction must have aborted */
646642
SetHintBits(tuple,buffer,HEAP_XMAX_INVALID,
647643
InvalidTransactionId);
648644
returnHeapTupleMayBeUpdated;
649645
}
650646

651-
Assert(TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)));
652-
653647
if (HeapTupleHeaderGetCmax(tuple) >=curcid)
654648
returnHeapTupleSelfUpdated;/* updated after scan started */
655649
else
@@ -806,16 +800,14 @@ HeapTupleSatisfiesDirty(HeapTupleHeader tuple, Snapshot snapshot,
806800

807801
Assert(!(tuple->t_infomask&HEAP_XMAX_IS_MULTI));
808802

809-
/* deleting subtransaction aborted? */
810-
if (TransactionIdDidAbort(HeapTupleHeaderGetXmax(tuple)))
803+
if (!TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)))
811804
{
805+
/* deleting subtransaction must have aborted */
812806
SetHintBits(tuple,buffer,HEAP_XMAX_INVALID,
813807
InvalidTransactionId);
814808
return true;
815809
}
816810

817-
Assert(TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)));
818-
819811
return false;
820812
}
821813
elseif (TransactionIdIsInProgress(HeapTupleHeaderGetXmin(tuple)))
@@ -970,17 +962,14 @@ HeapTupleSatisfiesMVCC(HeapTupleHeader tuple, Snapshot snapshot,
970962

971963
Assert(!(tuple->t_infomask&HEAP_XMAX_IS_MULTI));
972964

973-
/* deleting subtransaction aborted? */
974-
/* FIXME -- is this correct w.r.t. the cmax of the tuple? */
975-
if (TransactionIdDidAbort(HeapTupleHeaderGetXmax(tuple)))
965+
if (!TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)))
976966
{
967+
/* deleting subtransaction must have aborted */
977968
SetHintBits(tuple,buffer,HEAP_XMAX_INVALID,
978969
InvalidTransactionId);
979970
return true;
980971
}
981972

982-
Assert(TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmax(tuple)));
983-
984973
if (HeapTupleHeaderGetCmax(tuple) >=snapshot->curcid)
985974
return true;/* deleted after scan started */
986975
else

0 commit comments

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