NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd30b499

committed

Make lazy_vacuum_heap_rel match lazy_scan_heap.

Make lazy_vacuum_heap_rel variable names match those from lazy_scan_heapwhere that makes sense.Extracted from a larger patch to deal with issues with how vacuumlazy.csets pages all-frozen.Author: Peter Geoghegan <pg@bowt.ie>Discussion:https://postgr.es/m/CAH2-WznuNGSzF8v6OsgjaC5aYsb3cZ6HW6MLm30X0d65cmSH6A@mail.gmail.com

1 parent8c233cf commitd30b499Copy full SHA for d30b499

File tree

1 file changed

-16

lines changed

src/backend/access/heap
- vacuumlazy.c

1 file changed

-16

lines changed

`‎src/backend/access/heap/vacuumlazy.c`

Lines changed: 8 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -2388,8 +2388,8 @@ lazy_vacuum_all_indexes(LVRelState *vacrel)`
`2388`	`2388`	`staticvoid`
`2389`	`2389`	`lazy_vacuum_heap_rel(LVRelState*vacrel)`
`2390`	`2390`	`{`
`2391`		`-intindex;`
`2392`		`-BlockNumbervacuumed_pages;`
	`2391`	`+intindex=0;`
	`2392`	`+BlockNumbervacuumed_pages=0;`
`2393`	`2393`	`Buffervmbuffer=InvalidBuffer;`
`2394`	`2394`	`LVSavedErrInfosaved_err_info;`
`2395`	`2395`
`@@ -2406,42 +2406,34 @@ lazy_vacuum_heap_rel(LVRelState *vacrel)`
`2406`	`2406`	`VACUUM_ERRCB_PHASE_VACUUM_HEAP,`
`2407`	`2407`	`InvalidBlockNumber,InvalidOffsetNumber);`
`2408`	`2408`
`2409`		`-vacuumed_pages=0;`
`2410`		`-`
`2411`		`-index=0;`
`2412`	`2409`	`while (index<vacrel->dead_items->num_items)`
`2413`	`2410`	`{`
`2414`		`-BlockNumbertblk;`
	`2411`	`+BlockNumberblkno;`
`2415`	`2412`	`Bufferbuf;`
`2416`	`2413`	`Pagepage;`
`2417`	`2414`	`Sizefreespace;`
`2418`	`2415`
`2419`	`2416`	`vacuum_delay_point();`
`2420`	`2417`
`2421`		`-tblk=ItemPointerGetBlockNumber(&vacrel->dead_items->items[index]);`
`2422`		`-vacrel->blkno=tblk;`
`2423`		`-buf=ReadBufferExtended(vacrel->rel,MAIN_FORKNUM,tblk,RBM_NORMAL,`
	`2418`	`+blkno=ItemPointerGetBlockNumber(&vacrel->dead_items->items[index]);`
	`2419`	`+vacrel->blkno=blkno;`
	`2420`	`+buf=ReadBufferExtended(vacrel->rel,MAIN_FORKNUM,blkno,RBM_NORMAL,`
`2424`	`2421`	`vacrel->bstrategy);`
`2425`	`2422`	`LockBuffer(buf,BUFFER_LOCK_EXCLUSIVE);`
`2426`		`-index=lazy_vacuum_heap_page(vacrel,tblk,buf,index,&vmbuffer);`
	`2423`	`+index=lazy_vacuum_heap_page(vacrel,blkno,buf,index,&vmbuffer);`
`2427`	`2424`
`2428`	`2425`	`/* Now that we've vacuumed the page, record its available space */`
`2429`	`2426`	`page=BufferGetPage(buf);`
`2430`	`2427`	`freespace=PageGetHeapFreeSpace(page);`
`2431`	`2428`
`2432`	`2429`	`UnlockReleaseBuffer(buf);`
`2433`		`-RecordPageWithFreeSpace(vacrel->rel,tblk,freespace);`
	`2430`	`+RecordPageWithFreeSpace(vacrel->rel,blkno,freespace);`
`2434`	`2431`	`vacuumed_pages++;`
`2435`	`2432`	`}`
`2436`	`2433`
`2437`		`-/* Clear the block number information */`
`2438`	`2434`	`vacrel->blkno=InvalidBlockNumber;`
`2439`		`-`
`2440`	`2435`	`if (BufferIsValid(vmbuffer))`
`2441`		`-{`
`2442`	`2436`	`ReleaseBuffer(vmbuffer);`
`2443`		`-vmbuffer=InvalidBuffer;`
`2444`		`-}`
`2445`	`2437`
`2446`	`2438`	`/*`
`2447`	`2439`	`* We set all LP_DEAD items from the first heap pass to LP_UNUSED during`

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!

Commitd30b499

File tree

1 file changed

1 file changed

`‎src/backend/access/heap/vacuumlazy.c`

0 commit comments