diff options
| -rw-r--r-- | contrib/bloom/blscan.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/contrib/bloom/blscan.c b/contrib/bloom/blscan.c index fc82f543738..aebf32a8d2f 100644 --- a/contrib/bloom/blscan.c +++ b/contrib/bloom/blscan.c @@ -29,9 +29,16 @@ IndexScanDesc blbeginscan(Relation r, int nkeys, int norderbys) { IndexScanDesc scan; + BloomScanOpaque so; scan = RelationGetIndexScan(r, nkeys, norderbys); + so = (BloomScanOpaque) palloc(sizeof(BloomScanOpaqueData)); + initBloomState(&so->state, scan->indexRelation); + so->sign = NULL; + + scan->opaque = so; + return scan; } @@ -42,23 +49,10 @@ void blrescan(IndexScanDesc scan, ScanKey scankey, int nscankeys, ScanKey orderbys, int norderbys) { - BloomScanOpaque so; - - so = (BloomScanOpaque) scan->opaque; - - if (so == NULL) - { - /* if called from blbeginscan */ - so = (BloomScanOpaque) palloc(sizeof(BloomScanOpaqueData)); - initBloomState(&so->state, scan->indexRelation); - scan->opaque = so; + BloomScanOpaque so = (BloomScanOpaque) scan->opaque; - } - else - { - if (so->sign) - pfree(so->sign); - } + if (so->sign) + pfree(so->sign); so->sign = NULL; if (scankey && scan->numberOfKeys > 0) |