mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add prototypes and remove unused variables from btree Fastbuild patch.

Browse Source
This commit is contained in:
Bruce Momjian 1997-02-14 22:47:36 +00:00
parent 3eba7651f3
commit d38767fcb5
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/backend/access/nbtree/nbtsort.c
View File

@ -5,7 +5,7 @@
*
*
* IDENTIFICATION
* $Id: nbtsort.c,v 1.9 1997/02/12 05:04:20 scrappy Exp $
* $Id: nbtsort.c,v 1.10 1997/02/14 22:47:19 momjian Exp $
*
* NOTES
*
@ -596,7 +596,6 @@ _bt_spool(Relation index, BTItem btitem, void *spool)
BTSpool *btspool = (BTSpool *) spool;
BTTapeBlock *itape;
Size itemsz;
int i;
itape = btspool->bts_itape[btspool->bts_tape];
itemsz = BTITEMSZ(btitem);
@ -636,7 +635,7 @@ _bt_spool(Relation index, BTItem btitem, void *spool)
*/
_bt_isortcmpinit(index);
qsort((void *) parray, itape->bttb_ntup, sizeof(BTSortKey),
_bt_isortcmp);
(int (*)(const void *,const void *))_bt_isortcmp);
}
/*
@ -743,17 +742,6 @@ _bt_slideleft(Relation index, Buffer buf, Page page)
}
}
typedef struct BTPageState {
Buffer btps_buf;
Page btps_page;
BTItem btps_lastbti;
OffsetNumber btps_lastoff;
OffsetNumber btps_firstoff;
int btps_level;
bool btps_doupper;
struct BTPageState *btps_next;
} BTPageState;
/*
* allocate and initialize a new BTPageState. the returned structure
* is suitable for immediate use by _bt_buildadd.
@ -841,7 +829,6 @@ _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags)
BTPageState *state = (BTPageState *) pstate;
Buffer nbuf;
Page npage;
char *pos;
BTItem last_bti;
OffsetNumber first_off;
OffsetNumber last_off;
@ -1060,8 +1047,6 @@ _bt_merge(Relation index, BTSpool *btspool)
int nruns;
Size btisz;
bool doleaf = false;
BTPageState *s;
BTPageOpaque *opaque;
/*
* initialize state needed for the merge into the btree leaf pages.

21
src/include/access/nbtree.h
View File

@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: nbtree.h,v 1.6 1997/02/12 05:04:28 scrappy Exp $
* $Id: nbtree.h,v 1.7 1997/02/14 22:47:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -114,6 +114,17 @@ typedef struct BTStackData {
typedef BTStackData *BTStack;
typedef struct BTPageState {
Buffer btps_buf;
Page btps_page;
BTItem btps_lastbti;
OffsetNumber btps_lastoff;
OffsetNumber btps_firstoff;
int btps_level;
bool btps_doupper;
struct BTPageState *btps_next;
} BTPageState;
/*
* We need to be able to tell the difference between read and write
* requests for pages, in order to do locking correctly.
@ -227,7 +238,9 @@ extern void btdelete(Relation rel, ItemPointer tid);
*/
extern void _bt_regscan(IndexScanDesc scan);
extern void _bt_dropscan(IndexScanDesc scan);
extern void _bt_adjscans(Relation rel, ItemPointer tid, int op);
extern void _bt_adjscans(Relation rel, ItemPointer tid);
extern void _bt_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
extern bool _bt_scantouched(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
/*
* prototypes for functions in nbtsearch.c
@ -268,6 +281,10 @@ extern BTItem _bt_formitem(IndexTuple itup);
* prototypes for functions in nbtsort.c
*/
extern void *_bt_spoolinit(Relation index, int ntapes);
extern void *_bt_pagestate(Relation index, int flags, int level, bool doupper);
extern BTItem _bt_minitem(Page opage, BlockNumber oblkno, int atend);
extern BTItem _bt_buildadd(Relation index, void *pstate, BTItem bti, int flags);
extern void _bt_uppershutdown(Relation index, BTPageState *state);
extern void _bt_spooldestroy(void *spool);
extern void _bt_spool(Relation index, BTItem btitem, void *spool);
extern void _bt_upperbuild(Relation index);