]> granicus.if.org Git - postgresql/blobdiff - src/include/access/gist_private.h
Allow index AMs to return either HeapTuple or IndexTuple format during IOS.
[postgresql] / src / include / access / gist_private.h
index 6cb2e5294e559e4c2d868d92fc040bfe03a74f3b..1ad4ed6da7518ff07ad6ee83e0636cf356a17e6f 100644 (file)
@@ -4,51 +4,84 @@
  *       private declarations for GiST -- declarations related to the
  *       internal implementation of GiST, not the public API
  *
- * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/gist_private.h,v 1.26 2007/01/20 18:43:35 neilc Exp $
+ * src/include/access/gist_private.h
  *
  *-------------------------------------------------------------------------
  */
 #ifndef GIST_PRIVATE_H
 #define GIST_PRIVATE_H
 
+#include "access/amapi.h"
 #include "access/gist.h"
 #include "access/itup.h"
-#include "access/xlog.h"
-#include "access/xlogdefs.h"
 #include "fmgr.h"
+#include "lib/pairingheap.h"
+#include "storage/bufmgr.h"
+#include "storage/buffile.h"
+#include "utils/hsearch.h"
+#include "access/genam.h"
 
-#define GIST_UNLOCK BUFFER_LOCK_UNLOCK
+/*
+ * Maximum number of "halves" a page can be split into in one operation.
+ * Typically a split produces 2 halves, but can be more if keys have very
+ * different lengths, or when inserting multiple keys in one operation (as
+ * when inserting downlinks to an internal node).  There is no theoretical
+ * limit on this, but in practice if you get more than a handful page halves
+ * in one split, there's something wrong with the opclass implementation.
+ * GIST_MAX_SPLIT_PAGES is an arbitrary limit on that, used to size some
+ * local arrays used during split.  Note that there is also a limit on the
+ * number of buffers that can be held locked at a time, MAX_SIMUL_LWLOCKS,
+ * so if you raise this higher than that limit, you'll just get a different
+ * error.
+ */
+#define GIST_MAX_SPLIT_PAGES           75
+
+/* Buffer lock modes */
 #define GIST_SHARE     BUFFER_LOCK_SHARE
 #define GIST_EXCLUSIVE BUFFER_LOCK_EXCLUSIVE
+#define GIST_UNLOCK BUFFER_LOCK_UNLOCK
 
+typedef struct
+{
+       BlockNumber prev;
+       uint32          freespace;
+       char            tupledata[FLEXIBLE_ARRAY_MEMBER];
+} GISTNodeBufferPage;
+
+#define BUFFER_PAGE_DATA_OFFSET MAXALIGN(offsetof(GISTNodeBufferPage, tupledata))
+/* Returns free space in node buffer page */
+#define PAGE_FREE_SPACE(nbp) (nbp->freespace)
+/* Checks if node buffer page is empty */
+#define PAGE_IS_EMPTY(nbp) (nbp->freespace == BLCKSZ - BUFFER_PAGE_DATA_OFFSET)
+/* Checks if node buffers page don't contain sufficient space for index tuple */
+#define PAGE_NO_SPACE(nbp, itup) (PAGE_FREE_SPACE(nbp) < \
+                                                                               MAXALIGN(IndexTupleSize(itup)))
 
 /*
- * XXX old comment!!!
- * When we descend a tree, we keep a stack of parent pointers. This
- * allows us to follow a chain of internal node points until we reach
- * a leaf node, and then back up the stack to re-examine the internal
- * nodes.
+ * GISTSTATE: information needed for any GiST index operation
  *
- * 'parent' is the previous stack entry -- i.e. the node we arrived
- * from. 'block' is the node's block number. 'offset' is the offset in
- * the node's page that we stopped at (i.e. we followed the child
- * pointer located at the specified offset).
+ * This struct retains call info for the index's opclass-specific support
+ * functions (per index column), plus the index's tuple descriptor.
+ *
+ * scanCxt holds the GISTSTATE itself as well as any data that lives for the
+ * lifetime of the index operation.  We pass this to the support functions
+ * via fn_mcxt, so that they can store scan-lifespan data in it.  The
+ * functions are invoked in tempCxt, which is typically short-lifespan
+ * (that is, it's reset after each tuple).  However, tempCxt can be the same
+ * as scanCxt if we're not bothering with per-tuple context resets.
  */
