diff options
Diffstat (limited to 'src/include/access')
| -rw-r--r-- | src/include/access/gin.h | 5 | ||||
| -rw-r--r-- | src/include/access/gist_private.h | 17 |
2 files changed, 2 insertions, 20 deletions
diff --git a/src/include/access/gin.h b/src/include/access/gin.h index de29cff86b..57cb8a345a 100644 --- a/src/include/access/gin.h +++ b/src/include/access/gin.h @@ -4,7 +4,7 @@ * * Copyright (c) 2006-2008, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/access/gin.h,v 1.24 2008/07/13 21:50:04 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/gin.h,v 1.25 2008/10/20 13:39:44 teodor Exp $ *-------------------------------------------------------------------------- */ @@ -426,8 +426,6 @@ typedef struct GinScanOpaqueData uint32 nkeys; bool isVoidRes; /* true if ginstate.extractQueryFn guarantees * that nothing will be found */ - - GinScanKey markPos; } GinScanOpaqueData; typedef GinScanOpaqueData *GinScanOpaque; @@ -449,7 +447,6 @@ extern PGDLLIMPORT int GinFuzzySearchLimit; extern Datum gingetbitmap(PG_FUNCTION_ARGS); extern Datum gingettuple(PG_FUNCTION_ARGS); -extern void ginrestartentry(GinScanEntry entry); /* ginvacuum.c */ extern Datum ginbulkdelete(PG_FUNCTION_ARGS); diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h index 5b628c93c6..2d942e54b4 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 |