Skip to content

Pull to track GiST VACUUM development #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
x4m wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Pull to track GiST VACUUM development #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0e34f0
GiST VACUUM rebase
x4m Nov 9, 2017
75063c7
Fix for small tables and tests
x4m Dec 18, 2017
0519386
Local test
x4m Dec 18, 2017
47e0335
fix block endings
x4m Dec 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/backend/access/gist/gist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,13 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate)
GISTInsertStack *item;
OffsetNumber downlinkoffnum;

if(GistPageIsDeleted(stack->page))
{
UnlockReleaseBuffer(stack->buffer);
xlocked = false;
state.stack = stack = stack->parent;
continue;
}
downlinkoffnum = gistchoose(state.r, stack->page, itup, giststate);
iid = PageGetItemId(stack->page, downlinkoffnum);
idxtuple = (IndexTuple) PageGetItem(stack->page, iid);
Expand Down
5 changes: 0 additions & 5 deletions src/backend/access/gist/gistbuild.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,11 +1126,6 @@ gistGetMaxLevel(Relation index)
* but will be added there the first time we visit them.
*/

typedef struct
{
BlockNumber childblkno; /* hash key */
BlockNumber parentblkno;
} ParentMapEntry;

static void
gistInitParentMap(GISTBuildState *buildstate)
Expand Down
4 changes: 3 additions & 1 deletion src/backend/access/gist/gistutil.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/syscache.h"
#include "utils/snapmgr.h"


/*
Expand Down Expand Up @@ -801,13 +802,14 @@ gistNewBuffer(Relation r)
if (ConditionalLockBuffer(buffer))
{
Page page = BufferGetPage(buffer);
PageHeader p = (PageHeader) page;

if (PageIsNew(page))
return buffer; /* OK to use, if never initialized */

gistcheckpage(r, buffer);

if (GistPageIsDeleted(page))
if (GistPageIsDeleted(page) && TransactionIdPrecedes(p->pd_prune_xid, RecentGlobalDataXmin))
return buffer; /* OK to use */

LockBuffer(buffer, GIST_UNLOCK);
Expand Down
Loading