-typedef struct GISTSearchStack
-{
-       struct GISTSearchStack *next;
-       BlockNumber block;
-       /* to identify page changed */
-       GistNSN         lsn;
-       /* to recognize split occured */
-       GistNSN         parentlsn;
-} GISTSearchStack;
-
 typedef struct GISTSTATE
 {
+       MemoryContext scanCxt;          /* context for scan-lifespan data */
+       MemoryContext tempCxt;          /* short-term context for calling functions */
+
+       TupleDesc       tupdesc;                /* index's tuple descriptor */
+       TupleDesc       fetchTupdesc;   /* tuple descriptor for tuples returned in an
+                                                                * index-only scan */
+
        FmgrInfo        consistentFn[INDEX_MAX_KEYS];
        FmgrInfo        unionFn[INDEX_MAX_KEYS];
        FmgrInfo        compressFn[INDEX_MAX_KEYS];
@@ -56,90 +89,100 @@ typedef struct GISTSTATE
        FmgrInfo        penaltyFn[INDEX_MAX_KEYS];
        FmgrInfo        picksplitFn[INDEX_MAX_KEYS];
        FmgrInfo        equalFn[INDEX_MAX_KEYS];
+       FmgrInfo        distanceFn[INDEX_MAX_KEYS];
+       FmgrInfo        fetchFn[INDEX_MAX_KEYS];
 
-       TupleDesc       tupdesc;
+       /* Collations to pass to the support functions */
+       Oid                     supportCollation[INDEX_MAX_KEYS];
 } GISTSTATE;
 
+
 /*
- *     When we're doing a scan, we need to keep track of the parent stack
- *     for the marked and current items.
+ * During a GiST index search, we must maintain a queue of unvisited items,
+ * which can be either individual heap tuples or whole index pages.  If it
+ * is an ordered search, the unvisited items should be visited in distance
+ * order.  Unvisited items at the same distance should be visited in
+ * depth-first order, that is heap items first, then lower index pages, then
+ * upper index pages; this rule avoids doing extra work during a search that
+ * ends early due to LIMIT.
+ *
+ * To perform an ordered search, we use a pairing heap to manage the
+ * distance-order queue.  In a non-ordered search (no order-by operators),
+ * we use it to return heap tuples before unvisited index pages, to
+ * ensure depth-first order, but all entries are otherwise considered
+ * equal.
  */
-typedef struct GISTScanOpaqueData
-{
-       GISTSearchStack *stack;
-       GISTSearchStack *markstk;
-       uint16          flags;
-       GISTSTATE  *giststate;
-       MemoryContext tempCxt;
-       Buffer          curbuf;
-       ItemPointerData curpos;
-       Buffer          markbuf;
-       ItemPointerData markpos;
-} GISTScanOpaqueData;
-
-typedef GISTScanOpaqueData *GISTScanOpaque;
 
-/* XLog stuff */
-extern const XLogRecPtr XLogRecPtrForTemp;
-
-#define XLOG_GIST_PAGE_UPDATE          0x00
-#define XLOG_GIST_NEW_ROOT                     0x20
-#define XLOG_GIST_PAGE_SPLIT           0x30
-#define XLOG_GIST_INSERT_COMPLETE      0x40
-#define XLOG_GIST_CREATE_INDEX         0x50
-#define XLOG_GIST_PAGE_DELETE          0x60
-
-typedef struct gistxlogPageUpdate
+/* Individual heap tuple to be visited */
+typedef struct GISTSearchHeapItem
 {
-       RelFileNode node;
-       BlockNumber blkno;
-
-       /*
-        * It used to identify completeness of insert. Sets to leaf itup
-        */
-       ItemPointerData key;
-
-       /* number of deleted offsets */
-       uint16          ntodelete;
-
-       /*
-        * follow: 1. todelete OffsetNumbers 2. tuples to insert
-        */
-} gistxlogPageUpdate;
-
-typedef struct gistxlogPageSplit
+       ItemPointerData heapPtr;
+       bool            recheck;                /* T if quals must be rechecked */
+       bool            recheckDistances;               /* T if distances must be rechecked */
+       HeapTuple       recontup;               /* data reconstructed from the index, used in
+                                                                * index-only scans */
+       OffsetNumber offnum;            /* track offset in page to mark tuple as
+                                                                * LP_DEAD */
+} GISTSearchHeapItem;
+
+/* Unvisited item, either index page or heap tuple */
+typedef struct GISTSearchItem
 {
-       RelFileNode node;
-       BlockNumber origblkno;          /* splitted page */
-       bool            origleaf;               /* was splitted page a leaf page? */
-       uint16          npage;
+       pairingheap_node phNode;
+       BlockNumber blkno;                      /* index page number, or InvalidBlockNumber */
+       union
+       {
+               GistNSN         parentlsn;      /* parent page's LSN, if index page */
+               /* we must store parentlsn to detect whether a split occurred */
+               GISTSearchHeapItem heap;        /* heap info, if heap tuple */
+       }                       data;
+       double          distances[FLEXIBLE_ARRAY_MEMBER];               /* numberOfOrderBys
+                                                                                                                * entries */
+} GISTSearchItem;
+
+#define GISTSearchItemIsHeap(item)     ((item).blkno == InvalidBlockNumber)
+
+#define SizeOfGISTSearchItem(n_distances) (offsetof(GISTSearchItem, distances) + sizeof(double) * (n_distances))
 
