@@ -475,11 +475,11 @@ _bt_getroot(Relation rel, Relation heaprel, int access)
475475 XLogRecPtr recptr ;
476476 xl_btree_metadata md ;
477477
478- XLogBeginInsert ();
479- XLogRegisterBufferForRelation (0 , rootbuf , REGBUF_WILL_INIT , rel );
480- XLogRegisterBufferForRelation (2 , metabuf , REGBUF_WILL_INIT | REGBUF_STANDARD , rel );
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- XLogRegisterBufferForRelation (0 , buf , REGBUF_STANDARD , rel );
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- XLogRegisterBufferForRelation (0 , buf , REGBUF_STANDARD , rel );
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- XLogRegisterBufferForRelation (0 , leafbuf , REGBUF_WILL_INIT , rel );
2265- XLogRegisterBufferForRelation (1 , subtreeparent , REGBUF_STANDARD , rel );
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- 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 );
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- XLogRegisterBufferForRelation (4 , metabuf , REGBUF_WILL_INIT | REGBUF_STANDARD , rel );
2699+ if (BufferIsValid (metabuf ))
2700+ {
2701+ XLogRegisterBuffer (4 , metabuf , REGBUF_WILL_INIT | REGBUF_STANDARD );
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 ;
0 commit comments