Skip to content

Commit cf6b7cc

Browse files
author
Commitfest Bot
committed
[CF 5575] v7 - Elimination of the repetitive code at the SLRU bootstrap functions
This branch was automatically generated by a robot using patches from an email thread registered at: https://commitfest.postgresql.org/patch/5575 The branch will be overwritten each time a new patch version is posted to the thread, and also periodically to check for bitrot caused by changes on the master branch. Patch(es): https://www.postgresql.org/message-id/[email protected] Author(s): Evgeny Voropaev
2 parents 144ad72 + 8bcc362 commit cf6b7cc

File tree

8 files changed

+78
-255
lines changed

8 files changed

+78
-255
lines changed

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

Lines changed: 8 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,7 @@ static SlruCtlData XactCtlData;
110110
#define XactCtl (&XactCtlData)
111111

112112

113-
static int ZeroCLOGPage(int64 pageno, bool writeXlog);
114113
static bool CLOGPagePrecedes(int64 page1, int64 page2);
115-
static void WriteZeroPageXlogRec(int64 pageno);
116114
static void WriteTruncateXlogRec(int64 pageno, TransactionId oldestXact,
117115
Oid oldestXactDb);
118116
static void TransactionIdSetPageStatus(TransactionId xid, int nsubxids,
@@ -832,41 +830,10 @@ check_transaction_buffers(int *newval, void **extra, GucSource source)
832830
void
833831
BootStrapCLOG(void)
834832
{
835-
int slotno;
836-
LWLock *lock = SimpleLruGetBankLock(XactCtl, 0);
837-
838-
LWLockAcquire(lock, LW_EXCLUSIVE);
839-
840-
/* Create and zero the first page of the commit log */
841-
slotno = ZeroCLOGPage(0, false);
842-
843-
/* Make sure it's written out */
844-
SimpleLruWritePage(XactCtl, slotno);
845-
Assert(!XactCtl->shared->page_dirty[slotno]);
846-
847-
LWLockRelease(lock);
848-
}
849-
850-
/*
851-
* Initialize (or reinitialize) a page of CLOG to zeroes.
852-
* If writeXlog is true, also emit an XLOG record saying we did this.
853-
*
854-
* The page is not actually written, just set up in shared memory.
855-
* The slot number of the new page is returned.
856-
*
857-
* Control lock must be held at entry, and will be held at exit.
858-
*/
859-
static int
860-
ZeroCLOGPage(int64 pageno, bool writeXlog)
861-
{
862-
int slotno;
863-
864-
slotno = SimpleLruZeroPage(XactCtl, pageno);
865-
866-
if (writeXlog)
867-
WriteZeroPageXlogRec(pageno);
868-
869-
return slotno;
833+
/*
834+
* Nullify the page (pageno = 0) and save the page on a disk
835+
*/
836+
SimpleLruZeroPageExt(XactCtl, 0);
870837
}
871838

872839
/*
@@ -975,7 +942,8 @@ ExtendCLOG(TransactionId newestXact)
975942
LWLockAcquire(lock, LW_EXCLUSIVE);
976943

977944
/* Zero the page and make an XLOG entry about it */
978-
ZeroCLOGPage(pageno, true);
945+
SimpleLruZeroPage(XactCtl, pageno);
946+
XLogSimpleInsert(RM_CLOG_ID, CLOG_ZEROPAGE, pageno);
979947

980948
LWLockRelease(lock);
981949
}
@@ -1067,17 +1035,6 @@ CLOGPagePrecedes(int64 page1, int64 page2)
10671035
}
10681036

10691037