-       /* see comments on gistxlogPageUpdate */
-       ItemPointerData key;
+/*
+ * GISTScanOpaqueData: private state for a scan of a GiST index
+ */
+typedef struct GISTScanOpaqueData
+{
+       GISTSTATE  *giststate;          /* index information, see above */
+       Oid                *orderByTypes;       /* datatypes of ORDER BY expressions */
+
+       pairingheap *queue;                     /* queue of unvisited items */
+       MemoryContext queueCxt;         /* context holding the queue */
+       bool            qual_ok;                /* false if qual can never be satisfied */
+       bool            firstCall;              /* true until first gistgettuple call */
+
+       /* pre-allocated workspace arrays */
+       double     *distances;          /* output area for gistindex_keytest */
+
+       /* info about killed items if any (killedItems is NULL if never used) */
+       OffsetNumber *killedItems;      /* offset numbers of killed items */
+       int                     numKilled;              /* number of currently stored items */
+       BlockNumber curBlkno;           /* current number of block */
+       GistNSN         curPageLSN;             /* pos in the WAL stream when page was read */
+
+       /* In a non-ordered search, returnable heap items are stored here: */
+       GISTSearchHeapItem pageData[BLCKSZ / sizeof(IndexTupleData)];
+       OffsetNumber nPageData;         /* number of valid items in array */
+       OffsetNumber curPageData;       /* next item to return */
+       MemoryContext pageDataCxt;      /* context holding the fetched tuples, for
+                                                                * index-only scans */
+} GISTScanOpaqueData;
 
-       /*
-        * follow: 1. gistxlogPage and array of IndexTupleData per page
-        */
-} gistxlogPageSplit;
+typedef GISTScanOpaqueData *GISTScanOpaque;
 
+/* despite the name, gistxlogPage is not part of any xlog record */
 typedef struct gistxlogPage
 {
        BlockNumber blkno;
        int                     num;                    /* number of index tuples following */
 } gistxlogPage;
 
