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

Commit959e61e

Browse files
committed
Remove global variable scanCommandId in favor of storing a command ID
in snapshots, per my proposal of a few days ago. Also, tweak heapam.croutines (heap_insert, heap_update, heap_delete, heap_mark4update) tobe passed the command ID to use, instead of doing GetCurrentCommandID.For catalog updates they'll still get passed current command ID, butfor updates generated from the main executor they'll get passed thecommand ID saved in the snapshot the query is using. This should fixsome corner cases associated with functions and triggers that advancecurrent command ID while an outer query is still in progress.
1 parent0a26824 commit959e61e

37 files changed

+191
-235
lines changed

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

Lines changed: 38 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.134 2002/05/20 23:51:41 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.135 2002/05/21 22:05:53 tgl Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -1059,15 +1059,14 @@ heap_get_latest_tid(Relation relation,
10591059
returntid;
10601060
}
10611061

1062-
/* ----------------
1063-
*heap_insert- insert tuple into a heap
1062+
/*
1063+
*heap_insert- insert tuple into a heap
10641064
*
1065-
*The assignment of t_min (and thus the others) should be
1066-
*removed eventually.
1067-
* ----------------
1065+
* The new tuple is stamped with current transaction ID and the specified
1066+
* command ID.
10681067
*/
10691068
Oid
1070-
heap_insert(Relationrelation,HeapTupletup)
1069+
heap_insert(Relationrelation,HeapTupletup,CommandIdcid)
10711070
{
10721071
Bufferbuffer;
10731072

@@ -1093,8 +1092,9 @@ heap_insert(Relation relation, HeapTuple tup)
10931092
}
10941093

10951094
TransactionIdStore(GetCurrentTransactionId(),&(tup->t_data->t_xmin));
1096-
tup->t_data->t_cmin=GetCurrentCommandId();
1095+
tup->t_data->t_cmin=cid;
10971096
StoreInvalidTransactionId(&(tup->t_data->t_xmax));
1097+
tup->t_data->t_cmax=FirstCommandId;
10981098
tup->t_data->t_infomask &= ~(HEAP_XACT_MASK);
10991099
tup->t_data->t_infomask |=HEAP_XMAX_INVALID;
11001100
tup->t_tableOid=relation->rd_id;
@@ -1178,14 +1178,28 @@ heap_insert(Relation relation, HeapTuple tup)
11781178
returntup->t_data->t_oid;
11791179
}
11801180