1070-
/*
1071-
* Write a ZEROPAGE xlog record
1072-
*/
1073-
static void
1074-
WriteZeroPageXlogRec(int64 pageno)
1075-
{
1076-
XLogBeginInsert();
1077-
XLogRegisterData(&pageno, sizeof(pageno));
1078-
(void) XLogInsert(RM_CLOG_ID, CLOG_ZEROPAGE);
1079-
}
1080-
10811038
/*
10821039
* Write a TRUNCATE xlog record
10831040
*
@@ -1114,19 +1071,9 @@ clog_redo(XLogReaderState *record)
11141071
if (info == CLOG_ZEROPAGE)
11151072
{
11161073
int64 pageno;
1117-
int slotno;
1118-
LWLock *lock;
1119-
11201074
memcpy(&pageno, XLogRecGetData(record), sizeof(pageno));
1121-
1122-
lock = SimpleLruGetBankLock(XactCtl, pageno);
1123-
LWLockAcquire(lock, LW_EXCLUSIVE);
1124-
1125-
slotno = ZeroCLOGPage(pageno, false);
1126-
SimpleLruWritePage(XactCtl, slotno);
1127-
Assert(!XactCtl->shared->page_dirty[slotno]);
1128-
1129-
LWLockRelease(lock);
1075+
/* Zero the page, write the page on a disk */
1076+
SimpleLruZeroPageExt(XactCtl, pageno);
11301077
}
11311078
else if (info == CLOG_TRUNCATE)
11321079
{

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

Lines changed: 8 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,9 @@ static void SetXidCommitTsInPage(TransactionId xid, int nsubxids,
114114
static void TransactionIdSetCommitTs(TransactionId xid, TimestampTz ts,
115115
RepOriginId nodeid, int slotno);
116116
static void error_commit_ts_disabled(void);
117-
static int ZeroCommitTsPage(int64 pageno, bool writeXlog);
118117
static bool CommitTsPagePrecedes(int64 page1, int64 page2);
119118
static void ActivateCommitTs(void);
120119
static void DeactivateCommitTs(void);
121-
static void WriteZeroPageXlogRec(int64 pageno);
122120
static void WriteTruncateXlogRec(int64 pageno, TransactionId oldestXid);
123121

124122
/*
@@ -602,28 +600,6 @@ BootStrapCommitTs(void)
602600
*/
603601
}
604602

605-
/*
606-
* Initialize (or reinitialize) a page of CommitTs to zeroes.
607-
* If writeXlog is true, also emit an XLOG record saying we did this.
608-
*
609-
* The page is not actually written, just set up in shared memory.
610-
* The slot number of the new page is returned.
611-
*
612-
* Control lock must be held at entry, and will be held at exit.
613-
*/
614-
static int
615-
ZeroCommitTsPage(int64 pageno, bool writeXlog)
616-
{
617-
int slotno;
618-
619-
slotno = SimpleLruZeroPage(CommitTsCtl, pageno);
620-
621-
if (writeXlog)
622-
WriteZeroPageXlogRec(pageno);
623-
624-
return slotno;
625-
}
626-
627603
/*
628604
* This must be called ONCE during postmaster or standalone-backend startup,
629605
* after StartupXLOG has initialized TransamVariables->nextXid.
@@ -754,16 +730,8 @@ ActivateCommitTs(void)
754730

755731
/* Create the current segment file, if necessary */
756732
if (!SimpleLruDoesPhysicalPageExist(CommitTsCtl, pageno))
757-
{
758-
LWLock *lock = SimpleLruGetBankLock(CommitTsCtl, pageno);
759-
int slotno;
760-
761-
LWLockAcquire(lock, LW_EXCLUSIVE);
762-
slotno = ZeroCommitTsPage(pageno, false);
763-
SimpleLruWritePage(CommitTsCtl, slotno);
764-
Assert(!CommitTsCtl->shared->page_dirty[slotno]);
765-
LWLockRelease(lock);
766-
}
733+
/* Zero the page, write the page on a disk */
734+
SimpleLruZeroPageExt(CommitTsCtl, pageno);
767735

768736
/* Change the activation status in shared memory. */
769737
LWLockAcquire(CommitTsLock, LW_EXCLUSIVE);
@@ -875,7 +843,10 @@ ExtendCommitTs(TransactionId newestXact)
875843
LWLockAcquire(lock, LW_EXCLUSIVE);
876844

877845
/* Zero the page and make an XLOG entry about it */
878-
ZeroCommitTsPage(pageno, !InRecovery);
846+
SimpleLruZeroPage(CommitTsCtl, pageno);
847+
848+
if (!InRecovery)
849+
XLogSimpleInsert(RM_COMMIT_TS_ID, COMMIT_TS_ZEROPAGE, pageno);
879850

880851
LWLockRelease(lock);
881852
}
@@ -989,17 +960,6 @@ CommitTsPagePrecedes(int64 page1, int64 page2)
989960
}
990961

991962