-typedef struct gistxlogInsertComplete
-{
-       RelFileNode node;
-       /* follows ItemPointerData key to clean */
-} gistxlogInsertComplete;
-
-typedef struct gistxlogPageDelete
-{
-       RelFileNode node;
-       BlockNumber blkno;
-} gistxlogPageDelete;
-
 /* SplitedPageLayout - gistSplit function result */
 typedef struct SplitedPageLayout
 {
@@ -157,7 +200,6 @@ typedef struct SplitedPageLayout
  * GISTInsertStack used for locking buffers and transfer arguments during
  * insertion
  */
-
 typedef struct GISTInsertStack
 {
        /* current page */
@@ -166,112 +208,224 @@ typedef struct GISTInsertStack
        Page            page;
 
        /*
-        * log sequence number from page->lsn to recognize page update  and
-        * compare it with page's nsn to recognize page split
+        * log sequence number from page->lsn to recognize page update and compare
+        * it with page's nsn to recognize page split
         */
        GistNSN         lsn;
 
-       /* child's offset */
-       OffsetNumber childoffnum;
+       /* offset of the downlink in the parent page, that points to this page */
+       OffsetNumber downlinkoffnum;
 
-       /* pointer to parent and child */
+       /* pointer to parent */
        struct GISTInsertStack *parent;
-       struct GISTInsertStack *child;
-
-       /* for gistFindPath */
-       struct GISTInsertStack *next;
 } GISTInsertStack;
 
+/* Working state and results for multi-column split logic in gistsplit.c */
 typedef struct GistSplitVector
 {
-       GIST_SPLITVEC splitVector;      /* to/from PickSplit method */
+       GIST_SPLITVEC splitVector;      /* passed to/from user PickSplit method */
 
        Datum           spl_lattr[INDEX_MAX_KEYS];              /* Union of subkeys in
-                                                                                                * spl_left */
+                                                                                                * splitVector.spl_left */
        bool            spl_lisnull[INDEX_MAX_KEYS];
-       bool            spl_leftvalid;
 
        Datum           spl_rattr[INDEX_MAX_KEYS];              /* Union of subkeys in
-                                                                                                * spl_right */
+                                                                                                * splitVector.spl_right */
        bool            spl_risnull[INDEX_MAX_KEYS];
-       bool            spl_rightvalid;
 
-       bool       *spl_equiv;          /* equivalent tuples which can be freely
-                                                                * distributed between left and right pages */
+       bool       *spl_dontcare;       /* flags tuples which could go to either side
+                                                                * of the split for zero penalty */
 } GistSplitVector;
 
-#define XLogRecPtrIsInvalid( r )       ( (r).xlogid == 0 && (r).xrecoff == 0 )
-
 typedef struct
 {
        Relation        r;
-       IndexTuple *itup;                       /* in/out, points to compressed entry */
-       int                     ituplen;                /* length of itup */
        Size            freespace;              /* free space to be left */
-       GISTInsertStack *stack;
-       bool            needInsertComplete;
 
-       /* pointer to heap tuple */
-       ItemPointerData key;
+       GISTInsertStack *stack;
 } GISTInsertState;
 
-/*
- * When we're doing a scan and updating a tree at the same time, the
- * updates may affect the scan.  We use the flags entry of the scan's
- * opaque space to record our actual position in response to updates
- * that we can't handle simply by adjusting pointers.
- */
-#define GS_CURBEFORE   ((uint16) (1 << 0))
-#define GS_MRKBEFORE   ((uint16) (1 << 1))
-
 /* root page of a gist index */
 #define GIST_ROOT_BLKNO                                0
 
 /*
- * mark tuples on inner pages during recovery
+ * Before PostgreSQL 9.1, we used to rely on so-called "invalid tuples" on
+ * inner pages to finish crash recovery of incomplete page splits. If a crash
+ * happened in the middle of a page split, so that the downlink pointers were
+ * not yet inserted, crash recovery inserted a special downlink pointer. The
+ * semantics of an invalid tuple was that it if you encounter one in a scan,
+ * it must always be followed, because we don't know if the tuples on the
+ * child page match or not.
+ *
+ * We no longer create such invalid tuples, we now mark the left-half of such
+ * an incomplete split with the F_FOLLOW_RIGHT flag instead, and finish the
+ * split properly the next time we need to insert on that page. To retain
+ * on-disk compatibility for the sake of pg_upgrade, we still store 0xffff as
+ * the offset number of all inner tuples. If we encounter any invalid tuples
+ * with 0xfffe during insertion, we throw an error, though scans still handle
+ * them. You should only encounter invalid tuples if you pg_upgrade a pre-9.1
+ * gist index which already has invalid tuples in it because of a crash. That
+ * should be rare, and you are recommended to REINDEX anyway if you have any
+ * invalid tuples in an index, so throwing an error is as far as we go with
+ * supporting that.
  */
 #define TUPLE_IS_VALID         0xffff
 #define TUPLE_IS_INVALID       0xfffe
 
 #define  GistTupleIsInvalid(itup)      ( ItemPointerGetOffsetNumber( &((itup)->t_tid) ) == TUPLE_IS_INVALID )
 #define  GistTupleSetValid(itup)       ItemPointerSetOffsetNumber( &((itup)->t_tid), TUPLE_IS_VALID )
-#define  GistTupleSetInvalid(itup)     ItemPointerSetOffsetNumber( &((itup)->t_tid), TUPLE_IS_INVALID )
+
+
+
+
+/*
+ * A buffer attached to an internal node, used when building an index in
+ * buffering mode.
+ */
+typedef struct
+{
+       BlockNumber nodeBlocknum;       /* index block # this buffer is for */
+       int32           blocksCount;    /* current # of blocks occupied by buffer */
+
+       BlockNumber pageBlocknum;       /* temporary file block # */
+       GISTNodeBufferPage *pageBuffer;         /* in-memory buffer page */
+
+       /* is this buffer queued for emptying? */
+       bool            queuedForEmptying;
+
+       /* is this a temporary copy, not in the hash table? */
+       bool            isTemp;
+
+       int                     level;                  /* 0 == leaf */
+} GISTNodeBuffer;
+
+/*
+ * Does specified level have buffers? (Beware of multiple evaluation of
+ * arguments.)
+ */
+#define LEVEL_HAS_BUFFERS(nlevel, gfbb) \
+       ((nlevel) != 0 && (nlevel) % (gfbb)->levelStep == 0 && \
+        (nlevel) != (gfbb)->rootlevel)
+
+/* Is specified buffer at least half-filled (should be queued for emptying)? */
+#define BUFFER_HALF_FILLED(nodeBuffer, gfbb) \
+       ((nodeBuffer)->blocksCount > (gfbb)->pagesPerBuffer / 2)
+
+/*
+ * Is specified buffer full? Our buffers can actually grow indefinitely,
+ * beyond the "maximum" size, so this just means whether the buffer has grown
+ * beyond the nominal maximum size.
+ */
+#define BUFFER_OVERFLOWED(nodeBuffer, gfbb) \
+       ((nodeBuffer)->blocksCount > (gfbb)->pagesPerBuffer)
+
+/*
+ * Data structure with general information about build buffers.
+ */
+typedef struct GISTBuildBuffers
+{
+       /* Persistent memory context for the buffers and metadata. */
+       MemoryContext context;
+
+       BufFile    *pfile;                      /* Temporary file to store buffers in */
+       long            nFileBlocks;    /* Current size of the temporary file */
+
+       /*
+        * resizable array of free blocks.
+        */
+       long       *freeBlocks;
+       int                     nFreeBlocks;    /* # of currently free blocks in the array */
+       int                     freeBlocksLen;  /* current allocated length of the array */
+
+       /* Hash for buffers by block number */
+       HTAB       *nodeBuffersTab;
+
+       /* List of buffers scheduled for emptying */
+       List       *bufferEmptyingQueue;
+
+       /*
+        * Parameters to the buffering build algorithm. levelStep determines which
+        * levels in the tree have buffers, and pagesPerBuffer determines how
+        * large each buffer is.
+        */
+       int                     levelStep;
+       int                     pagesPerBuffer;
+
+       /* Array of lists of buffers on each level, for final emptying */
+       List      **buffersOnLevels;
+       int                     buffersOnLevelsLen;
+
+       /*
+        * Dynamically-sized array of buffers that currently have their last page
+        * loaded in main memory.
+        */
+       GISTNodeBuffer **loadedBuffers;
+       int                     loadedBuffersCount;             /* # of entries in loadedBuffers */
+       int                     loadedBuffersLen;               /* allocated size of loadedBuffers */
+
+       /* Level of the current root node (= height of the index tree - 1) */
+       int                     rootlevel;
+} GISTBuildBuffers;
+
+/*
+ * Storage type for GiST's reloptions
+ */
+typedef struct GiSTOptions
+{
+       int32           vl_len_;                /* varlena header (do not touch directly!) */
+       int                     fillfactor;             /* page fill factor in percent (0..100) */
+       int                     bufferingModeOffset;    /* use buffering build? */
+} GiSTOptions;
 
 /* gist.c */
-extern Datum gistbuild(PG_FUNCTION_ARGS);
-extern Datum gistinsert(PG_FUNCTION_ARGS);
+extern void gistbuildempty(Relation index);
+extern bool gistinsert(Relation r, Datum *values, bool *isnull,
+                  ItemPointer ht_ctid, Relation heapRel,
+                  IndexUniqueCheck checkUnique,
+                  struct IndexInfo *indexInfo);
 extern MemoryContext createTempGistContext(void);
-extern void initGISTstate(GISTSTATE *giststate, Relation index);
+extern GISTSTATE *initGISTstate(Relation index);
 extern void freeGISTstate(GISTSTATE *giststate);
-extern void gistmakedeal(GISTInsertState *state, GISTSTATE *giststate);
-extern void gistnewroot(Relation r, Buffer buffer, IndexTuple *itup, int len, ItemPointer key);
+extern void gistdoinsert(Relation r,
+                        IndexTuple itup,
+                        Size freespace,
+                        GISTSTATE *GISTstate);
+
+/* A List of these is returned from gistplacetopage() in *splitinfo */
+typedef struct
+{
+       Buffer          buf;                    /* the split page "half" */
+       IndexTuple      downlink;               /* downlink for this half. */
+} GISTPageSplitInfo;
+
+extern bool gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
+                               Buffer buffer,
+                               IndexTuple *itup, int ntup,
+                               OffsetNumber oldoffnum, BlockNumber *newblkno,
+                               Buffer leftchildbuf,
+                               List **splitinfo,
+                               bool markleftchild);
 
 extern SplitedPageLayout *gistSplit(Relation r, Page page, IndexTuple *itup,
                  int len, GISTSTATE *giststate);
 
