sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 00:01:26 -04:00
Code Issues Projects Releases Wiki Activity

Fix uninitialized value in pgstatindex leading to invalid values being

Browse Source 
reported in some cases.  Report and patch from Tatsuhito Kasahara.

Also fix a couple of other bugs I noticed in skimming the surrounding code.
This commit is contained in:
Alvaro Herrera 2007-03-16 15:06:46 +00:00
parent aef05dbec0
commit 009dac8ed4
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/pgstattuple/pgstatindex.c
View File

@ -139,7 +139,7 @@ typedef struct BTIndexStat
* Collect statistics of single b-tree leaf page * Collect statistics of single b-tree leaf page
* ------------------------------------------------- * -------------------------------------------------
*/ */
static bool static void
GetBTPageStatistics(BlockNumber blkno, Buffer buffer, BTPageStat * stat) GetBTPageStatistics(BlockNumber blkno, Buffer buffer, BTPageStat * stat)
{ {
Page page = BufferGetPage(buffer); Page page = BufferGetPage(buffer);
@ -154,6 +154,7 @@ GetBTPageStatistics(BlockNumber blkno, Buffer buffer, BTPageStat * stat)
stat->max_avail = BLCKSZ - (BLCKSZ - phdr->pd_special + SizeOfPageHeaderData); stat->max_avail = BLCKSZ - (BLCKSZ - phdr->pd_special + SizeOfPageHeaderData);
stat->dead_items = stat->live_items = 0; stat->dead_items = stat->live_items = 0;
stat->fragments = 0;
stat->page_size = PageGetPageSize(page); stat->page_size = PageGetPageSize(page);
@ -161,7 +162,8 @@ GetBTPageStatistics(BlockNumber blkno, Buffer buffer, BTPageStat * stat)
if (P_ISDELETED(opaque)) if (P_ISDELETED(opaque))
{ {
stat->type = 'd'; stat->type = 'd';
return true; stat->btpo.xact = opaque->btpo.xact;
return;
} }
else if (P_IGNORE(opaque)) else if (P_IGNORE(opaque))
stat->type = 'e'; stat->type = 'e';
@ -175,10 +177,7 @@ GetBTPageStatistics(BlockNumber blkno, Buffer buffer, BTPageStat * stat)
/* btpage opaque data */ /* btpage opaque data */
stat->btpo_prev = opaque->btpo_prev; stat->btpo_prev = opaque->btpo_prev;
stat->btpo_next = opaque->btpo_next; stat->btpo_next = opaque->btpo_next;
if (P_ISDELETED(opaque)) stat->btpo.level = opaque->btpo.level;
stat->btpo.xact = opaque->btpo.xact;
else
stat->btpo.level = opaque->btpo.level;
stat->btpo_flags = opaque->btpo_flags; stat->btpo_flags = opaque->btpo_flags;
stat->btpo_cycleid = opaque->btpo_cycleid; stat->btpo_cycleid = opaque->btpo_cycleid;
@ -187,7 +186,6 @@ GetBTPageStatistics(BlockNumber blkno, Buffer buffer, BTPageStat * stat)
* it means a fragmentation. * it means a fragmentation.
*---------------------------------------------- *----------------------------------------------
*/ */
stat->fragments = 0;
if (stat->type == 'l') if (stat->type == 'l')
{ {
if (opaque->btpo_next != P_NONE && opaque->btpo_next < blkno) if (opaque->btpo_next != P_NONE && opaque->btpo_next < blkno)
@ -216,8 +214,6 @@ GetBTPageStatistics(BlockNumber blkno, Buffer buffer, BTPageStat * stat)
stat->avg_item_size = item_size / (stat->live_items + stat->dead_items); stat->avg_item_size = item_size / (stat->live_items + stat->dead_items);
else else
stat->avg_item_size = 0; stat->avg_item_size = 0;
return true;
} }
@ -338,8 +334,7 @@ pgstatindex(PG_FUNCTION_ARGS)
int j; int j;
char *values[PGSTATINDEX_NCOLUMNS]; char *values[PGSTATINDEX_NCOLUMNS];
HeapTupleData tupleData; HeapTuple tuple;
HeapTuple tuple = &tupleData;
tupleDesc = RelationNameGetTupleDesc(PGSTATINDEX_TYPE); tupleDesc = RelationNameGetTupleDesc(PGSTATINDEX_TYPE);