mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix logic error in insert_fsm_page_entry: because compact_fsm_page_list 

removes any empty chunks, the chunk previously added won't be there
anymore, so it's possible there is zero free space in the rel's page list
afterwards.  Must loop back and rerun the part that adds a chunk to
the list.
This commit is contained in:
Tom Lane 2002-01-24 15:31:43 +00:00
parent cf77a2a034
commit 386f1809a7
1 changed files with 46 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/backend/storage/freespace/freespace.c
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/freespace/freespace.c,v 1.10 2001/11/05 17:46:27 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/freespace/freespace.c,v 1.11 2002/01/24 15:31:43 tgl Exp $
* *
* *
* NOTES: * NOTES:
@ -841,64 +841,59 @@ static bool
insert_fsm_page_entry(FSMRelation *fsmrel, BlockNumber page, Size spaceAvail, insert_fsm_page_entry(FSMRelation *fsmrel, BlockNumber page, Size spaceAvail,
FSMChunk *chunk, int chunkRelIndex) FSMChunk *chunk, int chunkRelIndex)
{ {
FSMChunk *newChunk; /* Outer loop handles retry after compacting rel's page list */
int newChunkRelIndex; for (;;)
if (fsmrel->numPages >= fsmrel->numChunks * CHUNKPAGES)
{ {
/* No free space within chunk list, so need another chunk */ if (fsmrel->numPages >= fsmrel->numChunks * CHUNKPAGES)
if ((newChunk = FreeSpaceMap->freeChunks) == NULL)
return false; /* can't do it */
FreeSpaceMap->freeChunks = newChunk->next;
FreeSpaceMap->numFreeChunks--;
newChunk->next = NULL;
newChunk->numPages = 0;
if (fsmrel->relChunks == NULL)
fsmrel->relChunks = newChunk;
else
{ {
FSMChunk *priorChunk = fsmrel->relChunks; /* No free space within chunk list, so need another chunk */
FSMChunk *newChunk;
while (priorChunk->next != NULL) if ((newChunk = FreeSpaceMap->freeChunks) == NULL)
priorChunk = priorChunk->next; return false; /* can't do it */
priorChunk->next = newChunk; FreeSpaceMap->freeChunks = newChunk->next;
FreeSpaceMap->numFreeChunks--;
newChunk->next = NULL;
newChunk->numPages = 0;
if (fsmrel->relChunks == NULL)
fsmrel->relChunks = newChunk;
else
{
FSMChunk *priorChunk = fsmrel->relChunks;
while (priorChunk->next != NULL)
priorChunk = priorChunk->next;
priorChunk->next = newChunk;
}
fsmrel->numChunks++;
if (chunk == NULL)
{
/* Original search found that new page belongs at end */
chunk = newChunk;
chunkRelIndex = 0;
}
} }
fsmrel->numChunks++;
if (chunk == NULL) /* Try to insert it the easy way, ie, just move down subsequent data */
if (chunk &&
push_fsm_page_entry(page, spaceAvail, chunk, chunkRelIndex))
{ {
/* Original search found that new page belongs at end */ fsmrel->numPages++;
chunk = newChunk; fsmrel->nextPage++; /* don't return same page twice running */
chunkRelIndex = 0; return true;
} }
}
/* Try to insert it the easy way, ie, just move down subsequent data */ /*
if (chunk && * There is space available, but evidently it's before the place where
push_fsm_page_entry(page, spaceAvail, chunk, chunkRelIndex)) * the page entry needs to go. Compact the list and try again. This
{ * will require us to redo the search for the appropriate place.
fsmrel->numPages++; * Furthermore, compact_fsm_page_list deletes empty end chunks, so
fsmrel->nextPage++; /* don't return same page twice running */ * we may need to repeat the action of grabbing a new end chunk.
return true; */
compact_fsm_page_list(fsmrel);
if (lookup_fsm_page_entry(fsmrel, page, &chunk, &chunkRelIndex))
elog(ERROR, "insert_fsm_page_entry: entry already exists!");
} }
/*
* There is space available, but evidently it's before the place where
* the page entry needs to go. Compact the list and try again. This
* will require us to redo the search for the appropriate place.
*/
compact_fsm_page_list(fsmrel);
if (lookup_fsm_page_entry(fsmrel, page, &newChunk, &newChunkRelIndex))
elog(ERROR, "insert_fsm_page_entry: entry already exists!");
if (newChunk &&
push_fsm_page_entry(page, spaceAvail, newChunk, newChunkRelIndex))
{
fsmrel->numPages++;
fsmrel->nextPage++; /* don't return same page twice running */
return true;
}
/* Shouldn't get here given the initial if-test for space available */
elog(ERROR, "insert_fsm_page_entry: failed to insert entry!");
return false; /* keep compiler quiet */
} }
/* /*