-extern GISTInsertStack *gistFindPath(Relation r, BlockNumber child);
-
-/* gistxlog.c */
-extern void gist_redo(XLogRecPtr lsn, XLogRecord *record);
-extern void gist_desc(StringInfo buf, uint8 xl_info, char *rec);
-extern void gist_xlog_startup(void);
-extern void gist_xlog_cleanup(void);
-extern bool gist_safe_restartpoint(void);
-extern IndexTuple gist_form_invalid_tuple(BlockNumber blkno);
+extern XLogRecPtr gistXLogUpdate(Buffer buffer,
+                          OffsetNumber *todelete, int ntodelete,
+                          IndexTuple *itup, int ntup,
+                          Buffer leftchild);
 
-extern XLogRecData *formUpdateRdata(RelFileNode node, Buffer buffer,
-                               OffsetNumber *todelete, int ntodelete,
-                               IndexTuple *itup, int ituplen, ItemPointer key);
-
-extern XLogRecData *formSplitRdata(RelFileNode node,
-                          BlockNumber blkno, bool page_is_leaf,
-                          ItemPointer key, SplitedPageLayout *dist);
-
-extern XLogRecPtr gistxlogInsertCompletion(RelFileNode node, ItemPointerData *keys, int len);
+extern XLogRecPtr gistXLogSplit(bool page_is_leaf,
+                         SplitedPageLayout *dist,
+                         BlockNumber origrlink, GistNSN oldnsn,
+                         Buffer leftchild, bool markfollowright);
 
 /* gistget.c */
