From 26c48b5e8cffafaf3b8acf345ca9fd8a1e408a54 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 17 Oct 1999 22:15:09 +0000 Subject: Final stage of psort reconstruction work: replace psort.c with a generalized module 'tuplesort.c' that can sort either HeapTuples or IndexTuples, and is not tied to execution of a Sort node. Clean up memory leakages in sorting, and replace nbtsort.c's private implementation of mergesorting with calls to tuplesort.c. --- src/include/access/nbtree.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/include/access') diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index 7c57a9a4f9..613595febf 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nbtree.h,v 1.31 1999/08/08 20:12:49 tgl Exp $ + * $Id: nbtree.h,v 1.32 1999/10/17 22:15:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -288,9 +288,12 @@ extern BTItem _bt_formitem(IndexTuple itup); /* * prototypes for functions in nbtsort.c */ -extern void *_bt_spoolinit(Relation index, int ntapes, bool isunique); -extern void _bt_spooldestroy(void *spool); -extern void _bt_spool(Relation index, BTItem btitem, void *spool); -extern void _bt_leafbuild(Relation index, void *spool); + +typedef struct BTSpool BTSpool; /* opaque type known only within nbtsort.c */ + +extern BTSpool *_bt_spoolinit(Relation index, bool isunique); +extern void _bt_spooldestroy(BTSpool *btspool); +extern void _bt_spool(BTItem btitem, BTSpool *btspool); +extern void _bt_leafbuild(BTSpool *btspool); #endif /* NBTREE_H */ -- cgit v1.2.1