992-
/*
993-
* Write a ZEROPAGE xlog record
994-
*/
995-
static void
996-
WriteZeroPageXlogRec(int64 pageno)
997-
{
998-
XLogBeginInsert();
999-
XLogRegisterData(&pageno, sizeof(pageno));
1000-
(void) XLogInsert(RM_COMMIT_TS_ID, COMMIT_TS_ZEROPAGE);
1001-
}
1002-
1003963
/*
1004964
* Write a TRUNCATE xlog record
1005965
*/
@@ -1030,19 +990,10 @@ commit_ts_redo(XLogReaderState *record)
1030990
if (info == COMMIT_TS_ZEROPAGE)
1031991
{
1032992
int64 pageno;
1033-
int slotno;
1034-
LWLock *lock;
1035-
1036993
memcpy(&pageno, XLogRecGetData(record), sizeof(pageno));
1037994

1038-
lock = SimpleLruGetBankLock(CommitTsCtl, pageno);
1039-
LWLockAcquire(lock, LW_EXCLUSIVE);
1040-
1041-
slotno = ZeroCommitTsPage(pageno, false);
1042-
SimpleLruWritePage(CommitTsCtl, slotno);
1043-
Assert(!CommitTsCtl->shared->page_dirty[slotno]);
1044-
1045-
LWLockRelease(lock);
995+
/* Zero the page, write the page on a disk */
996+
SimpleLruZeroPageExt(CommitTsCtl, pageno);
1046997
}
1047998
else if (info == COMMIT_TS_TRUNCATE)
1048999
{

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

Lines changed: 14 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,6 @@ static void mXactCachePut(MultiXactId multi, int nmembers,
401401
static char *mxstatus_to_string(MultiXactStatus status);
402402

403403
/* management of SLRU infrastructure */
404-
static int ZeroMultiXactOffsetPage(int64 pageno, bool writeXlog);
405-
static int ZeroMultiXactMemberPage(int64 pageno, bool writeXlog);
406404
static bool MultiXactOffsetPagePrecedes(int64 page1, int64 page2);
407405
static bool MultiXactMemberPagePrecedes(int64 page1, int64 page2);
408406
static bool MultiXactOffsetPrecedes(MultiXactOffset offset1,
@@ -413,7 +411,6 @@ static bool MultiXactOffsetWouldWrap(MultiXactOffset boundary,
413411
MultiXactOffset start, uint32 distance);
414412
static bool SetOffsetVacuumLimit(bool is_startup);
415413
static bool find_multixact_start(MultiXactId multi, MultiXactOffset *result);
416-
static void WriteMZeroPageXlogRec(int64 pageno, uint8 info);
417414
static void WriteMTruncateXlogRec(Oid oldestMultiDB,
418415
MultiXactId startTruncOff,
419416
MultiXactId endTruncOff,
@@ -2033,70 +2030,11 @@ check_multixact_member_buffers(int *newval, void **extra, GucSource source)
20332030
void
20342031
BootStrapMultiXact(void)
20352032
{
2036-
int slotno;
2037-
LWLock *lock;
2038-
2039-
lock = SimpleLruGetBankLock(MultiXactOffsetCtl, 0);
2040-
LWLockAcquire(lock, LW_EXCLUSIVE);
2041-
2042-
/* Create and zero the first page of the offsets log */
2043-
slotno = ZeroMultiXactOffsetPage(0, false);
2044-
2045-
/* Make sure it's written out */
2046-
SimpleLruWritePage(MultiXactOffsetCtl, slotno);
2047-
Assert(!MultiXactOffsetCtl->shared->page_dirty[slotno]);
2048-
2049-
LWLockRelease(lock);
2050-
2051-
lock = SimpleLruGetBankLock(MultiXactMemberCtl, 0);
2052-
LWLockAcquire(lock, LW_EXCLUSIVE);
2053-
2054-
/* Create and zero the first page of the members log */
2055-
slotno = ZeroMultiXactMemberPage(0, false);
2056-
2057-
/* Make sure it's written out */
2058-
SimpleLruWritePage(MultiXactMemberCtl, slotno);
2059-
Assert(!MultiXactMemberCtl->shared->page_dirty[slotno]);
2060-
2061-
LWLockRelease(lock);
2062-
}
2063-
2064-
/*
2065-
* Initialize (or reinitialize) a page of MultiXactOffset to zeroes.
2066-
* If writeXlog is true, also emit an XLOG record saying we did this.
2067-
*
2068-
* The page is not actually written, just set up in shared memory.
2069-
* The slot number of the new page is returned.
2070-
*
2071-
* Control lock must be held at entry, and will be held at exit.
2072-
*/
2073-
static int
2074-
ZeroMultiXactOffsetPage(int64 pageno, bool writeXlog)
2075-
{
2076-
int slotno;
2077-
2078-
slotno = SimpleLruZeroPage(MultiXactOffsetCtl, pageno);
2079-
2080-
if (writeXlog)
2081-
WriteMZeroPageXlogRec(pageno, XLOG_MULTIXACT_ZERO_OFF_PAGE);
2082-
2083-
return slotno;
2084-
}
2085-
2086-
/*
2087-
* Ditto, for MultiXactMember
2088-
*/
2089-
static int
2090-
ZeroMultiXactMemberPage(int64 pageno, bool writeXlog)
2091-
{
2092-
int slotno;
2093-
2094-
slotno = SimpleLruZeroPage(MultiXactMemberCtl, pageno);
2095-
2096-
if (writeXlog)
2097-
WriteMZeroPageXlogRec(pageno, XLOG_MULTIXACT_ZERO_MEM_PAGE);
2098-
2099-
return slotno;
2033+
/*
2034+
* Nullify the page (pageno = 0), save the page on a disk
2035+
*/
2036+
SimpleLruZeroPageExt(MultiXactOffsetCtl, 0);
2037+
SimpleLruZeroPageExt(MultiXactMemberCtl, 0);
21002038
}
21012039

21022040
/*
@@ -2134,7 +2072,7 @@ MaybeExtendOffsetSlru(void)
21342072
* with creating a new segment file even if the page we're writing is
21352073
* not the first in it, so this is enough.
21362074
*/
2137-
slotno = ZeroMultiXactOffsetPage(pageno, false);
2075+
slotno = SimpleLruZeroPage(MultiXactOffsetCtl, pageno);
21382076
SimpleLruWritePage(MultiXactOffsetCtl, slotno);
21392077
}
21402078

@@ -2569,7 +2507,8 @@ ExtendMultiXactOffset(MultiXactId multi)
25692507
LWLockAcquire(lock, LW_EXCLUSIVE);
25702508

25712509
/* Zero the page and make an XLOG entry about it */
2572-
ZeroMultiXactOffsetPage(pageno, true);
2510+
SimpleLruZeroPage(MultiXactOffsetCtl, pageno);
2511+
XLogSimpleInsert(RM_MULTIXACT_ID, XLOG_MULTIXACT_ZERO_OFF_PAGE, pageno);
25732512

25742513
LWLockRelease(lock);
25752514
}
@@ -2612,7 +2551,8 @@ ExtendMultiXactMember(MultiXactOffset offset, int nmembers)
26122551
LWLockAcquire(lock, LW_EXCLUSIVE);
26132552

26142553
/* Zero the page and make an XLOG entry about it */
2615-
ZeroMultiXactMemberPage(pageno, true);
2554+
SimpleLruZeroPage(MultiXactMemberCtl, pageno);
2555+
XLogSimpleInsert(RM_MULTIXACT_ID, XLOG_MULTIXACT_ZERO_MEM_PAGE, pageno);
26162556

26172557
LWLockRelease(lock);
26182558
}
@@ -3347,18 +3287,6 @@ MultiXactOffsetPrecedes(MultiXactOffset offset1, MultiXactOffset offset2)
33473287
return (diff < 0);
33483288
}
33493289

