diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/access/gin.h | 3 | ||||
| -rw-r--r-- | src/include/nodes/execnodes.h | 4 | ||||
| -rw-r--r-- | src/include/nodes/tidbitmap.h | 10 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/include/access/gin.h b/src/include/access/gin.h index 78269a415a0..1425333221d 100644 --- a/src/include/access/gin.h +++ b/src/include/access/gin.h @@ -4,7 +4,7 @@ * * Copyright (c) 2006-2009, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/access/gin.h,v 1.27 2009/01/01 17:23:55 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/gin.h,v 1.28 2009/01/10 21:08:36 tgl Exp $ *-------------------------------------------------------------------------- */ @@ -380,6 +380,7 @@ typedef struct GinScanEntryData /* partial match support */ bool isPartialMatch; TIDBitmap *partialMatch; + TBMIterator *partialMatchIterator; TBMIterateResult *partialMatchResult; StrategyNumber strategy; diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 4b2b64c300e..506605df001 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.199 2009/01/01 17:23:59 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.200 2009/01/10 21:08:36 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1152,6 +1152,7 @@ typedef struct BitmapIndexScanState * * bitmapqualorig execution state for bitmapqualorig expressions * tbm bitmap obtained from child index scan(s) + * tbmiterator iterator for scanning current pages * tbmres current-page data * ---------------- */ @@ -1160,6 +1161,7 @@ typedef struct BitmapHeapScanState ScanState ss; /* its first field is NodeTag */ List *bitmapqualorig; TIDBitmap *tbm; + TBMIterator *tbmiterator; TBMIterateResult *tbmres; } BitmapHeapScanState; diff --git a/src/include/nodes/tidbitmap.h b/src/include/nodes/tidbitmap.h index e6ce0db892d..93658543e42 100644 --- a/src/include/nodes/tidbitmap.h +++ b/src/include/nodes/tidbitmap.h @@ -15,7 +15,7 @@ * * Copyright (c) 2003-2009, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/nodes/tidbitmap.h,v 1.8 2009/01/01 17:24:00 momjian Exp $ + * $PostgreSQL: pgsql/src/include/nodes/tidbitmap.h,v 1.9 2009/01/10 21:08:36 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -31,6 +31,9 @@ */ typedef struct TIDBitmap TIDBitmap; +/* Likewise, TBMIterator is private */ +typedef struct TBMIterator TBMIterator; + /* Result structure for tbm_iterate */ typedef struct { @@ -55,7 +58,8 @@ extern void tbm_intersect(TIDBitmap *a, const TIDBitmap *b); extern bool tbm_is_empty(const TIDBitmap *tbm); -extern void tbm_begin_iterate(TIDBitmap *tbm); -extern TBMIterateResult *tbm_iterate(TIDBitmap *tbm); +extern TBMIterator *tbm_begin_iterate(TIDBitmap *tbm); +extern TBMIterateResult *tbm_iterate(TBMIterator *iterator); +extern void tbm_end_iterate(TBMIterator *iterator); #endif /* TIDBITMAP_H */ |