NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit81b9b5c

committed

Make gistvacuumcleanup() count the actual number of index tuples.

Previously, it just returned the heap tuple count, which might be only anestimate, and would be completely the wrong thing if the index is partial.Since this function scans every index page anyway to find free pages,it's practically free to count the surviving index tuples. Let's do thatand return an accurate count.This is easily visible as a wrong reltuples value for a partial GiSTindex following VACUUM, so back-patch to all supported branches.Andrey Borodin, reviewed by Michail NikolaevDiscussion:https://postgr.es/m/151956654251.6915.675951950408204404.pgcf@coridan.postgresql.org

1 parent7240962 commit81b9b5cCopy full SHA for 81b9b5c

File tree

1 file changed

-10

lines changed

src/backend/access/gist
- gistvacuum.c

1 file changed

-10

lines changed

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

Lines changed: 9 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ gistvacuumcleanup(IndexVacuumInfo info, IndexBulkDeleteResult stats)`
`32`	`32`	`BlockNumbernpages,`
`33`	`33`	`blkno;`
`34`	`34`	`BlockNumbertotFreePages;`
	`35`	`+doubletuplesCount;`
`35`	`36`	`boolneedLock;`
`36`	`37`
`37`	`38`	`/* No-op in ANALYZE ONLY mode */`
`@@ -40,17 +41,7 @@ gistvacuumcleanup(IndexVacuumInfo info, IndexBulkDeleteResult stats)`
`40`	`41`
`41`	`42`	`/* Set up all-zero stats if gistbulkdelete wasn't called */`
`42`	`43`	`if (stats==NULL)`
`43`		`-{`
`44`	`44`	`stats= (IndexBulkDeleteResult*)palloc0(sizeof(IndexBulkDeleteResult));`
`45`		`-/* use heap's tuple count */`
`46`		`-stats->num_index_tuples=info->num_heap_tuples;`
`47`		`-stats->estimated_count=info->estimated_count;`
`48`		`-`
`49`		`-/*`
`50`		`- * XXX the above is wrong if index is partial. Would it be OK to just`
`51`		`- * return NULL, or is there work we must do below?`
`52`		`- */`
`53`		`-}`
`54`	`45`
`55`	`46`	`/*`
`56`	`47`	`* Need lock unless it's local to this backend.`
`@@ -65,6 +56,7 @@ gistvacuumcleanup(IndexVacuumInfo info, IndexBulkDeleteResult stats)`
`65`	`56`	`UnlockRelationForExtension(rel,ExclusiveLock);`
`66`	`57`
`67`	`58`	`totFreePages=0;`
	`59`	`+tuplesCount=0;`
`68`	`60`	`for (blkno=GIST_ROOT_BLKNO+1;blkno<npages;blkno++)`
`69`	`61`	`{`
`70`	`62`	`Bufferbuffer;`
`@@ -82,6 +74,11 @@ gistvacuumcleanup(IndexVacuumInfo info, IndexBulkDeleteResult stats)`
`82`	`74`	`totFreePages++;`
`83`	`75`	`RecordFreeIndexPage(rel,blkno);`
`84`	`76`	`}`
	`77`	`+elseif (GistPageIsLeaf(page))`
	`78`	`+{`
	`79`	`+/* count tuples in index (considering only leaf tuples) */`
	`80`	`+tuplesCount+=PageGetMaxOffsetNumber(page);`
	`81`	`+}`
`85`	`82`	`UnlockReleaseBuffer(buffer);`
`86`	`83`	`}`
`87`	`84`
`@@ -95,6 +92,8 @@ gistvacuumcleanup(IndexVacuumInfo info, IndexBulkDeleteResult stats)`
`95`	`92`	`stats->num_pages=RelationGetNumberOfBlocks(rel);`
`96`	`93`	`if (needLock)`
`97`	`94`	`UnlockRelationForExtension(rel,ExclusiveLock);`
	`95`	`+stats->num_index_tuples=tuplesCount;`
	`96`	`+stats->estimated_count= false;`
`98`	`97`
`99`	`98`	`returnstats;`
`100`	`99`	`}`

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!

Commit81b9b5c

File tree

1 file changed

1 file changed

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

0 commit comments