database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-05 07:41:25 +03:00
Code Activity

Rearrange _bt_insertonpg() "update metapage" code.

Browse Source 
Nest the "update metapage as part of insert into root-like page" branch
inside the broader "insert into internal page" branch.  This improves
readability.
This commit is contained in:
Peter Geoghegan
2020-04-14 09:33:18 -07:00
parent 8128b0c152
commit 80634e3b18
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/access/nbtree/nbtinsert.c
View File

@@ -1306,6 +1306,7 @@ _bt_insertonpg(Relation rel,
* Leaf insert with posting list split. Must include * Leaf insert with posting list split. Must include
* postingoff field before newitem/orignewitem. * postingoff field before newitem/orignewitem.
*/ */
Assert(isleaf);
xlinfo = XLOG_BTREE_INSERT_POST; xlinfo = XLOG_BTREE_INSERT_POST;
} }
else else
@@ -1313,10 +1314,12 @@ _bt_insertonpg(Relation rel,
/* Internal page insert, which finishes a split on cbuf */ /* Internal page insert, which finishes a split on cbuf */
xlinfo = XLOG_BTREE_INSERT_UPPER; xlinfo = XLOG_BTREE_INSERT_UPPER;
XLogRegisterBuffer(1, cbuf, REGBUF_STANDARD); XLogRegisterBuffer(1, cbuf, REGBUF_STANDARD);
}
if (BufferIsValid(metabuf)) if (BufferIsValid(metabuf))
{ {
/* Actually, it's an internal page insert + meta update */
xlinfo = XLOG_BTREE_INSERT_META;
Assert(metad->btm_version >= BTREE_NOVAC_VERSION); Assert(metad->btm_version >= BTREE_NOVAC_VERSION);
xlmeta.version = metad->btm_version; xlmeta.version = metad->btm_version;
xlmeta.root = metad->btm_root; xlmeta.root = metad->btm_root;
@@ -1328,16 +1331,17 @@ _bt_insertonpg(Relation rel,
metad->btm_last_cleanup_num_heap_tuples; metad->btm_last_cleanup_num_heap_tuples;
xlmeta.allequalimage = metad->btm_allequalimage; xlmeta.allequalimage = metad->btm_allequalimage;
XLogRegisterBuffer(2, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD); XLogRegisterBuffer(2, metabuf,
XLogRegisterBufData(2, (char *) &xlmeta, sizeof(xl_btree_metadata)); REGBUF_WILL_INIT | REGBUF_STANDARD);
XLogRegisterBufData(2, (char *) &xlmeta,
xlinfo = XLOG_BTREE_INSERT_META; sizeof(xl_btree_metadata));
}
} }
XLogRegisterBuffer(0, buf, REGBUF_STANDARD); XLogRegisterBuffer(0, buf, REGBUF_STANDARD);
if (postingoff == 0) if (postingoff == 0)
{ {
/* Simple, common case -- log itup from caller */ /* Just log itup from caller */
XLogRegisterBufData(0, (char *) itup, IndexTupleSize(itup)); XLogRegisterBufData(0, (char *) itup, IndexTupleSize(itup));
} }
else else