3350-
/*
3351-
* Write an xlog record reflecting the zeroing of either a MEMBERs or
3352-
* OFFSETs page (info shows which)
3353-
*/
3354-
static void
3355-
WriteMZeroPageXlogRec(int64 pageno, uint8 info)
3356-
{
3357-
XLogBeginInsert();
3358-
XLogRegisterData(&pageno, sizeof(pageno));
3359-
(void) XLogInsert(RM_MULTIXACT_ID, info);
3360-
}
3361-
33623290
/*
33633291
* Write a TRUNCATE xlog record
33643292
*
@@ -3401,36 +3329,16 @@ multixact_redo(XLogReaderState *record)
34013329
if (info == XLOG_MULTIXACT_ZERO_OFF_PAGE)
34023330
{
34033331
int64 pageno;
3404-
int slotno;
3405-
LWLock *lock;
3406-
34073332
memcpy(&pageno, XLogRecGetData(record), sizeof(pageno));
3408-
3409-
lock = SimpleLruGetBankLock(MultiXactOffsetCtl, pageno);
3410-
LWLockAcquire(lock, LW_EXCLUSIVE);
3411-
3412-
slotno = ZeroMultiXactOffsetPage(pageno, false);
3413-
SimpleLruWritePage(MultiXactOffsetCtl, slotno);
3414-
Assert(!MultiXactOffsetCtl->shared->page_dirty[slotno]);
3415-
3416-
LWLockRelease(lock);
3333+
/* Zero the page, write the page on a disk */
3334+
SimpleLruZeroPageExt(MultiXactOffsetCtl, pageno);
34173335
}
34183336
else if (info == XLOG_MULTIXACT_ZERO_MEM_PAGE)
34193337
{
34203338
int64 pageno;
3421-
int slotno;
3422-
LWLock *lock;
3423-
34243339
memcpy(&pageno, XLogRecGetData(record), sizeof(pageno));
3425-
3426-
lock = SimpleLruGetBankLock(MultiXactMemberCtl, pageno);
3427-
LWLockAcquire(lock, LW_EXCLUSIVE);
3428-
3429-
slotno = ZeroMultiXactMemberPage(pageno, false);
3430-
SimpleLruWritePage(MultiXactMemberCtl, slotno);
3431-
Assert(!MultiXactMemberCtl->shared->page_dirty[slotno]);
3432-
3433-
LWLockRelease(lock);
3340+
/* Zero the page, write the page on a disk */
3341+
SimpleLruZeroPageExt(MultiXactMemberCtl, pageno);
34343342
}
34353343
else if (info == XLOG_MULTIXACT_CREATE_ID)
34363344
{

0 commit comments

Comments
 (0)