Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfdf6be8

Browse files
committed
1. Vacuum is updated for MVCC.
2. Much faster btree tuples deletion in the case when first on page index tuple is deleted (no movement to the left page(s)).3. Remember blkno of new root page in BTPageOpaque of left/right siblings when root page is splitted.
1 parentd4ed178 commitfdf6be8

File tree

16 files changed

+804
-354
lines changed

16 files changed

+804
-354
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.41 1999/02/13 23:14:22 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.42 1999/03/28 20:31:56 vadim Exp $
1111
*
1212
*
1313
* INTERFACE ROUTINES
@@ -1270,7 +1270,7 @@ heap_replace(Relation relation, ItemPointer otid, HeapTuple newtup,
12701270
newtup->t_data->t_cmin=GetCurrentCommandId();
12711271
StoreInvalidTransactionId(&(newtup->t_data->t_xmax));
12721272
newtup->t_data->t_infomask &= ~(HEAP_XACT_MASK);
1273-
newtup->t_data->t_infomask |=HEAP_XMAX_INVALID;
1273+
newtup->t_data->t_infomask |=(HEAP_XMAX_INVALID |HEAP_UPDATED);
12741274

12751275
/* logically delete old item */
12761276
TransactionIdStore(GetCurrentTransactionId(),&(oldtup.t_data->t_xmax));

‎src/backend/access/nbtree/nbtinsert.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.35 1999/02/13 23:14:34 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.36 1999/03/28 20:31:56 vadim Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -853,6 +853,8 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright)
853853
lopaque->btpo_next=BufferGetBlockNumber(rbuf);
854854
ropaque->btpo_next=oopaque->btpo_next;
855855

856+
lopaque->btpo_parent=ropaque->btpo_parent=oopaque->btpo_parent;
857+
856858
/*
857859
* If the page we're splitting is not the rightmost page at its level
858860
* in the tree, then the first (0) entry on the page is the high key
@@ -1103,6 +1105,7 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)
11031105
/* get a new root page */
11041106
rootbuf=_bt_getbuf(rel,P_NEW,BT_WRITE);
11051107
rootpage=BufferGetPage(rootbuf);
1108+
rootbknum=BufferGetBlockNumber(rootbuf);
11061109
_bt_pageinit(rootpage,BufferGetPageSize(rootbuf));
11071110

11081111
/* set btree special data */
@@ -1119,6 +1122,10 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)
11191122
lpage=BufferGetPage(lbuf);
11201123
rpage=BufferGetPage(rbuf);
11211124

1125+
((BTPageOpaque)PageGetSpecialPointer(lpage))->btpo_parent=
1126+
((BTPageOpaque)PageGetSpecialPointer(rpage))->btpo_parent=
1127+
rootbknum;
1128+
11221129
/*
11231130
* step over the high key on the left page while building the left
11241131
* page pointer.
@@ -1156,11 +1163,13 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)
11561163
pfree(new_item);
11571164

11581165
/* write and let go of the root buffer */
1159-
rootbknum=BufferGetBlockNumber(rootbuf);
11601166
_bt_wrtbuf(rel,rootbuf);
11611167

11621168
/* update metadata page with new root block number */
11631169
_bt_metaproot(rel,rootbknum,0);
1170+
1171+
WriteNoReleaseBuffer(lbuf);
1172+
WriteNoReleaseBuffer(rbuf);
11641173
}
11651174

11661175
/*
@@ -1559,6 +1568,7 @@ _bt_shift(Relation rel, Buffer buf, BTStack stack, int keysz,
15591568
pageop->btpo_flags |=BTP_CHAIN;
15601569
pageop->btpo_prev=npageop->btpo_prev;/* restore prev */
15611570
pageop->btpo_next=nbknum;/* next points to the new page */
1571+
pageop->btpo_parent=npageop->btpo_parent;
15621572

15631573
/* init shifted page opaque */
15641574
npageop->btpo_prev=bknum=BufferGetBlockNumber(buf);

‎src/backend/access/nbtree/nbtpage.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.18 1999/02/13 23:14:35 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.19 1999/03/28 20:31:57 vadim Exp $
1212
*
1313
*NOTES
1414
* Postgres btree pages look like ordinary relation pages.The opaque
@@ -421,6 +421,8 @@ _bt_pageinit(Page page, Size size)
421421
MemSet(page,0,size);
422422

423423
PageInit(page,size,sizeof(BTPageOpaqueData));
424+
((BTPageOpaque)PageGetSpecialPointer(page))->btpo_parent=
425+
InvalidBlockNumber;
424426
}
425427

426428
/*

‎src/backend/access/nbtree/nbtree.c

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.36 1999/02/21 03:48:27 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.37 1999/03/28 20:31:58 vadim Exp $
1212
*
1313
* NOTES
1414
* This file contains only the public interface routines.
@@ -372,11 +372,6 @@ btinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation
372372
pfree(btitem);
373373
pfree(itup);
374374

375-
#ifdefNOT_USED
376-
/* adjust any active scans that will be affected by this insertion */
377-
_bt_adjscans(rel,&(res->pointerData),BT_INSERT);
378-
#endif
379-
380375
returnres;
381376
}
382377

@@ -396,15 +391,9 @@ btgettuple(IndexScanDesc scan, ScanDirection dir)
396391

397392
if (ItemPointerIsValid(&(scan->currentItemData)))
398393
{
399-
400394
/*
401-
* Now we don't adjust scans on insertion (comments in
402-
* nbtscan.c:_bt_scandel()) and I hope that we will unlock current
403-
* index page before leaving index in LLL: this means that current
404-
* index tuple could be moved right before we get here and we have
405-
* to restore our scan position. We save heap TID pointed by
406-
* current index tuple and use it. This will work untill we start
407-
* to re-use (move heap tuples) without vacuum... - vadim 07/29/98
395+
* Restore scan position using heap TID returned
396+
* by previous call to btgettuple().
408397
*/
409398
_bt_restscan(scan);
410399
res=_bt_next(scan,dir);
@@ -612,16 +601,12 @@ void
612601
btdelete(Relationrel,ItemPointertid)
613602
{
614603
/* adjust any active scans that will be affected by this deletion */
615-
_bt_adjscans(rel,tid,BT_DELETE);
604+
_bt_adjscans(rel,tid);
616605

617606
/* delete the data from the page */
618607
_bt_pagedel(rel,tid);
619608
}
620609

621-
/*
622-
* Reasons are in btgettuple... We have to find index item that
623-
* points to heap tuple returned by previous call to btgettuple().
624-
*/
625610
staticvoid
626611
_bt_restscan(IndexScanDescscan)
627612
{
@@ -637,6 +622,20 @@ _bt_restscan(IndexScanDesc scan)
637622
BTItemitem;
638623
BlockNumberblkno;
639624

625+
/*
626+
* We use this as flag when first index tuple on page
627+
* is deleted but we do not move left (this would
628+
* slowdown vacuum) - so we set current->ip_posid
629+
* before first index tuple on the current page
630+
* (_bt_step will move it right)...
631+
*/
632+
if (!ItemPointerIsValid(&target))
633+
{
634+
ItemPointerSetOffsetNumber(&(scan->currentItemData),
635+
OffsetNumberPrev(P_RIGHTMOST(opaque) ?P_HIKEY :P_FIRSTKEY));
636+
return;
637+
}
638+
640639
if (maxoff >=offnum)
641640
{
642641

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp