WAL for GiST. It work for online backup and so on, but on

recovery after crash (power loss etc) it may say that it can't restore
index and index should be reindexed.

Some refactoring code.

src/backend/access/gist/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for access/gist
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/access/gist/Makefile,v 1.12 2003/11/29 19:51:39 pgsql Exp $
+#    $PostgreSQL: pgsql/src/backend/access/gist/Makefile,v 1.13 2005/06/14 11:45:13 teodor Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,7 +12,7 @@ subdir = src/backend/access/gist
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = gist.o gistget.o gistscan.o
+OBJS = gist.o gistutil.o gistxlog.o gistget.o gistscan.o
 
 all: SUBSYS.o
 

src/backend/access/gist/gistget.c

@@ -8,14 +8,14 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.47 2005/05/17 03:34:18 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.48 2005/06/14 11:45:13 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "access/gist_private.h"
 #include "access/itup.h"
+#include "access/gist_private.h"
 #include "executor/execdebug.h"
 #include "utils/memutils.h"
 

src/backend/access/transam/rmgr.c

@@ -3,7 +3,7 @@
  *
  * Resource managers definition
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/rmgr.c,v 1.19 2005/06/08 15:50:26 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/rmgr.c,v 1.20 2005/06/14 11:45:14 teodor Exp $
  */
 #include "postgres.h"
 
@@ -37,6 +37,6 @@ const RmgrData RmgrTable[RM_MAX_ID + 1] = {
 	{"Btree", btree_redo, btree_desc, btree_xlog_startup, btree_xlog_cleanup},
 	{"Hash", hash_redo, hash_desc, NULL, NULL},
 	{"Rtree", rtree_redo, rtree_desc, NULL, NULL},
-	{"Gist", gist_redo, gist_desc, NULL, NULL},
+	{"Gist", gist_redo, gist_desc, gist_xlog_startup, gist_xlog_cleanup},
 	{"Sequence", seq_redo, seq_desc, NULL, NULL}
 };

src/include/access/gist_private.h

@@ -7,15 +7,17 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/gist_private.h,v 1.2 2005/06/06 17:01:24 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/gist_private.h,v 1.3 2005/06/14 11:45:14 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef GIST_PRIVATE_H
 #define GIST_PRIVATE_H
 
+#include "access/itup.h"
 #include "access/gist.h"
 #include "access/xlog.h"
+#include "access/xlogdefs.h"
 #include "fmgr.h"
 
 /*
@@ -66,6 +68,42 @@ typedef struct GISTScanOpaqueData
 
 typedef GISTScanOpaqueData *GISTScanOpaque;
 
+/*
+ * GISTInsertStack used for locking buffers and transfer arguments during
+ * insertion
+ */
+
+typedef struct GISTInsertStack {
+	/* current page */
+	BlockNumber	blkno;	 
+	Buffer		buffer;
+	Page		page;
+	
+	/* child's offset */
+	OffsetNumber	childoffnum;
+
+	/* pointer to parent */
+	struct GISTInsertStack	*parent;
+
+	bool todelete;
+} GISTInsertStack;
+
+typedef struct {
+	Relation	r;
+	IndexTuple      *itup; /* in/out, points to compressed entry */
+	int             ituplen; /* length of itup */
+	GISTInsertStack	*stack;
+	bool needInsertComplete;
+	bool xlog_mode;
+
+	/* pointer to heap tuple */
+	ItemPointerData	key;
+
+	/* path to stroe in XLog */
+	BlockNumber	*path;
+	int 		pathlen; 
+} 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
@@ -89,6 +127,72 @@ typedef GISTScanOpaqueData *GISTScanOpaque;
 #define GISTOP_DEL		0
 #define GISTOP_SPLIT	1
 
