mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MUST update (in-memory) data page BEFORE XLogInsert to log

Browse Source 
NEW page content if WAL will decide to backup page.
This commit is contained in:
Vadim B. Mikheev 2000-12-29 20:47:17 +00:00
parent b05b981924
commit 7d363c4c33
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.71 2000/12/28 13:00:07 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.72 2000/12/29 20:47:16 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -518,12 +518,17 @@ _bt_insertonpg(Relation rel,
} }
else else
{ {
START_CRIT_CODE;
_bt_pgaddtup(rel, page, itemsz, btitem, newitemoff, "page");
itup_off = newitemoff;
itup_blkno = BufferGetBlockNumber(buf);
/* XLOG stuff */ /* XLOG stuff */
{ {
xl_btree_insert xlrec; xl_btree_insert xlrec;
uint8 flag = XLOG_BTREE_INSERT; uint8 flag = XLOG_BTREE_INSERT;
XLogRecPtr recptr; XLogRecPtr recptr;
XLogRecData rdata[2]; XLogRecData rdata[2];
BTItemData truncitem;
xlrec.target.node = rel->rd_node; xlrec.target.node = rel->rd_node;
ItemPointerSet(&(xlrec.target.tid), BufferGetBlockNumber(buf), newitemoff); ItemPointerSet(&(xlrec.target.tid), BufferGetBlockNumber(buf), newitemoff);
@ -535,8 +540,7 @@ _bt_insertonpg(Relation rel,
/* Read comments in _bt_pgaddtup */ /* Read comments in _bt_pgaddtup */
if (!(P_ISLEAF(lpageop)) && newitemoff == P_FIRSTDATAKEY(lpageop)) if (!(P_ISLEAF(lpageop)) && newitemoff == P_FIRSTDATAKEY(lpageop))
{ {
BTItemData truncitem = *btitem; truncitem = *btitem;
truncitem.bti_itup.t_info = sizeof(BTItemData); truncitem.bti_itup.t_info = sizeof(BTItemData);
rdata[1].data = (char*)&truncitem; rdata[1].data = (char*)&truncitem;
rdata[1].len = sizeof(BTItemData); rdata[1].len = sizeof(BTItemData);
@ -559,9 +563,7 @@ _bt_insertonpg(Relation rel,
PageSetSUI(page, ThisStartUpID); PageSetSUI(page, ThisStartUpID);
} }
_bt_pgaddtup(rel, page, itemsz, btitem, newitemoff, "page"); END_CRIT_CODE;
itup_off = newitemoff;
itup_blkno = BufferGetBlockNumber(buf);
/* Write out the updated page and release pin/lock */ /* Write out the updated page and release pin/lock */
_bt_wrtbuf(rel, buf); _bt_wrtbuf(rel, buf);
} }
@ -600,7 +602,6 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
oopaque; oopaque;
Buffer sbuf = 0; Buffer sbuf = 0;
Page spage = 0; Page spage = 0;
BTPageOpaque sopaque;
Size itemsz; Size itemsz;
ItemId itemid; ItemId itemid;
BTItem item; BTItem item;
@ -821,6 +822,9 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
if (!P_RIGHTMOST(ropaque)) if (!P_RIGHTMOST(ropaque))
{ {
BTPageOpaque sopaque = (BTPageOpaque) PageGetSpecialPointer(spage);
sopaque->btpo_prev = BufferGetBlockNumber(rbuf);
rdata[2].next = &(rdata[3]); rdata[2].next = &(rdata[3]);
rdata[3].buffer = sbuf; rdata[3].buffer = sbuf;
rdata[3].data = NULL; rdata[3].data = NULL;
@ -856,14 +860,9 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright,
PageRestoreTempPage(leftpage, origpage); PageRestoreTempPage(leftpage, origpage);
/* write and release the old right sibling */
if (!P_RIGHTMOST(ropaque)) if (!P_RIGHTMOST(ropaque))
{
sopaque = (BTPageOpaque) PageGetSpecialPointer(spage);
sopaque->btpo_prev = BufferGetBlockNumber(rbuf);
/* write and release the old right sibling */
_bt_wrtbuf(rel, sbuf); _bt_wrtbuf(rel, sbuf);
}
END_CRIT_CODE; END_CRIT_CODE;
/* split's done */ /* split's done */

7
src/backend/access/nbtree/nbtpage.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.44 2000/12/28 13:00:07 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.45 2000/12/29 20:47:17 vadim Exp $
* *
* NOTES * NOTES
* Postgres btree pages look like ordinary relation pages. The opaque * Postgres btree pages look like ordinary relation pages. The opaque
@ -410,8 +410,9 @@ _bt_pagedel(Relation rel, ItemPointer tid)
buf = _bt_getbuf(rel, blkno, BT_WRITE); buf = _bt_getbuf(rel, blkno, BT_WRITE);
page = BufferGetPage(buf); page = BufferGetPage(buf);
/* XLOG stuff */
START_CRIT_CODE; START_CRIT_CODE;
PageIndexTupleDelete(page, offno);
/* XLOG stuff */
{ {
xl_btree_delete xlrec; xl_btree_delete xlrec;
XLogRecPtr recptr; XLogRecPtr recptr;
@ -434,8 +435,6 @@ _bt_pagedel(Relation rel, ItemPointer tid)
PageSetLSN(page, recptr); PageSetLSN(page, recptr);
PageSetSUI(page, ThisStartUpID); PageSetSUI(page, ThisStartUpID);
} }
PageIndexTupleDelete(page, offno);
END_CRIT_CODE; END_CRIT_CODE;
/* write the buffer and release the lock */ /* write the buffer and release the lock */