Remove mark/restore support in GIN and GiST indexes.

Per Tom's comment.
Also revome useless GISTScanOpaque->flags field.

1 files changed, 1 insertions, 16 deletions

diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h
index 5b628c93c63..2d942e54b49 100644
--- a/src/include/access/gist_private.h
+++ b/src/include/access/gist_private.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/gist_private.h,v 1.33 2008/10/17 17:02:21 teodor Exp $
+ * $PostgreSQL: pgsql/src/include/access/gist_private.h,v 1.34 2008/10/20 13:39:44 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -72,21 +72,15 @@ typedef struct GISTScanOpaqueData
 {
 	GISTSearchStack *stack;
 	GISTSearchStack *markstk;
-	uint16		flags;
 	bool        qual_ok;        /* false if qual can never be satisfied */
 	GISTSTATE  *giststate;
 	MemoryContext tempCxt;
 	Buffer		curbuf;
 	ItemPointerData curpos;
-	Buffer		markbuf;
-	ItemPointerData markpos;
 
 	ItemResult		pageData[BLCKSZ/sizeof(IndexTupleData)];
 	OffsetNumber	nPageData;
 	OffsetNumber	curPageData;
-	ItemResult		markPageData[BLCKSZ/sizeof(IndexTupleData)];
-	OffsetNumber	markNPageData;
-	OffsetNumber	markCurPageData;
 } GISTScanOpaqueData;
 
 typedef GISTScanOpaqueData *GISTScanOpaque;
@@ -225,15 +219,6 @@ typedef struct
 	ItemPointerData key;
 } 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