+#define ATTSIZE(datum, tupdesc, i, isnull) \
+        ( \
+                (isnull) ? 0 : \
+                   att_addlength(0, (tupdesc)->attrs[(i)-1]->attlen, (datum)) \
+        ) 
+
+/* XLog stuff */
+#define	XLOG_GIST_ENTRY_UPDATE	0x00
+#define	XLOG_GIST_ENTRY_DELETE	0x10
+#define XLOG_GIST_NEW_ROOT	0x20
+
+typedef struct gistxlogEntryUpdate {
+	RelFileNode	node;
+	BlockNumber	blkno;
+
+	/* if todeleteoffnum!=InvalidOffsetNumber then delete it. */ 
+	OffsetNumber	todeleteoffnum;
+	uint16		pathlen;
+
+	/* 
+	 * It used to identify compliteness of insert.
+         * Sets to leaf itup 
+         */ 
+	ItemPointerData	key;
+
+	/* follow:
+	 * 1. path to root (BlockNumber) 
+	 * 2. tuples to insert
+         */ 
+} gistxlogEntryUpdate;
+
+#define XLOG_GIST_PAGE_SPLIT	0x30
+
+typedef struct gistxlogPageSplit {
+	RelFileNode	node;
+	BlockNumber	origblkno; /*splitted page*/
+	OffsetNumber	todeleteoffnum;
+	uint16		pathlen;
+	int		npage;
+	int		nitup;
+
+	/* see comments on gistxlogEntryUpdate */
+	ItemPointerData	key;
+ 
+	/* follow:
+	 * 1. path to root (BlockNumber) 
+	 * 2. tuples to insert
+	 * 3. gistxlogPage and array of OffsetNumber per page
+         */ 
+} gistxlogPageSplit;
+
+typedef struct gistxlogPage {
+	BlockNumber	blkno;
+	int		num;
+} gistxlogPage;	
+
+
+#define XLOG_GIST_INSERT_COMPLETE  0x40
+
+typedef struct gistxlogInsertComplete {
+	RelFileNode	node;
+	ItemPointerData	key;
+} gistxlogInsertComplete;
+
+#define XLOG_GIST_CREATE_INDEX	0x50
+
 /* gist.c */
 extern Datum gistbuild(PG_FUNCTION_ARGS);
 extern Datum gistinsert(PG_FUNCTION_ARGS);
@@ -96,15 +200,57 @@ extern Datum gistbulkdelete(PG_FUNCTION_ARGS);
 extern MemoryContext createTempGistContext(void);
 extern void initGISTstate(GISTSTATE *giststate, Relation index);
 extern void freeGISTstate(GISTSTATE *giststate);
-extern void gistdentryinit(GISTSTATE *giststate, int nkey, GISTENTRY *e,
-			   Datum k, Relation r, Page pg, OffsetNumber o,
-			   int b, bool l, bool isNull);
+extern void gistnewroot(Relation r, IndexTuple *itup, int len, ItemPointer key, bool xlog_mode);
+extern void gistmakedeal(GISTInsertState *state, GISTSTATE *giststate);
 
+/* gistxlog.c */
 extern void gist_redo(XLogRecPtr lsn, XLogRecord *record);
 extern void gist_desc(char *buf, uint8 xl_info, char *rec);
+extern void gist_xlog_startup(void);
+extern void gist_xlog_cleanup(void);
 
 /* gistget.c */
 extern Datum gistgettuple(PG_FUNCTION_ARGS);
 extern Datum gistgetmulti(PG_FUNCTION_ARGS);
 
+/* gistutil.c */
+extern OffsetNumber gistfillbuffer(Relation r, Page page, IndexTuple *itup,
+                                int len, OffsetNumber off);
+extern bool gistnospace(Page page, IndexTuple *itvec, int len);
+extern IndexTuple * gistextractbuffer(Buffer buffer, int *len /* out */ );
+extern IndexTuple * gistjoinvector(
+                           IndexTuple *itvec, int *len,
+                           IndexTuple *additvec, int addlen);
+extern IndexTuple gistunion(Relation r, IndexTuple *itvec,
+                  int len, GISTSTATE *giststate);
+extern IndexTuple gistgetadjusted(Relation r,
+                                IndexTuple oldtup,
+                                IndexTuple addtup,
+                                GISTSTATE *giststate);
+extern int gistfindgroup(GISTSTATE *giststate,
+                          GISTENTRY *valvec, GIST_SPLITVEC *spl);
+extern void gistadjsubkey(Relation r,
+                          IndexTuple *itup, int *len,
+                          GIST_SPLITVEC *v,
+                          GISTSTATE *giststate);
+extern IndexTuple gistFormTuple(GISTSTATE *giststate,
+                        Relation r, Datum *attdata, int *datumsize, bool *isnull);
+
+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, int b, bool l, bool isNull);
+extern void gistDeCompressAtt(GISTSTATE *giststate, Relation r,
+                              IndexTuple tuple, Page p, OffsetNumber o,
+                              GISTENTRY *attdata, bool *isnull);
+extern void gistunionsubkey(Relation r, GISTSTATE *giststate, 
+                            IndexTuple *itvec, GIST_SPLITVEC *spl);
+extern void GISTInitBuffer(Buffer b, uint32 f);
+extern void gistdentryinit(GISTSTATE *giststate, int nkey, GISTENTRY *e,
+			   Datum k, Relation r, Page pg, OffsetNumber o,
+			   int b, bool l, bool isNull);
+
 #endif	/* GIST_PRIVATE_H */