-extern Datum gistgettuple(PG_FUNCTION_ARGS);
-extern Datum gistgetmulti(PG_FUNCTION_ARGS);
+extern bool gistgettuple(IndexScanDesc scan, ScanDirection dir);
+extern int64 gistgetbitmap(IndexScanDesc scan, TIDBitmap *tbm);
+extern bool gistcanreturn(Relation index, int attno);
+
+/* gistvalidate.c */
+extern bool gistvalidate(Oid opclassoid);
 
 /* gistutil.c */
 
@@ -281,13 +435,16 @@ extern Datum gistgetmulti(PG_FUNCTION_ARGS);
 #define GIST_MIN_FILLFACTOR                    10
 #define GIST_DEFAULT_FILLFACTOR                90
 
-extern Datum gistoptions(PG_FUNCTION_ARGS);
+extern bytea *gistoptions(Datum reloptions, bool validate);
+extern bool gistproperty(Oid index_oid, int attno,
+                        IndexAMProperty prop, const char *propname,
+                        bool *res, bool *isnull);
 extern bool gistfitpage(IndexTuple *itvec, int len);
 extern bool gistnospace(Page page, IndexTuple *itvec, int len, OffsetNumber todelete, Size freespace);
 extern void gistcheckpage(Relation rel, Buffer buf);
 extern Buffer gistNewBuffer(Relation r);
-extern OffsetNumber gistfillbuffer(Relation r, Page page, IndexTuple *itup,
-                          int len, OffsetNumber off);
+extern void gistfillbuffer(Page page, IndexTuple *itup, int len,
+                          OffsetNumber off);
 extern IndexTuple *gistextractpage(Page page, int *len /* out */ );
 extern IndexTuple *gistjoinvector(
                           IndexTuple *itvec, int *len,
@@ -301,15 +458,11 @@ extern IndexTuple gistgetadjusted(Relation r,
                                IndexTuple addtup,
                                GISTSTATE *giststate);
 extern IndexTuple gistFormTuple(GISTSTATE *giststate,
-                         Relation r, Datum *attdata, bool *isnull, bool newValues);
+                         Relation r, Datum *attdata, bool *isnull, bool isleaf);
 
 extern OffsetNumber gistchoose(Relation r, Page p,
                   IndexTuple it,
                   GISTSTATE *giststate);
