database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-16 06:01:02 +03:00
Code Activity

Avoid misinterpreting GiST pages in pageinspect.

Browse Source 
GistPageSetDeleted() sets pd_lower when deleting a page, and sets the
page contents to a GISTDeletedPageContents.  Avoid treating deleted GiST
pages as regular slotted pages within pageinspect.

Oversight in commit 756ab291.

Author: Andrey Borodin <x4mmm@yandex-team.ru>
This commit is contained in:
Peter Geoghegan
2021-02-14 19:43:25 -08:00
parent 7cde6b13a9
commit fa41cf8f18
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/pageinspect/gistfuncs.c
View File

@ -103,6 +103,7 @@ gist_page_items_bytea(PG_FUNCTION_ARGS)
MemoryContext oldcontext; MemoryContext oldcontext;
Page page; Page page;
OffsetNumber offset; OffsetNumber offset;
OffsetNumber maxoff = InvalidOffsetNumber;
if (!superuser()) if (!superuser())
ereport(ERROR, ereport(ERROR,
@ -135,11 +136,14 @@ gist_page_items_bytea(PG_FUNCTION_ARGS)
page = get_page_from_raw(raw_page); page = get_page_from_raw(raw_page);
/* Avoid bogus PageGetMaxOffsetNumber() call with deleted pages */
if (GistPageIsDeleted(page)) if (GistPageIsDeleted(page))
elog(NOTICE, "page is deleted"); elog(NOTICE, "page is deleted");
else
maxoff = PageGetMaxOffsetNumber(page);
for (offset = FirstOffsetNumber; for (offset = FirstOffsetNumber;
offset <= PageGetMaxOffsetNumber(page); offset <= maxoff;
offset++) offset++)
{ {
Datum values[4]; Datum values[4];
@ -187,6 +191,7 @@ gist_page_items(PG_FUNCTION_ARGS)
MemoryContext oldcontext; MemoryContext oldcontext;
Page page; Page page;
OffsetNumber offset; OffsetNumber offset;
OffsetNumber maxoff = InvalidOffsetNumber;
if (!superuser()) if (!superuser())
ereport(ERROR, ereport(ERROR,
@ -222,11 +227,14 @@ gist_page_items(PG_FUNCTION_ARGS)
page = get_page_from_raw(raw_page); page = get_page_from_raw(raw_page);
/* Avoid bogus PageGetMaxOffsetNumber() call with deleted pages */
if (GistPageIsDeleted(page)) if (GistPageIsDeleted(page))
elog(NOTICE, "page is deleted"); elog(NOTICE, "page is deleted");
else
maxoff = PageGetMaxOffsetNumber(page);
for (offset = FirstOffsetNumber; for (offset = FirstOffsetNumber;
offset <= PageGetMaxOffsetNumber(page); offset <= maxoff;
offset++) offset++)
{ {
Datum values[4]; Datum values[4];