1181+
/*
1182+
*simple_heap_insert - insert a tuple
1183+
*
1184+
* Currently, this routine differs from heap_insert only in supplying
1185+
* a default command ID. But it should be used rather than using
1186+
* heap_insert directly in most places where we are modifying system catalogs.
1187+
*/
1188+
Oid
1189+
simple_heap_insert(Relationrelation,HeapTupletup)
1190+
{
1191+
returnheap_insert(relation,tup,GetCurrentCommandId());
1192+
}
1193+
11811194
/*
11821195
*heap_delete- delete a tuple
11831196
*
11841197
* NB: do not call this directly unless you are prepared to deal with
11851198
* concurrent-update conditions. Use simple_heap_delete instead.
11861199
*/
11871200
int
1188-
heap_delete(Relationrelation,ItemPointertid,ItemPointerctid)
1201+
heap_delete(Relationrelation,ItemPointertid,
1202+
ItemPointerctid,CommandIdcid)
11891203
{
11901204
ItemIdlp;
11911205
HeapTupleDatatp;
@@ -1215,7 +1229,7 @@ heap_delete(Relation relation, ItemPointer tid, ItemPointer ctid)
12151229
tp.t_tableOid=relation->rd_id;
12161230

12171231
l1:
1218-
result=HeapTupleSatisfiesUpdate(&tp);
1232+
result=HeapTupleSatisfiesUpdate(&tp,cid);
12191233

12201234
if (result==HeapTupleInvisible)
12211235
{
@@ -1265,7 +1279,7 @@ heap_delete(Relation relation, ItemPointer tid, ItemPointer ctid)
12651279
START_CRIT_SECTION();
12661280
/* store transaction information of xact deleting the tuple */
12671281
TransactionIdStore(GetCurrentTransactionId(),&(tp.t_data->t_xmax));
1268-
tp.t_data->t_cmax=GetCurrentCommandId();
1282+
tp.t_data->t_cmax=cid;
12691283
tp.t_data->t_infomask &= ~(HEAP_XMAX_COMMITTED |
12701284
HEAP_XMAX_INVALID |HEAP_MARKED_FOR_UPDATE);
12711285
/* XLOG stuff */
@@ -1336,7 +1350,7 @@ simple_heap_delete(Relation relation, ItemPointer tid)
13361350
ItemPointerDatactid;
13371351
intresult;
13381352

1339-
result=heap_delete(relation,tid,&ctid);
1353+
result=heap_delete(relation,tid,&ctid,GetCurrentCommandId());
13401354
switch (result)
13411355
{
13421356
caseHeapTupleSelfUpdated:
@@ -1356,7 +1370,6 @@ simple_heap_delete(Relation relation, ItemPointer tid)
13561370
elog(ERROR,"Unknown status %u from heap_delete",result);
13571371
break;
13581372
}
1359-
13601373
}
13611374

13621375
/*
@@ -1367,7 +1380,7 @@ simple_heap_delete(Relation relation, ItemPointer tid)
13671380
*/
13681381
int
13691382
heap_update(Relationrelation,ItemPointerotid,HeapTuplenewtup,
1370-
ItemPointerctid)
1383+
ItemPointerctid,CommandIdcid)
13711384
{
13721385
ItemIdlp;
13731386
HeapTupleDataoldtup;
@@ -1407,7 +1420,7 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
14071420
*/
14081421

14091422
l2:
1410-
result=HeapTupleSatisfiesUpdate(&oldtup);
1423+
result=HeapTupleSatisfiesUpdate(&oldtup,cid);
14111424

14121425
if (result==HeapTupleInvisible)
14131426
{
@@ -1457,7 +1470,7 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
14571470
/* Fill in OID and transaction status data for newtup */
14581471
newtup->t_data->t_oid=oldtup.t_data->t_oid;
14591472
TransactionIdStore(GetCurrentTransactionId(),&(newtup->t_data->t_xmin));
1460-
newtup->t_data->t_cmin=GetCurrentCommandId();
1473+
newtup->t_data->t_cmin=cid;
14611474
StoreInvalidTransactionId(&(newtup->t_data->t_xmax));
14621475
newtup->t_data->t_infomask &= ~(HEAP_XACT_MASK);
14631476
newtup->t_data->t_infomask |= (HEAP_XMAX_INVALID |HEAP_UPDATED);
@@ -1496,7 +1509,7 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
14961509

14971510
TransactionIdStore(GetCurrentTransactionId(),
14981511
&(oldtup.t_data->t_xmax));
1499-
oldtup.t_data->t_cmax=GetCurrentCommandId();
1512+
oldtup.t_data->t_cmax=cid;
15001513
oldtup.t_data->t_infomask &= ~(HEAP_XMAX_COMMITTED |
15011514
HEAP_XMAX_INVALID |
15021515
HEAP_MARKED_FOR_UPDATE);
@@ -1588,7 +1601,7 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
15881601
{
15891602
TransactionIdStore(GetCurrentTransactionId(),
15901603
&(oldtup.t_data->t_xmax));
1591-
oldtup.t_data->t_cmax=GetCurrentCommandId();
1604+
oldtup.t_data->t_cmax=cid;
15921605
oldtup.t_data->t_infomask &= ~(HEAP_XMAX_COMMITTED |
15931606
HEAP_XMAX_INVALID |
15941607
HEAP_MARKED_FOR_UPDATE);
@@ -1653,7 +1666,7 @@ simple_heap_update(Relation relation, ItemPointer otid, HeapTuple tup)
16531666
ItemPointerDatactid;
16541667
intresult;
16551668

1656-
result=heap_update(relation,otid,tup,&ctid);
1669+
result=heap_update(relation,otid,tup,&ctid,GetCurrentCommandId());
16571670
switch (result)
16581671
{
16591672
caseHeapTupleSelfUpdated:
@@ -1679,7 +1692,8 @@ simple_heap_update(Relation relation, ItemPointer otid, HeapTuple tup)
16791692
*heap_mark4update- mark a tuple for update
16801693
*/
16811694
int
1682-
heap_mark4update(Relationrelation,HeapTupletuple,Buffer*buffer)
1695+
heap_mark4update(Relationrelation,HeapTupletuple,Buffer*buffer,
1696+
CommandIdcid)
16831697
{
16841698
ItemPointertid=&(tuple->t_self);
16851699
ItemIdlp;
@@ -1704,7 +1718,7 @@ heap_mark4update(Relation relation, HeapTuple tuple, Buffer *buffer)
17041718
tuple->t_len=ItemIdGetLength(lp);
17051719

17061720
l3:
1707-
result=HeapTupleSatisfiesUpdate(tuple);
1721+
result=HeapTupleSatisfiesUpdate(tuple,cid);
17081722

17091723
if (result==HeapTupleInvisible)
17101724
{
@@ -1758,7 +1772,7 @@ heap_mark4update(Relation relation, HeapTuple tuple, Buffer *buffer)
17581772

17591773
/* store transaction information of xact marking the tuple */
17601774
TransactionIdStore(GetCurrentTransactionId(),&(tuple->t_data->t_xmax));
1761-
tuple->t_data->t_cmax=GetCurrentCommandId();
1775+
tuple->t_data->t_cmax=cid;
17621776
tuple->t_data->t_infomask &= ~(HEAP_XMAX_COMMITTED |HEAP_XMAX_INVALID);
17631777
tuple->t_data->t_infomask |=HEAP_MARKED_FOR_UPDATE;
17641778

@@ -2400,9 +2414,8 @@ _heap_unlock_tuple(void *data)
24002414

24012415
htup= (HeapTupleHeader)PageGetItem(page,lp);
24022416

2403-
if (!TransactionIdEquals(htup->t_xmax,GetCurrentTransactionId())||
2404-
htup->t_cmax!=GetCurrentCommandId())
2405-
elog(PANIC,"_heap_unlock_tuple: invalid xmax/cmax in rollback");
2417+
if (!TransactionIdEquals(htup->t_xmax,GetCurrentTransactionId()))
2418+
elog(PANIC,"_heap_unlock_tuple: invalid xmax in rollback");
24062419
htup->t_infomask &= ~HEAP_XMAX_UNLOGGED;
24072420
htup->t_infomask |=HEAP_XMAX_INVALID;
24082421
UnlockAndWriteBuffer(buffer);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/heap/tuptoaster.c,v 1.29 2002/05/20 23:51:41 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/heap/tuptoaster.c,v 1.30 2002/05/21 22:05:53 tgl Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -911,7 +911,7 @@ toast_save_datum(Relation rel, Datum value)
911911
if (!HeapTupleIsValid(toasttup))
912912
elog(ERROR,"Failed to build TOAST tuple");
913913

914-
heap_insert(toastrel,toasttup);
914+
simple_heap_insert(toastrel,toasttup);
915915

916916
/*
917917
* Create the index entry.We cheat a little here by not using

‎src/backend/access/transam/xact.c

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.122 2002/05/17 20:53:33 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.123 2002/05/21 22:05:53 tgl Exp $
1212
*
1313
* NOTES
1414
*Transaction aborts can now occur two ways:
@@ -350,14 +350,6 @@ GetCurrentCommandId(void)
350350
returns->commandId;
351351
}
352352

353-
CommandId
354-
GetScanCommandId(void)
355-
{
356-
TransactionStates=CurrentTransactionState;
357-
358-
returns->scanCommandId;
359-
}
360-
361353

362354
/* --------------------------------
363355
*GetCurrentTransactionStartTime
@@ -418,17 +410,6 @@ CommandIdIsCurrentCommandId(CommandId cid)
418410
return (cid==s->commandId) ? true : false;
419411
}
420412

421-
bool
422-
CommandIdGEScanCommandId(CommandIdcid)
423-
{
424-
TransactionStates=CurrentTransactionState;
425-
426-
if (AMI_OVERRIDE)
427-
return false;
428-
429-
return (cid >=s->scanCommandId) ? true : false;
430-
}
431-
432413

433414
/* --------------------------------
434415
*CommandCounterIncrement
@@ -437,11 +418,17 @@ CommandIdGEScanCommandId(CommandId cid)
437418
void
438419
CommandCounterIncrement(void)
439420
{
440-
CurrentTransactionStateData.commandId+=1;
441-
if (CurrentTransactionStateData.commandId==FirstCommandId)
421+
TransactionStates=CurrentTransactionState;
422+
423+
s->commandId+=1;
424+
if (s->commandId==FirstCommandId)/* check for overflow */
442425
elog(ERROR,"You may only have 2^32-1 commands per transaction");
443426

444-
CurrentTransactionStateData.scanCommandId=CurrentTransactionStateData.commandId;
427+
/* Propagate new command ID into query snapshots, if set */
428+
if (QuerySnapshot)
429+
QuerySnapshot->curcid=s->commandId;
430+
if (SerializableSnapshot)
431+
SerializableSnapshot->curcid=s->commandId;
445432

446433
/*
447434
* make cache changes visible to me. AtCommit_LocalCache() instead of
@@ -451,11 +438,6 @@ CommandCounterIncrement(void)
451438
AtStart_Cache();
452439
}
453440

454-
void
455-
SetScanCommandId(CommandIdsavedId)
456-
{
457-
CurrentTransactionStateData.scanCommandId=savedId;
458-
}
459441

460442
/* ----------------------------------------------------------------
461443
*StartTransaction stuff
@@ -889,10 +871,6 @@ StartTransaction(void)
889871
* initialize current transaction state fields
890872
*/
891873
s->commandId=FirstCommandId;
892-
s->scanCommandId=FirstCommandId;
893-
#ifNOT_USED
894-
s->startTime=GetCurrentAbsoluteTime();
895-
#endif
896874
s->startTime=GetCurrentAbsoluteTimeUsec(&(s->startTimeUsec));
897875

898876
/*

‎src/backend/bootstrap/bootstrap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.130 2002/05/20 23:51:41 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.131 2002/05/21 22:05:53 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -680,7 +680,7 @@ InsertOneTuple(Oid objectid)
680680

681681
if (objectid!= (Oid)0)
682682
tuple->t_data->t_oid=objectid;
683-
heap_insert(boot_reldesc,tuple);
683+
simple_heap_insert(boot_reldesc,tuple);
684684
heap_freetuple(tuple);
685685
elog(DEBUG3,"row inserted");
686686

‎src/backend/catalog/heap.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.200 2002/05/20 23:51:41 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.201 2002/05/21 22:05:53 tgl Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -440,7 +440,7 @@ AddNewAttributeTuples(Oid new_rel_oid,
440440
ATTRIBUTE_TUPLE_SIZE,
441441
(void*)*dpp);
442442

443-
heap_insert(rel,tup);
443+
simple_heap_insert(rel,tup);
444444

445445
if (hasindex)
446446
CatalogIndexInsert(idescs,Num_pg_attr_indices,rel,tup);
@@ -474,7 +474,7 @@ AddNewAttributeTuples(Oid new_rel_oid,
474474
/* attStruct->attstattarget = 0; */
475475
/* attStruct->attcacheoff = -1; */
476476

477-
heap_insert(rel,tup);
477+
simple_heap_insert(rel,tup);
478478

479479
if (hasindex)
480480
CatalogIndexInsert(idescs,Num_pg_attr_indices,rel,tup);
@@ -574,7 +574,7 @@ AddNewRelationTuple(Relation pg_class_desc,
574574
/*
575575
* finally insert the new tuple and free it.
576576
*/
577-
heap_insert(pg_class_desc,tup);
577+
simple_heap_insert(pg_class_desc,tup);
578578

579579
if (!IsIgnoringSystemIndexes())
580580
{
@@ -1308,7 +1308,7 @@ StoreAttrDefault(Relation rel, AttrNumber attnum, char *adbin)
13081308
CStringGetDatum(adsrc));
13091309
adrel=heap_openr(AttrDefaultRelationName,RowExclusiveLock);
13101310
tuple=heap_formtuple(adrel->rd_att,values,nulls);
1311-
heap_insert(adrel,tuple);
1311+
simple_heap_insert(adrel,tuple);
13121312
CatalogOpenIndices(Num_pg_attrdef_indices,Name_pg_attrdef_indices,
13131313
idescs);
13141314
CatalogIndexInsert(idescs,Num_pg_attrdef_indices,adrel,tuple);
@@ -1388,7 +1388,7 @@ StoreRelCheck(Relation rel, char *ccname, char *ccbin)
13881388
CStringGetDatum(ccsrc));
13891389
rcrel=heap_openr(RelCheckRelationName,RowExclusiveLock);
13901390
tuple=heap_formtuple(rcrel->rd_att,values,nulls);
1391-
heap_insert(rcrel,tuple);
1391+
simple_heap_insert(rcrel,tuple);
13921392
CatalogOpenIndices(Num_pg_relcheck_indices,Name_pg_relcheck_indices,
13931393
idescs);
13941394
CatalogIndexInsert(idescs,Num_pg_relcheck_indices,rcrel,tuple);

0 commit comments

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