Skip to content

Commit 97b05d6

Browse files
yananxinyananxin
committed
rename the methods and update all call sites
1 parent c39d303 commit 97b05d6

File tree

7 files changed

+115
-137
lines changed

7 files changed

+115
-137
lines changed

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

Lines changed: 13 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2200,9 +2200,8 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
22002200
* write the whole page to the xlog, we don't need to store
22012201
* xl_heap_header in the xlog.
22022202
*/
2203-
if (RelationGetReduceFPI(relation))
2204-
bufflags |= REGBUF_REDUCE_FPI;
2205-
XLogRegisterBuffer(0, buffer, REGBUF_STANDARD | bufflags);
2203+
XLogRegisterBufferForRelation(0, buffer, REGBUF_STANDARD | bufflags,
2204+
relation);
22062205
XLogRegisterBufData(0, (char *) &xlhdr, SizeOfNeonHeapHeader);
22072206
/* PG73FORMAT: write bitmap [+ padding] [+ oid] + data */
22082207
XLogRegisterBufData(0,
@@ -3117,10 +3116,7 @@ heap_delete(Relation relation, ItemPointer tid,
31173116
XLogBeginInsert();
31183117
XLogRegisterData((char *) &xlrec, SizeOfNeonHeapDelete);
31193118

3120-
int bufflags = REGBUF_STANDARD;
3121-
if (RelationGetReduceFPI(relation))
3122-
bufflags |= REGBUF_REDUCE_FPI;
3123-
XLogRegisterBuffer(0, buffer, bufflags);
3119+
XLogRegisterBufferForRelation(0, buffer, REGBUF_STANDARD, relation);
31243120

31253121
/*
31263122
* Log replica identity of the deleted tuple if there is one
@@ -3892,10 +3888,7 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
38923888
XLogRecPtr recptr;
38933889

38943890
XLogBeginInsert();
3895-
int bufflags = REGBUF_STANDARD;
3896-
if (RelationGetReduceFPI(relation))
3897-
bufflags |= REGBUF_REDUCE_FPI;
3898-
XLogRegisterBuffer(0, buffer, bufflags);
3891+
XLogRegisterBufferForRelation(0, buffer, REGBUF_STANDARD, relation);
38993892

39003893
xlrec.offnum = ItemPointerGetOffsetNumber(&oldtup.t_self);
39013894
xlrec.xmax = xmax_lock_old_tuple;
@@ -5228,10 +5221,7 @@ heap_lock_tuple(Relation relation, HeapTuple tuple,
52285221
XLogRecPtr recptr;
52295222

52305223
XLogBeginInsert();
5231-
int bufflags = REGBUF_STANDARD;
5232-
if (RelationGetReduceFPI(relation))
5233-
bufflags |= REGBUF_REDUCE_FPI;
5234-
XLogRegisterBuffer(0, *buffer, bufflags);
5224+
XLogRegisterBufferForRelation(0, *buffer, REGBUF_STANDARD, relation);
52355225

52365226
xlrec.offnum = ItemPointerGetOffsetNumber(&tuple->t_self);
52375227
xlrec.xmax = xid;
@@ -5984,10 +5974,7 @@ heap_lock_updated_tuple_rec(Relation rel, ItemPointer tid, TransactionId xid,
59845974
Page page = BufferGetPage(buf);
59855975

59865976
XLogBeginInsert();
5987-
int bufflags = REGBUF_STANDARD;
5988-
if (RelationGetReduceFPI(rel))
5989-
bufflags |= REGBUF_REDUCE_FPI;
5990-
XLogRegisterBuffer(0, buf, bufflags);
5977+
XLogRegisterBufferForRelation(0, buf, REGBUF_STANDARD, rel);
59915978

59925979
xlrec.offnum = ItemPointerGetOffsetNumber(&mytup.t_self);
59935980
xlrec.xmax = new_xmax;
@@ -6149,10 +6136,7 @@ heap_finish_speculative(Relation relation, ItemPointer tid)
61496136
XLogSetRecordFlags(XLOG_INCLUDE_ORIGIN);
61506137

61516138
XLogRegisterData((char *) &xlrec, SizeOfHeapConfirm);
6152-
int bufflags = REGBUF_STANDARD;
6153-
if (RelationGetReduceFPI(relation))
6154-
bufflags |= REGBUF_REDUCE_FPI;
6155-
XLogRegisterBuffer(0, buffer, bufflags);
6139+
XLogRegisterBufferForRelation(0, buffer, REGBUF_STANDARD, relation);
61566140

61576141
recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_CONFIRM);
61586142

@@ -6309,10 +6293,7 @@ heap_abort_speculative(Relation relation, ItemPointer tid)
63096293

63106294
XLogBeginInsert();
63116295
XLogRegisterData((char *) &xlrec, SizeOfNeonHeapDelete);
6312-
int bufflags = REGBUF_STANDARD;
6313-
if (RelationGetReduceFPI(relation))
6314-
bufflags |= REGBUF_REDUCE_FPI;
6315-
XLogRegisterBuffer(0, buffer, bufflags);
6296+
XLogRegisterBufferForRelation(0, buffer, REGBUF_STANDARD, relation);
63166297

63176298
/* No replica identity & replication origin logged */
63186299

@@ -6556,10 +6537,7 @@ heap_inplace_update_and_unlock(Relation relation,
65566537
XLogBeginInsert();
65576538
XLogRegisterData((char *) &xlrec, SizeOfHeapInplace);
65586539

6559-
int bufflags = REGBUF_STANDARD;
6560-
if (RelationGetReduceFPI(relation))
6561-
bufflags |= REGBUF_REDUCE_FPI;
6562-
XLogRegisterBuffer(0, buffer, bufflags);
6540+
XLogRegisterBufferForRelation(0, buffer, REGBUF_STANDARD, relation);
65636541
XLogRegisterBufData(0, (char *) htup + htup->t_hoff, newlen);
65646542

65656543
/* inplace updates aren't decoded atm, don't log the origin */
@@ -6662,10 +6640,7 @@ heap_inplace_update(Relation relation, HeapTuple tuple)
66626640
XLogBeginInsert();
66636641
XLogRegisterData((char *) &xlrec, SizeOfHeapInplace);
66646642

6665-
int bufflags = REGBUF_STANDARD;
6666-
if (RelationGetReduceFPI(relation))
6667-
bufflags |= REGBUF_REDUCE_FPI;
6668-
XLogRegisterBuffer(0, buffer, bufflags);
6643+
XLogRegisterBufferForRelation(0, buffer, REGBUF_STANDARD, relation);
66696644
XLogRegisterBufData(0, (char *) htup + htup->t_hoff, newlen);
66706645

66716646
/* inplace updates aren't decoded atm, don't log the origin */
@@ -8887,9 +8862,7 @@ log_heap_visible(Relation rel, Buffer heap_buffer, Buffer vm_buffer,
88878862
flags = REGBUF_STANDARD;
88888863
if (!XLogHintBitIsNeeded())
88898864
flags |= REGBUF_NO_IMAGE;
8890-
if (RelationGetReduceFPI(rel))
8891-
flags |= REGBUF_REDUCE_FPI;
8892-
XLogRegisterBuffer(1, heap_buffer, flags);
8865+
XLogRegisterBufferForRelation(1, heap_buffer, flags, rel);
88938866

88948867
recptr = XLogInsert(RM_HEAP2_ID, XLOG_HEAP2_VISIBLE);
88958868

@@ -9029,16 +9002,11 @@ log_heap_update(Relation reln, Buffer oldbuf,
90299002
bufflags |= REGBUF_WILL_INIT;
90309003
if (need_tuple_data)
90319004
bufflags |= REGBUF_KEEP_DATA;
9032-
if (RelationGetReduceFPI(reln))
9033-
bufflags |= REGBUF_REDUCE_FPI;
90349005

9035-
XLogRegisterBuffer(0, newbuf, bufflags);
9006+
XLogRegisterBufferForRelation(0, newbuf, bufflags, reln);
90369007
if (oldbuf != newbuf)
90379008
{
9038-
int oldbufflags = REGBUF_STANDARD;
9039-
if (RelationGetReduceFPI(reln))
9040-
oldbufflags |= REGBUF_REDUCE_FPI;
9041-
XLogRegisterBuffer(1, oldbuf, oldbufflags);
9009+
XLogRegisterBufferForRelation(1, oldbuf, REGBUF_STANDARD, reln);
90429010
}
90439011

90449012
XLogRegisterData((char *) &xlrec, SizeOfNeonHeapUpdate);

‎src/backend/access/nbtree/nbtdedup.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,13 @@ _bt_dedup_pass(Relation rel, Buffer buf, IndexTuple newitem, Size newitemsz,
246246
if (RelationNeedsWAL(rel))
247247
{
248248
XLogRecPtr recptr;
249-
xl_btree_dedup xlrec_dedup;
249+
xl_btree_dedup xlrec_dedup;
250250

251251
xlrec_dedup.nintervals = state->nintervals;
252252

253253
XLogBeginInsert();
254-
XLogRegisterBuffer(0, buf, REGBUF_STANDARD);
255-
XLogRegisterData((char *) &xlrec_dedup, SizeOfBtreeDedup);
254+
XLogRegisterBufferForRelation(0, buf, REGBUF_STANDARD, rel);
255+
XLogRegisterData((char *) &xlrec_dedup, SizeOfBtreeDedup);
256256

257257
/*
258258
* The intervals array is not in the buffer, but pretend that it is.

‎src/backend/access/nbtree/nbtinsert.c‎

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,7 +1317,6 @@ _bt_insertonpg(Relation rel,
13171317
uint8 xlinfo;
13181318
XLogRecPtr recptr;
13191319
uint16 upostingoff;
1320-
uint8 bufflags;
13211320

13221321
xlrec.offnum = newitemoff;
13231322

@@ -1340,12 +1339,9 @@ _bt_insertonpg(Relation rel,
13401339
}
13411340
else
13421341
{
1343-
/* Internal page insert, which finishes a split on cbuf */
1344-
xlinfo = XLOG_BTREE_INSERT_UPPER;
1345-
bufflags = REGBUF_STANDARD;
1346-
if (RelationGetReduceFPI(rel))
1347-
bufflags |= REGBUF_REDUCE_FPI;
1348-
XLogRegisterBuffer(1, cbuf, bufflags);
1342+
/* Internal page insert, which finishes a split on cbuf */
1343+
xlinfo = XLOG_BTREE_INSERT_UPPER;
1344+
XLogRegisterBufferForRelation(1, cbuf, REGBUF_STANDARD, rel);
13491345

13501346
if (BufferIsValid(metabuf))
13511347
{
@@ -1359,22 +1355,18 @@ _bt_insertonpg(Relation rel,
13591355
xlmeta.fastroot = metad->btm_fastroot;
13601356
xlmeta.fastlevel = metad->btm_fastlevel;
13611357
xlmeta.last_cleanup_num_delpages = metad->btm_last_cleanup_num_delpages;
1362-
xlmeta.allequalimage = metad->btm_allequalimage;
1358+
xlmeta.allequalimage = metad->btm_allequalimage;
13631359

1364-
bufflags = REGBUF_WILL_INIT | REGBUF_STANDARD;
1365-
if (RelationGetReduceFPI(rel))
1366-
bufflags |= REGBUF_REDUCE_FPI;
1367-
XLogRegisterBuffer(2, metabuf, bufflags);
1360+
XLogRegisterBufferForRelation(2, metabuf,
1361+
REGBUF_WILL_INIT | REGBUF_STANDARD,
1362+
rel);
13681363
XLogRegisterBufData(2, (char *) &xlmeta,
13691364
sizeof(xl_btree_metadata));
13701365
}
1371-
}
1366+
}
13721367

1373-
bufflags = REGBUF_STANDARD;
1374-
if (RelationGetReduceFPI(rel))
1375-
bufflags |= REGBUF_REDUCE_FPI;
1376-
XLogRegisterBuffer(0, buf, bufflags);
1377-
if (postingoff == 0)
1368+
XLogRegisterBufferForRelation(0, buf, REGBUF_STANDARD, rel);
1369+
if (postingoff == 0)
13781370
{
13791371
/* Just log itup from caller */
13801372
XLogRegisterBufData(0, (char *) itup, IndexTupleSize(itup));
@@ -2025,13 +2017,13 @@ _bt_split(Relation rel, Relation heaprel, BTScanInsert itup_key, Buffer buf,
20252017
bufflags |= REGBUF_FORCE_IMAGE;
20262018
}
20272019

2028-
XLogRegisterBuffer(0, buf, bufflags);
2029-
XLogRegisterBuffer(1, rbuf, REGBUF_WILL_INIT);
2020+
XLogRegisterBufferForRelation(0, buf, bufflags, rel);
2021+
XLogRegisterBufferForRelation(1, rbuf, REGBUF_WILL_INIT, rel);
20302022
/* Log original right sibling, since we've changed its prev-pointer */
20312023
if (!isrightmost)
2032-
XLogRegisterBuffer(2, sbuf, REGBUF_STANDARD);
2024+
XLogRegisterBufferForRelation(2, sbuf, REGBUF_STANDARD, rel);
20332025
if (!isleaf)
2034-
XLogRegisterBuffer(3, cbuf, REGBUF_STANDARD);
2026+
XLogRegisterBufferForRelation(3, cbuf, REGBUF_STANDARD, rel);
20352027

20362028
/*
20372029
* Log the new item, if it was inserted on the left page. (If it was
@@ -2610,9 +2602,9 @@ _bt_newlevel(Relation rel, Relation heaprel, Buffer lbuf, Buffer rbuf)
26102602
XLogBeginInsert();
26112603
XLogRegisterData((char *) &xlrec, SizeOfBtreeNewroot);
26122604

2613-
XLogRegisterBuffer(0, rootbuf, REGBUF_WILL_INIT);
2614-
XLogRegisterBuffer(1, lbuf, REGBUF_STANDARD);
2615-
XLogRegisterBuffer(2, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD);
2605+
XLogRegisterBufferForRelation(0, rootbuf, REGBUF_WILL_INIT, rel);
2606+
XLogRegisterBufferForRelation(1, lbuf, REGBUF_STANDARD, rel);
2607+
XLogRegisterBufferForRelation(2, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD, rel);
26162608

26172609
Assert(metad->btm_version >= BTREE_NOVAC_VERSION);
26182610
md.version = metad->btm_version;

‎src/backend/access/nbtree/nbtpage.c‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ _bt_set_cleanup_info(Relation rel, BlockNumber num_delpages)
288288
XLogRecPtr recptr;
289289

290290
XLogBeginInsert();
291-
XLogRegisterBuffer(0, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD);
291+
XLogRegisterBufferForRelation(0, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD, rel);
292292

293293
Assert(metad->btm_version >= BTREE_NOVAC_VERSION);
294294
md.version = metad->btm_version;
@@ -475,11 +475,11 @@ _bt_getroot(Relation rel, Relation heaprel, int access)
475475
XLogRecPtr recptr;
476476
xl_btree_metadata md;
477477

478-
XLogBeginInsert();
479-
XLogRegisterBuffer(0, rootbuf, REGBUF_WILL_INIT);
480-
XLogRegisterBuffer(2, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD);
478+
XLogBeginInsert();
479+
XLogRegisterBufferForRelation(0, rootbuf, REGBUF_WILL_INIT, rel);
480+
XLogRegisterBufferForRelation(2, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD, rel);
481481

482-
Assert(metad->btm_version >= BTREE_NOVAC_VERSION);
482+
Assert(metad->btm_version >= BTREE_NOVAC_VERSION);
483483
md.version = metad->btm_version;
484484
md.root = rootblkno;
485485
md.level = 0;
@@ -1230,11 +1230,11 @@ _bt_delitems_vacuum(Relation rel, Buffer buf,
12301230
xl_btree_vacuum xlrec_vacuum;
12311231

12321232
xlrec_vacuum.ndeleted = ndeletable;
1233-
xlrec_vacuum.nupdated = nupdatable;
1233+
xlrec_vacuum.nupdated = nupdatable;
12341234

1235-
XLogBeginInsert();
1236-
XLogRegisterBuffer(0, buf, REGBUF_STANDARD);
1237-
XLogRegisterData((char *) &xlrec_vacuum, SizeOfBtreeVacuum);
1235+
XLogBeginInsert();
1236+
XLogRegisterBufferForRelation(0, buf, REGBUF_STANDARD, rel);
1237+
XLogRegisterData((char *) &xlrec_vacuum, SizeOfBtreeVacuum);
12381238

12391239
if (ndeletable > 0)
12401240
XLogRegisterBufData(0, (char *) deletable,
@@ -1349,11 +1349,11 @@ _bt_delitems_delete(Relation rel, Buffer buf,
13491349
xlrec_delete.snapshotConflictHorizon = snapshotConflictHorizon;
13501350
xlrec_delete.ndeleted = ndeletable;
13511351
xlrec_delete.nupdated = nupdatable;
1352-
xlrec_delete.isCatalogRel = isCatalogRel;
1352+
xlrec_delete.isCatalogRel = isCatalogRel;
13531353

1354-
XLogBeginInsert();
1355-
XLogRegisterBuffer(0, buf, REGBUF_STANDARD);
1356-
XLogRegisterData((char *) &xlrec_delete, SizeOfBtreeDelete);
1354+
XLogBeginInsert();
1355+
XLogRegisterBufferForRelation(0, buf, REGBUF_STANDARD, rel);
1356+
XLogRegisterData((char *) &xlrec_delete, SizeOfBtreeDelete);
13571357

13581358
if (ndeletable > 0)
13591359
XLogRegisterBufData(0, (char *) deletable,
@@ -2258,13 +2258,13 @@ _bt_mark_page_halfdead(Relation rel, Relation heaprel, Buffer leafbuf,
22582258
if (topparent != leafblkno)
22592259
xlrec.topparent = topparent;
22602260
else
2261-
xlrec.topparent = InvalidBlockNumber;
2261+
xlrec.topparent = InvalidBlockNumber;
22622262

2263-
XLogBeginInsert();
2264-
XLogRegisterBuffer(0, leafbuf, REGBUF_WILL_INIT);
2265-
XLogRegisterBuffer(1, subtreeparent, REGBUF_STANDARD);
2263+
XLogBeginInsert();
2264+
XLogRegisterBufferForRelation(0, leafbuf, REGBUF_WILL_INIT, rel);
2265+
XLogRegisterBufferForRelation(1, subtreeparent, REGBUF_STANDARD, rel);
22662266

2267-
page = BufferGetPage(leafbuf);
2267+
page = BufferGetPage(leafbuf);
22682268
opaque = BTPageGetOpaque(page);
22692269
xlrec.leftblk = opaque->btpo_prev;
22702270
xlrec.rightblk = opaque->btpo_next;
@@ -2674,17 +2674,17 @@ _bt_unlink_halfdead_page(Relation rel, Buffer leafbuf, BlockNumber scanblkno,
26742674
uint8 xlinfo;
26752675
XLogRecPtr recptr;
26762676

2677-
XLogBeginInsert();
2677+
XLogBeginInsert();
26782678

2679-
XLogRegisterBuffer(0, buf, REGBUF_WILL_INIT);
2680-
if (BufferIsValid(lbuf))
2681-
XLogRegisterBuffer(1, lbuf, REGBUF_STANDARD);
2682-
XLogRegisterBuffer(2, rbuf, REGBUF_STANDARD);
2683-
if (target != leafblkno)
2684-
XLogRegisterBuffer(3, leafbuf, REGBUF_WILL_INIT);
2679+
XLogRegisterBufferForRelation(0, buf, REGBUF_WILL_INIT, rel);
2680+
if (BufferIsValid(lbuf))
2681+
XLogRegisterBufferForRelation(1, lbuf, REGBUF_STANDARD, rel);
2682+
XLogRegisterBufferForRelation(2, rbuf, REGBUF_STANDARD, rel);
2683+
if (target != leafblkno)
2684+
XLogRegisterBufferForRelation(3, leafbuf, REGBUF_WILL_INIT, rel);
26852685

2686-
/* information stored on the target/to-be-unlinked block */
2687-
xlrec.leftsib = leftsib;
2686+
/* information stored on the target/to-be-unlinked block */
2687+
xlrec.leftsib = leftsib;
26882688
xlrec.rightsib = rightsib;
26892689
xlrec.level = targetlevel;
26902690
xlrec.safexid = safexid;
@@ -2696,11 +2696,11 @@ _bt_unlink_halfdead_page(Relation rel, Buffer leafbuf, BlockNumber scanblkno,
26962696

26972697
XLogRegisterData((char *) &xlrec, SizeOfBtreeUnlinkPage);
26982698

2699-
if (BufferIsValid(metabuf))
2700-
{
2701-
XLogRegisterBuffer(4, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD);
2699+
if (BufferIsValid(metabuf))
2700+
{
2701+
XLogRegisterBufferForRelation(4, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD, rel);
27022702

2703-
Assert(metad->btm_version >= BTREE_NOVAC_VERSION);
2703+
Assert(metad->btm_version >= BTREE_NOVAC_VERSION);
27042704
xlmeta.version = metad->btm_version;
27052705
xlmeta.root = metad->btm_root;
27062706
xlmeta.level = metad->btm_level;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -868,9 +868,9 @@ XLogInsertRecord(XLogRecData *rdata,
868868
* just turned off, we could recompute the record without full pages,
869869
* but we choose not to bother.)
870870
*
871-
* However, if force_disable_full_page_write is true, we skip the
872-
* recomputation check since we're deliberately disabling full page
873-
* writes for this record via the FPI control hook.
871+
* However, if suppress_fpi is true, we skip the recomputation check
872+
* since we're deliberately suppressing full page images for this
873+
* record via the FPI control hook.
874874
*/
875875
if (RedoRecPtr != Insert->RedoRecPtr)
876876
{
@@ -881,7 +881,7 @@ XLogInsertRecord(XLogRecData *rdata,
881881

882882
if (doPageWrites &&
883883
(!prevDoPageWrites ||
884-
(!force_disable_full_page_write &&
884+
(!suppress_fpi &&
885885
fpw_lsn != InvalidXLogRecPtr && fpw_lsn <= RedoRecPtr)))
886886
{
887887
/*

0 commit comments

Comments
 (0)