NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit12179c9

committed

Marginal hack to merge adjacent ReleaseBuffer/ReadBuffer calls into

ReleaseAndReadBuffer during GIST index searches. We already did thisin btree and rtree, might as well do it here too.

1 parent11635c3 commit12179c9Copy full SHA for 12179c9

File tree

1 file changed

+22

-16

lines changed

src/backend/access/gist
- gistget.c

1 file changed

+22

-16

lines changed

`‎src/backend/access/gist/gistget.c‎`

Lines changed: 22 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.43 2004/12/31 21:59:10 pgsql Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.44 2005/02/05 19:38:58 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -60,10 +60,11 @@ gistfirst(IndexScanDesc s, ScanDirection dir)`
`60`	`60`	`BlockNumberblk;`
`61`	`61`	`IndexTupleit;`
`62`	`62`
	`63`	`+so= (GISTScanOpaque)s->opaque;`
	`64`	`+`
`63`	`65`	`b=ReadBuffer(s->indexRelation,GISTP_ROOT);`
`64`	`66`	`p=BufferGetPage(b);`
`65`	`67`	`po= (GISTPageOpaque)PageGetSpecialPointer(p);`
`66`		`-so= (GISTScanOpaque)s->opaque;`
`67`	`68`
`68`	`69`	`for (;;)`
`69`	`70`	`{`
`@@ -75,12 +76,14 @@ gistfirst(IndexScanDesc s, ScanDirection dir)`
`75`	`76`
`76`	`77`	`while (n<FirstOffsetNumber\|\|n>maxoff)`
`77`	`78`	`{`
`78`		`-ReleaseBuffer(b);`
`79`		`-if (so->s_stack==NULL)`
	`79`	`+stk=so->s_stack;`
	`80`	`+if (stk==NULL)`
	`81`	`+{`
	`82`	`+ReleaseBuffer(b);`
`80`	`83`	`return false;`
	`84`	`+}`
`81`	`85`
`82`		`-stk=so->s_stack;`
`83`		`-b=ReadBuffer(s->indexRelation,stk->gs_blk);`
	`86`	`+b=ReleaseAndReadBuffer(b,s->indexRelation,stk->gs_blk);`
`84`	`87`	`p=BufferGetPage(b);`
`85`	`88`	`po= (GISTPageOpaque)PageGetSpecialPointer(p);`
`86`	`89`	`maxoff=PageGetMaxOffsetNumber(p);`
`@@ -89,6 +92,7 @@ gistfirst(IndexScanDesc s, ScanDirection dir)`
`89`	`92`	`n=OffsetNumberPrev(stk->gs_child);`
`90`	`93`	`else`
`91`	`94`	`n=OffsetNumberNext(stk->gs_child);`
	`95`	`+`
`92`	`96`	`so->s_stack=stk->gs_parent;`
`93`	`97`	`pfree(stk);`
`94`	`98`
`@@ -116,8 +120,7 @@ gistfirst(IndexScanDesc s, ScanDirection dir)`
`116`	`120`	`it= (IndexTuple)PageGetItem(p,PageGetItemId(p,n));`
`117`	`121`	`blk=ItemPointerGetBlockNumber(&(it->t_tid));`
`118`	`122`
`119`		`-ReleaseBuffer(b);`
`120`		`-b=ReadBuffer(s->indexRelation,blk);`
	`123`	`+b=ReleaseAndReadBuffer(b,s->indexRelation,blk);`
`121`	`124`	`p=BufferGetPage(b);`
`122`	`125`	`po= (GISTPageOpaque)PageGetSpecialPointer(p);`
`123`	`126`	`}`
`@@ -137,6 +140,8 @@ gistnext(IndexScanDesc s, ScanDirection dir)`
`137`	`140`	`BlockNumberblk;`
`138`	`141`	`IndexTupleit;`
`139`	`142`
	`143`	`+so= (GISTScanOpaque)s->opaque;`
	`144`	`+`
`140`	`145`	`blk=ItemPointerGetBlockNumber(&(s->currentItemData));`
`141`	`146`	`n=ItemPointerGetOffsetNumber(&(s->currentItemData));`
`142`	`147`
`@@ -148,7 +153,6 @@ gistnext(IndexScanDesc s, ScanDirection dir)`
`148`	`153`	`b=ReadBuffer(s->indexRelation,blk);`
`149`	`154`	`p=BufferGetPage(b);`
`150`	`155`	`po= (GISTPageOpaque)PageGetSpecialPointer(p);`
`151`		`-so= (GISTScanOpaque)s->opaque;`
`152`	`156`
`153`	`157`	`for (;;)`
`154`	`158`	`{`
`@@ -157,20 +161,23 @@ gistnext(IndexScanDesc s, ScanDirection dir)`
`157`	`161`
`158`	`162`	`while (n<FirstOffsetNumber\|\|n>maxoff)`
`159`	`163`	`{`
`160`		`-ReleaseBuffer(b);`
`161`		`-if (so->s_stack==NULL)`
	`164`	`+stk=so->s_stack;`
	`165`	`+if (stk==NULL)`
	`166`	`+{`
	`167`	`+ReleaseBuffer(b);`
`162`	`168`	`return false;`
	`169`	`+}`
`163`	`170`
`164`		`-stk=so->s_stack;`
`165`		`-b=ReadBuffer(s->indexRelation,stk->gs_blk);`
	`171`	`+b=ReleaseAndReadBuffer(b,s->indexRelation,stk->gs_blk);`
`166`	`172`	`p=BufferGetPage(b);`
`167`		`-maxoff=PageGetMaxOffsetNumber(p);`
`168`	`173`	`po= (GISTPageOpaque)PageGetSpecialPointer(p);`
	`174`	`+maxoff=PageGetMaxOffsetNumber(p);`
`169`	`175`
`170`	`176`	`if (ScanDirectionIsBackward(dir))`
`171`	`177`	`n=OffsetNumberPrev(stk->gs_child);`
`172`	`178`	`else`
`173`	`179`	`n=OffsetNumberNext(stk->gs_child);`
	`180`	`+`
`174`	`181`	`so->s_stack=stk->gs_parent;`
`175`	`182`	`pfree(stk);`
`176`	`183`
`@@ -198,8 +205,7 @@ gistnext(IndexScanDesc s, ScanDirection dir)`
`198`	`205`	`it= (IndexTuple)PageGetItem(p,PageGetItemId(p,n));`
`199`	`206`	`blk=ItemPointerGetBlockNumber(&(it->t_tid));`
`200`	`207`
`201`		`-ReleaseBuffer(b);`
`202`		`-b=ReadBuffer(s->indexRelation,blk);`
	`208`	`+b=ReleaseAndReadBuffer(b,s->indexRelation,blk);`
`203`	`209`	`p=BufferGetPage(b);`
`204`	`210`	`po= (GISTPageOpaque)PageGetSpecialPointer(p);`
`205`	`211`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit12179c9

File tree

1 file changed

1 file changed

`‎src/backend/access/gist/gistget.c‎`

0 commit comments