database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-29 16:21:20 +03:00
Code

Fix nbtree page split rmgr desc routine.

Browse Source 
Include newitemoff in rmgr desc output for nbtree page split records.
In passing, correct an obsolete comment that claimed that newitemoff is
only logged for _L variant nbtree page split WAL records.

Both issues were oversights in commit 2c03216d831, which revamped the
WAL format.

Author: Peter Geoghegan
Backpatch: 9.5-, where the WAL format was revamped.
This commit is contained in:
Peter Geoghegan 2019-09-12 15:45:03 -07:00
parent b54cff2bf3
commit 09b236af90
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/access/rmgrdesc/nbtdesc.c
View File

@ -40,8 +40,8 @@ btree_desc(StringInfo buf, XLogReaderState *record)
{ {
xl_btree_split *xlrec = (xl_btree_split *) rec; xl_btree_split *xlrec = (xl_btree_split *) rec;
appendStringInfo(buf, "level %u, firstright %d", appendStringInfo(buf, "level %u, firstright %d, newitemoff %d",
xlrec->level, xlrec->firstright); xlrec->level, xlrec->firstright, xlrec->newitemoff);
break; break;
} }
case XLOG_BTREE_VACUUM: case XLOG_BTREE_VACUUM:

12
src/include/access/nbtxlog.h
View File

@ -78,11 +78,11 @@ typedef struct xl_btree_insert
* *
* Note: the four XLOG_BTREE_SPLIT xl_info codes all use this data record. * Note: the four XLOG_BTREE_SPLIT xl_info codes all use this data record.
* The _L and _R variants indicate whether the inserted tuple went into the * The _L and _R variants indicate whether the inserted tuple went into the
* left or right split page (and thus, whether newitemoff and the new item * left or right split page (and thus, whether the new item is stored or not).
* are stored or not). The _ROOT variants indicate that we are splitting * The _ROOT variants indicate that we are splitting the root page, and thus
* the root page, and thus that a newroot record rather than an insert or * that a newroot record rather than an insert or split record should follow.
* split record should follow. Note that a split record never carries a * Note that a split record never carries a metapage update --- we'll do that
* metapage update --- we'll do that in the parent-level update. * in the parent-level update.
* *
* Backup Blk 0: original page / new left page * Backup Blk 0: original page / new left page
* *
@ -104,7 +104,7 @@ typedef struct xl_btree_split
{ {
uint32 level; /* tree level of page being split */ uint32 level; /* tree level of page being split */
OffsetNumber firstright; /* first item moved to right page */ OffsetNumber firstright; /* first item moved to right page */
OffsetNumber newitemoff; /* new item's offset (if placed on left page) */ OffsetNumber newitemoff; /* new item's offset (useful for _L variants) */
} xl_btree_split; } xl_btree_split;
#define SizeOfBtreeSplit (offsetof(xl_btree_split, newitemoff) + sizeof(OffsetNumber)) #define SizeOfBtreeSplit (offsetof(xl_btree_split, newitemoff) + sizeof(OffsetNumber))