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

Commitb31ba53

Browse files
committed
Rename ShmemVariableCache to TransamVariables
The old name was misleading: It's not a cache, the values kept in thestruct are the authoritative source.Reviewed-by: Tristan Partin, Richard GuoDiscussion:https://www.postgresql.org/message-id/6537d63d-4bb5-46f8-9b5d-73a8ba4720ab@iki.fi
1 parent15916ff commitb31ba53

File tree

18 files changed

+172
-175
lines changed

18 files changed

+172
-175
lines changed

‎contrib/amcheck/verify_heapam.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ typedef struct ToastedAttribute
8181
typedefstructHeapCheckContext
8282
{
8383
/*
84-
* Cached copies of values fromShmemVariableCache and computed values
85-
*fromthem.
84+
* Cached copies of values fromTransamVariables and computed values from
85+
* them.
8686
*/
87-
FullTransactionIdnext_fxid;/*ShmemVariableCache->nextXid */
87+
FullTransactionIdnext_fxid;/*TransamVariables->nextXid */
8888
TransactionIdnext_xid;/* 32-bit version of next_fxid */
89-
TransactionIdoldest_xid;/*ShmemVariableCache->oldestXid */
89+
TransactionIdoldest_xid;/*TransamVariables->oldestXid */
9090
FullTransactionIdoldest_fxid;/* 64-bit version of oldest_xid, computed
9191
* relative to next_fxid */
9292
TransactionIdsafe_xmin;/* this XID and newer ones can't become
@@ -1924,8 +1924,8 @@ update_cached_xid_range(HeapCheckContext *ctx)
19241924
{
19251925
/* Make cached copies */
19261926
LWLockAcquire(XidGenLock,LW_SHARED);
1927-
ctx->next_fxid=ShmemVariableCache->nextXid;
1928-
ctx->oldest_xid=ShmemVariableCache->oldestXid;
1927+
ctx->next_fxid=TransamVariables->nextXid;
1928+
ctx->oldest_xid=TransamVariables->oldestXid;
19291929
LWLockRelease(XidGenLock);
19301930

19311931
/* And compute alternate versions of the same */
@@ -2062,7 +2062,7 @@ get_xid_status(TransactionId xid, HeapCheckContext *ctx,
20622062
*status=XID_COMMITTED;
20632063
LWLockAcquire(XactTruncationLock,LW_SHARED);
20642064
clog_horizon=
2065-
FullTransactionIdFromXidAndCtx(ShmemVariableCache->oldestClogXid,
2065+
FullTransactionIdFromXidAndCtx(TransamVariables->oldestClogXid,
20662066
ctx);
20672067
if (FullTransactionIdPrecedesOrEquals(clog_horizon,fxid))
20682068
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -758,12 +758,12 @@ ZeroCLOGPage(int64 pageno, bool writeXlog)
758758

759759
/*
760760
* This must be called ONCE during postmaster or standalone-backend startup,
761-
* after StartupXLOG has initializedShmemVariableCache->nextXid.
761+
* after StartupXLOG has initializedTransamVariables->nextXid.
762762
*/
763763
void
764764
StartupCLOG(void)
765765
{
766-
TransactionIdxid=XidFromFullTransactionId(ShmemVariableCache->nextXid);
766+
TransactionIdxid=XidFromFullTransactionId(TransamVariables->nextXid);
767767
int64pageno=TransactionIdToPage(xid);
768768

769769
LWLockAcquire(XactSLRULock,LW_EXCLUSIVE);
@@ -782,7 +782,7 @@ StartupCLOG(void)
782782
void
783783
TrimCLOG(void)
784784
{
785-
TransactionIdxid=XidFromFullTransactionId(ShmemVariableCache->nextXid);
785+
TransactionIdxid=XidFromFullTransactionId(TransamVariables->nextXid);
786786
int64pageno=TransactionIdToPage(xid);
787787

788788
LWLockAcquire(XactSLRULock,LW_EXCLUSIVE);

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ TransactionTreeSetCommitTsData(TransactionId xid, int nsubxids,
211211
commitTsShared->dataLastCommit.nodeid=nodeid;
212212

213213
/* and move forwards our endpoint, if needed */
214-
if (TransactionIdPrecedes(ShmemVariableCache->newestCommitTsXid,newestXact))
215-
ShmemVariableCache->newestCommitTsXid=newestXact;
214+
if (TransactionIdPrecedes(TransamVariables->newestCommitTsXid,newestXact))
215+
TransamVariables->newestCommitTsXid=newestXact;
216216
LWLockRelease(CommitTsLock);
217217
}
218218

@@ -315,8 +315,8 @@ TransactionIdGetCommitTsData(TransactionId xid, TimestampTz *ts,
315315
return*ts!=0;
316316
}
317317

318-
oldestCommitTsXid=ShmemVariableCache->oldestCommitTsXid;
319-
newestCommitTsXid=ShmemVariableCache->newestCommitTsXid;
318+
oldestCommitTsXid=TransamVariables->oldestCommitTsXid;
319+
newestCommitTsXid=TransamVariables->newestCommitTsXid;
320320
/* neither is invalid, or both are */
321321
Assert(TransactionIdIsValid(oldestCommitTsXid)==TransactionIdIsValid(newestCommitTsXid));
322322
LWLockRelease(CommitTsLock);
@@ -593,7 +593,7 @@ ZeroCommitTsPage(int64 pageno, bool writeXlog)
593593

594594
/*
595595
* This must be called ONCE during postmaster or standalone-backend startup,
596-
* after StartupXLOG has initializedShmemVariableCache->nextXid.
596+
* after StartupXLOG has initializedTransamVariables->nextXid.
597597
*/
598598
void
599599
StartupCommitTs(void)
@@ -683,7 +683,7 @@ ActivateCommitTs(void)
683683
}
684684
LWLockRelease(CommitTsLock);
685685

686-
xid=XidFromFullTransactionId(ShmemVariableCache->nextXid);
686+
xid=XidFromFullTransactionId(TransamVariables->nextXid);
687687
pageno=TransactionIdToCTsPage(xid);
688688

689689
/*
@@ -707,10 +707,10 @@ ActivateCommitTs(void)
707707
* Invalid temporarily.
708708
*/
709709
LWLockAcquire(CommitTsLock,LW_EXCLUSIVE);
710-
if (ShmemVariableCache->oldestCommitTsXid==InvalidTransactionId)
710+
if (TransamVariables->oldestCommitTsXid==InvalidTransactionId)
711711
{
712-
ShmemVariableCache->oldestCommitTsXid=
713-
ShmemVariableCache->newestCommitTsXid=ReadNextTransactionId();
712+
TransamVariables->oldestCommitTsXid=
713+
TransamVariables->newestCommitTsXid=ReadNextTransactionId();
714714
}
715715
LWLockRelease(CommitTsLock);
716716

@@ -759,8 +759,8 @@ DeactivateCommitTs(void)
759759
TIMESTAMP_NOBEGIN(commitTsShared->dataLastCommit.time);
760760
commitTsShared->dataLastCommit.nodeid=InvalidRepOriginId;
761761

762-
ShmemVariableCache->oldestCommitTsXid=InvalidTransactionId;
763-
ShmemVariableCache->newestCommitTsXid=InvalidTransactionId;
762+
TransamVariables->oldestCommitTsXid=InvalidTransactionId;
763+
TransamVariables->newestCommitTsXid=InvalidTransactionId;
764764

765765
LWLockRelease(CommitTsLock);
766766

@@ -874,18 +874,18 @@ SetCommitTsLimit(TransactionId oldestXact, TransactionId newestXact)
874874
* "future" or signal a disabled committs.
875875
*/
876876
LWLockAcquire(CommitTsLock,LW_EXCLUSIVE);
877-
if (ShmemVariableCache->oldestCommitTsXid!=InvalidTransactionId)
877+
if (TransamVariables->oldestCommitTsXid!=InvalidTransactionId)
878878
{
879-
if (TransactionIdPrecedes(ShmemVariableCache->oldestCommitTsXid,oldestXact))
880-
ShmemVariableCache->oldestCommitTsXid=oldestXact;
881-
if (TransactionIdPrecedes(newestXact,ShmemVariableCache->newestCommitTsXid))
882-
ShmemVariableCache->newestCommitTsXid=newestXact;
879+
if (TransactionIdPrecedes(TransamVariables->oldestCommitTsXid,oldestXact))
880+
TransamVariables->oldestCommitTsXid=oldestXact;
881+
if (TransactionIdPrecedes(newestXact,TransamVariables->newestCommitTsXid))
882+
TransamVariables->newestCommitTsXid=newestXact;
883883
}
884884
else
885885
{
886-
Assert(ShmemVariableCache->newestCommitTsXid==InvalidTransactionId);
887-
ShmemVariableCache->oldestCommitTsXid=oldestXact;
888-
ShmemVariableCache->newestCommitTsXid=newestXact;
886+
Assert(TransamVariables->newestCommitTsXid==InvalidTransactionId);
887+
TransamVariables->oldestCommitTsXid=oldestXact;
888+
TransamVariables->newestCommitTsXid=newestXact;
889889
}
890890
LWLockRelease(CommitTsLock);
891891
}
@@ -897,9 +897,9 @@ void
897897
AdvanceOldestCommitTsXid(TransactionIdoldestXact)
898898
{
899899
LWLockAcquire(CommitTsLock,LW_EXCLUSIVE);
900-
if (ShmemVariableCache->oldestCommitTsXid!=InvalidTransactionId&&
901-
TransactionIdPrecedes(ShmemVariableCache->oldestCommitTsXid,oldestXact))
902-
ShmemVariableCache->oldestCommitTsXid=oldestXact;
900+
if (TransamVariables->oldestCommitTsXid!=InvalidTransactionId&&
901+
TransactionIdPrecedes(TransamVariables->oldestCommitTsXid,oldestXact))
902+
TransamVariables->oldestCommitTsXid=oldestXact;
903903
LWLockRelease(CommitTsLock);
904904
}
905905

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ ZeroSUBTRANSPage(int64 pageno)
250250

251251
/*
252252
* This must be called ONCE during postmaster or standalone-backend startup,
253-
* after StartupXLOG has initializedShmemVariableCache->nextXid.
253+
* after StartupXLOG has initializedTransamVariables->nextXid.
254254
*
255255
* oldestActiveXID is the oldest XID of any prepared transaction, or nextXid
256256
* if there are none.
@@ -271,7 +271,7 @@ StartupSUBTRANS(TransactionId oldestActiveXID)
271271
LWLockAcquire(SubtransSLRULock,LW_EXCLUSIVE);
272272

273273
startPage=TransactionIdToPage(oldestActiveXID);
274-
nextXid=ShmemVariableCache->nextXid;
274+
nextXid=TransamVariables->nextXid;
275275
endPage=TransactionIdToPage(XidFromFullTransactionId(nextXid));
276276

277277
while (startPage!=endPage)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,7 @@ AdjustToFullTransactionId(TransactionId xid)
958958
Assert(TransactionIdIsValid(xid));
959959

960960
LWLockAcquire(XidGenLock,LW_SHARED);
961-
nextFullXid=ShmemVariableCache->nextXid;
961+
nextFullXid=TransamVariables->nextXid;
962962
LWLockRelease(XidGenLock);
963963

964964
nextXid=XidFromFullTransactionId(nextFullXid);
@@ -1948,7 +1948,7 @@ restoreTwoPhaseData(void)
19481948
*
19491949
* Scan the shared memory entries of TwoPhaseState and determine the range
19501950
* of valid XIDs present. This is run during database startup, after we
1951-
* have completed reading WAL.ShmemVariableCache->nextXid has been set to
1951+
* have completed reading WAL.TransamVariables->nextXid has been set to
19521952
* one more than the highest XID for which evidence exists in WAL.
19531953
*
19541954
* We throw away any prepared xacts with main XID beyond nextXid --- if any
@@ -1967,7 +1967,7 @@ restoreTwoPhaseData(void)
19671967
* backup should be rolled in.
19681968
*
19691969
* Our other responsibility is to determine and return the oldest valid XID
1970-
* among the prepared xacts (if none, returnShmemVariableCache->nextXid).
1970+
* among the prepared xacts (if none, returnTransamVariables->nextXid).
19711971
* This is needed to synchronize pg_subtrans startup properly.
19721972
*
19731973
* If xids_p and nxids_p are not NULL, pointer to a palloc'd array of all
@@ -1977,7 +1977,7 @@ restoreTwoPhaseData(void)
19771977
TransactionId
19781978
PrescanPreparedTransactions(TransactionId**xids_p,int*nxids_p)
19791979
{
1980-
FullTransactionIdnextXid=ShmemVariableCache->nextXid;
1980+
FullTransactionIdnextXid=TransamVariables->nextXid;
19811981
TransactionIdorigNextXid=XidFromFullTransactionId(nextXid);
19821982
TransactionIdresult=origNextXid;
19831983
TransactionId*xids=NULL;
@@ -2196,7 +2196,7 @@ RecoverPreparedTransactions(void)
21962196
*
21972197
* If setParent is true, set up subtransaction parent linkages.
21982198
*
2199-
* If setNextXid is true, setShmemVariableCache->nextXid to the newest
2199+
* If setNextXid is true, setTransamVariables->nextXid to the newest
22002200
* value scanned.
22012201
*/
22022202
staticchar*
@@ -2205,7 +2205,7 @@ ProcessTwoPhaseBuffer(TransactionId xid,
22052205
boolfromdisk,
22062206
boolsetParent,boolsetNextXid)
22072207
{
2208-
FullTransactionIdnextXid=ShmemVariableCache->nextXid;
2208+
FullTransactionIdnextXid=TransamVariables->nextXid;
22092209
TransactionIdorigNextXid=XidFromFullTransactionId(nextXid);
22102210
TransactionId*subxids;
22112211
char*buf;

0 commit comments

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