-extern void gistcentryinit(GISTSTATE *giststate, int nkey,
-                          GISTENTRY *e, Datum k,
-                          Relation r, Page pg,
-                          OffsetNumber o, bool l, bool isNull);
 
 extern void GISTInitBuffer(Buffer b, uint32 f);
 extern void gistdentryinit(GISTSTATE *giststate, int nkey, GISTENTRY *e,
@@ -319,25 +472,54 @@ extern void gistdentryinit(GISTSTATE *giststate, int nkey, GISTENTRY *e,
 extern float gistpenalty(GISTSTATE *giststate, int attno,
                        GISTENTRY *key1, bool isNull1,
                        GISTENTRY *key2, bool isNull2);
-extern bool gistMakeUnionItVec(GISTSTATE *giststate, IndexTuple *itvec, int len, int startkey,
+extern void gistMakeUnionItVec(GISTSTATE *giststate, IndexTuple *itvec, int len,
                                   Datum *attr, bool *isnull);
 extern bool gistKeyIsEQ(GISTSTATE *giststate, int attno, Datum a, Datum b);
 extern void gistDeCompressAtt(GISTSTATE *giststate, Relation r, IndexTuple tuple, Page p,
                                  OffsetNumber o, GISTENTRY *attdata, bool *isnull);
-
+extern HeapTuple gistFetchTuple(GISTSTATE *giststate, Relation r,
+                          IndexTuple tuple);
 extern void gistMakeUnionKey(GISTSTATE *giststate, int attno,
                                 GISTENTRY *entry1, bool isnull1,
                                 GISTENTRY *entry2, bool isnull2,
                                 Datum *dst, bool *dstisnull);
 
+extern XLogRecPtr gistGetFakeLSN(Relation rel);
+
 /* gistvacuum.c */
-extern Datum gistbulkdelete(PG_FUNCTION_ARGS);
-extern Datum gistvacuumcleanup(PG_FUNCTION_ARGS);
+extern IndexBulkDeleteResult *gistbulkdelete(IndexVacuumInfo *info,
+                          IndexBulkDeleteResult *stats,
+                          IndexBulkDeleteCallback callback,
+                          void *callback_state);
+extern IndexBulkDeleteResult *gistvacuumcleanup(IndexVacuumInfo *info,
+                                 IndexBulkDeleteResult *stats);
 
 /* gistsplit.c */
 extern void gistSplitByKey(Relation r, Page page, IndexTuple *itup,
                           int len, GISTSTATE *giststate,
-                          GistSplitVector *v, GistEntryVector *entryvec,
+                          GistSplitVector *v,
                           int attno);
 
+/* gistbuild.c */
+extern IndexBuildResult *gistbuild(Relation heap, Relation index,
+                 struct IndexInfo *indexInfo);
+extern void gistValidateBufferingOption(char *value);
+
+/* gistbuildbuffers.c */
+extern GISTBuildBuffers *gistInitBuildBuffers(int pagesPerBuffer, int levelStep,
+                                        int maxLevel);
+extern GISTNodeBuffer *gistGetNodeBuffer(GISTBuildBuffers *gfbb,
+                                 GISTSTATE *giststate,
+                                 BlockNumber blkno, int level);
+extern void gistPushItupToNodeBuffer(GISTBuildBuffers *gfbb,
+                                                GISTNodeBuffer *nodeBuffer, IndexTuple item);
+extern bool gistPopItupFromNodeBuffer(GISTBuildBuffers *gfbb,
+                                                 GISTNodeBuffer *nodeBuffer, IndexTuple *item);
+extern void gistFreeBuildBuffers(GISTBuildBuffers *gfbb);
+extern void gistRelocateBuildBuffersOnSplit(GISTBuildBuffers *gfbb,
+                                                               GISTSTATE *giststate, Relation r,
+                                                               int level, Buffer buffer,
+                                                               List *splitinfo);
+extern void gistUnloadNodeBuffers(GISTBuildBuffers *gfbb);
+
 #endif   /* GIST_PRIVATE_H */