Skip to content

Commit b6f7871

Browse files
yananxinyananxin
committed
rename the methods and update all call sites
1 parent e75aad9 commit b6f7871

File tree

6 files changed

+112
-134
lines changed

6 files changed

+112
-134
lines changed

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

Lines changed: 13 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2165,9 +2165,8 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
21652165
* write the whole page to the xlog, we don't need to store
21662166
* xl_heap_header in the xlog.
21672167
*/
2168-
if (RelationGetReduceFPI(relation))
2169-
bufflags |= REGBUF_REDUCE_FPI;
2170-
XLogRegisterBuffer(0, buffer, REGBUF_STANDARD | bufflags);
2168+
XLogRegisterBufferForRelation(0, buffer, REGBUF_STANDARD | bufflags,
2169+
relation);
21712170
XLogRegisterBufData(0, (char *) &xlhdr, SizeOfNeonHeapHeader);
21722171
/* PG73FORMAT: write bitmap [+ padding] [+ oid] + data */
21732172
XLogRegisterBufData(0,
@@ -3078,10 +3077,7 @@ heap_delete(Relation relation, ItemPointer tid,
30783077
XLogBeginInsert();
30793078
XLogRegisterData((char *) &xlrec, SizeOfNeonHeapDelete);
30803079

3081-
int bufflags = REGBUF_STANDARD;
3082-
if (RelationGetReduceFPI(relation))
3083-
bufflags |= REGBUF_REDUCE_FPI;
3084-
XLogRegisterBuffer(0, buffer, bufflags);
3080+
XLogRegisterBufferForRelation(0, buffer, REGBUF_STANDARD, relation);
30853081

30863082
/*
30873083
* Log replica identity of the deleted tuple if there is one
@@ -3851,10 +3847,7 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
38513847
XLogRecPtr recptr;
38523848

38533849
XLogBeginInsert();
3854-
int bufflags = REGBUF_STANDARD;
3855-
if (RelationGetReduceFPI(relation))
3856-
bufflags |= REGBUF_REDUCE_FPI;
3857-
XLogRegisterBuffer(0, buffer, bufflags);
3850+
XLogRegisterBufferForRelation(0, buffer, REGBUF_STANDARD, relation);
38583851

38593852
xlrec.offnum = ItemPointerGetOffsetNumber(&oldtup.t_self);
38603853
xlrec.xmax = xmax_lock_old_tuple;
@@ -5187,10 +5180,7 @@ heap_lock_tuple(Relation relation, HeapTuple tuple,
51875180
XLogRecPtr recptr;
51885181

51895182
XLogBeginInsert();
5190-
int bufflags = REGBUF_STANDARD;
5191-
if (RelationGetReduceFPI(relation))
5192-
bufflags |= REGBUF_REDUCE_FPI;
5193-
XLogRegisterBuffer(0, *buffer, bufflags);
5183+
XLogRegisterBufferForRelation(0, *buffer, REGBUF_STANDARD, relation);
51945184

51955185
xlrec.offnum = ItemPointerGetOffsetNumber(&tuple->t_self);
51965186
xlrec.xmax = xid;
@@ -5943,10 +5933,7 @@ heap_lock_updated_tuple_rec(Relation rel, ItemPointer tid, TransactionId xid,
59435933
Page page = BufferGetPage(buf);
59445934

59455935
XLogBeginInsert();
5946-
int bufflags = REGBUF_STANDARD;
5947-
if (RelationGetReduceFPI(rel))
5948-
bufflags |= REGBUF_REDUCE_FPI;
5949-
XLogRegisterBuffer(0, buf, bufflags);
5936+
XLogRegisterBufferForRelation(0, buf, REGBUF_STANDARD, rel);
59505937

59515938
xlrec.offnum = ItemPointerGetOffsetNumber(&mytup.t_self);
59525939
xlrec.xmax = new_xmax;
@@ -6108,10 +6095,7 @@ heap_finish_speculative(Relation relation, ItemPointer tid)
61086095
XLogSetRecordFlags(XLOG_INCLUDE_ORIGIN);
61096096

61106097
XLogRegisterData((char *) &xlrec, SizeOfHeapConfirm);
6111-
int bufflags = REGBUF_STANDARD;
6112-
if (RelationGetReduceFPI(relation))
6113-
bufflags |= REGBUF_REDUCE_FPI;
6114-
XLogRegisterBuffer(0, buffer, bufflags);
6098+
XLogRegisterBufferForRelation(0, buffer, REGBUF_STANDARD, relation);
61156099

61166100
recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_CONFIRM);
61176101

@@ -6268,10 +6252,7 @@ heap_abort_speculative(Relation relation, ItemPointer tid)
62686252

62696253
XLogBeginInsert();
62706254
XLogRegisterData((char *) &xlrec, SizeOfNeonHeapDelete);
6271-
int bufflags = REGBUF_STANDARD;
6272-
if (RelationGetReduceFPI(relation))
6273-
bufflags |= REGBUF_REDUCE_FPI;
6274-
XLogRegisterBuffer(0, buffer, bufflags);
6255+
XLogRegisterBufferForRelation(0, buffer, REGBUF_STANDARD, relation);
62756256

62766257
/* No replica identity & replication origin logged */
62776258

@@ -6515,10 +6496,7 @@ heap_inplace_update_and_unlock(Relation relation,
65156496
XLogBeginInsert();
65166497
XLogRegisterData((char *) &xlrec, SizeOfHeapInplace);
65176498

6518-
int bufflags = REGBUF_STANDARD;
6519-
if (RelationGetReduceFPI(relation))
6520-
bufflags |= REGBUF_REDUCE_FPI;
6521-
XLogRegisterBuffer(0, buffer, bufflags);
6499+
XLogRegisterBufferForRelation(0, buffer, REGBUF_STANDARD, relation);
65226500
XLogRegisterBufData(0, (char *) htup + htup->t_hoff, newlen);
65236501

65246502
/* inplace updates aren't decoded atm, don't log the origin */
@@ -6621,10 +6599,7 @@ heap_inplace_update(Relation relation, HeapTuple tuple)
66216599
XLogBeginInsert();
66226600
XLogRegisterData((char *) &xlrec, SizeOfHeapInplace);
66236601

6624-
int bufflags = REGBUF_STANDARD;
6625-
if (RelationGetReduceFPI(relation))
6626-
bufflags |= REGBUF_REDUCE_FPI;
6627-
XLogRegisterBuffer(0, buffer, bufflags);
6602+
XLogRegisterBufferForRelation(0, buffer, REGBUF_STANDARD, relation);
66286603
XLogRegisterBufData(0, (char *) htup + htup->t_hoff, newlen);
66296604

66306605
/* inplace updates aren't decoded atm, don't log the origin */
@@ -8846,9 +8821,7 @@ log_heap_visible(Relation rel, Buffer heap_buffer, Buffer vm_buffer,
88468821
flags = REGBUF_STANDARD;
88478822
if (!XLogHintBitIsNeeded())
88488823
flags |= REGBUF_NO_IMAGE;
8849-
if (RelationGetReduceFPI(rel))
8850-
flags |= REGBUF_REDUCE_FPI;
8851-
XLogRegisterBuffer(1, heap_buffer, flags);
8824+
XLogRegisterBufferForRelation(1, heap_buffer, flags, rel);
88528825

88538826
recptr = XLogInsert(RM_HEAP2_ID, XLOG_HEAP2_VISIBLE);
88548827

@@ -8988,16 +8961,11 @@ log_heap_update(Relation reln, Buffer oldbuf,
89888961
bufflags |= REGBUF_WILL_INIT;
89898962
if (need_tuple_data)
89908963
bufflags |= REGBUF_KEEP_DATA;
8991-
if (RelationGetReduceFPI(reln))
8992-
bufflags |= REGBUF_REDUCE_FPI;
89938964

8994-
XLogRegisterBuffer(0, newbuf, bufflags);
8965+
XLogRegisterBufferForRelation(0, newbuf, bufflags, reln);
89958966
if (oldbuf != newbuf)
89968967
{
8997-
int oldbufflags = REGBUF_STANDARD;
8998-
if (RelationGetReduceFPI(reln))
8999-
oldbufflags |= REGBUF_REDUCE_FPI;
9000-
XLogRegisterBuffer(1, oldbuf, oldbufflags);
8968+
XLogRegisterBufferForRelation(1, oldbuf, REGBUF_STANDARD, reln);
90018969
}
90028970

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

‎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
@@ -867,9 +867,9 @@ XLogInsertRecord(XLogRecData *rdata,
867867
* just turned off, we could recompute the record without full pages,
868868
* but we choose not to bother.)
869869
*
870-
* However, if force_disable_full_page_write is true, we skip the
871-
* recomputation check since we're deliberately disabling full page
872-
* writes for this record via the FPI control hook.
870+
* However, if suppress_fpi is true, we skip the recomputation check
871+
* since we're deliberately suppressing full page images for this
872+
* record via the FPI control hook.
873873
*/
874874
if (RedoRecPtr != Insert->RedoRecPtr)
875875
{
@@ -880,7 +880,7 @@ XLogInsertRecord(XLogRecData *rdata,
880880

881881
if (doPageWrites &&
882882
(!prevDoPageWrites ||
883-
(!force_disable_full_page_write &&
883+
(!suppress_fpi &&
884884
fpw_lsn != InvalidXLogRecPtr && fpw_lsn <= RedoRecPtr)))
885885
{
886886
/*

0 commit comments

Comments
 (0)