diff options
Diffstat (limited to 'src/include/access')
27 files changed, 180 insertions, 236 deletions
diff --git a/src/include/access/attnum.h b/src/include/access/attnum.h index eb1194f5f3..e85a160262 100644 --- a/src/include/access/attnum.h +++ b/src/include/access/attnum.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: attnum.h,v 1.7 1998/06/15 18:39:52 momjian Exp $ + * $Id: attnum.h,v 1.8 1998/09/01 04:34:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -59,4 +59,4 @@ typedef int16 AttrNumber; #define AttrOffsetGetAttrNumber(attributeOffset) \ ((AttrNumber) (1 + attributeOffset)) -#endif /* ATTNUM_H */ +#endif /* ATTNUM_H */ diff --git a/src/include/access/funcindex.h b/src/include/access/funcindex.h index a996bb4738..d30dcc704f 100644 --- a/src/include/access/funcindex.h +++ b/src/include/access/funcindex.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: funcindex.h,v 1.5 1997/09/08 21:50:31 momjian Exp $ + * $Id: funcindex.h,v 1.6 1998/09/01 04:34:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,4 +39,4 @@ typedef FuncIndexInfo *FuncIndexInfoPtr; #define FIisFunctionalIndex(FINFO) (FINFO->procOid != InvalidOid) -#endif /* FUNCINDEX_H */ +#endif /* FUNCINDEX_H */ diff --git a/src/include/access/genam.h b/src/include/access/genam.h index 7885d1cd0d..647d2d7ff8 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: genam.h,v 1.15 1998/09/01 03:27:29 momjian Exp $ + * $Id: genam.h,v 1.16 1998/09/01 04:34:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,35 +25,29 @@ extern Relation index_open(Oid relationId); extern Relation index_openr(char *relationName); extern void index_close(Relation relation); -extern InsertIndexResult -index_insert(Relation relation, +extern InsertIndexResult index_insert(Relation relation, Datum *datum, char *nulls, ItemPointer heap_t_ctid, Relation heapRel); extern void index_delete(Relation relation, ItemPointer indexItem); -extern IndexScanDesc -index_beginscan(Relation relation, bool scanFromEnd, +extern IndexScanDesc index_beginscan(Relation relation, bool scanFromEnd, uint16 numberOfKeys, ScanKey key); extern void index_rescan(IndexScanDesc scan, bool scanFromEnd, ScanKey key); extern void index_endscan(IndexScanDesc scan); extern void index_markpos(IndexScanDesc scan); extern void index_restrpos(IndexScanDesc scan); -extern RetrieveIndexResult -index_getnext(IndexScanDesc scan, +extern RetrieveIndexResult index_getnext(IndexScanDesc scan, ScanDirection direction); -extern RegProcedure -index_getprocid(Relation irel, AttrNumber attnum, +extern RegProcedure index_getprocid(Relation irel, AttrNumber attnum, uint16 procnum); -extern Datum -GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc, +extern Datum GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc, int attOff, AttrNumber *attrNums, FuncIndexInfo *fInfo, bool *attNull); /* in genam.c */ -extern IndexScanDesc -RelationGetIndexScan(Relation relation, bool scanFromEnd, +extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd, uint16 numberOfKeys, ScanKey key); extern void IndexScanMarkPosition(IndexScanDesc scan); extern void IndexScanRestorePosition(IndexScanDesc scan); -#endif /* GENAM_H */ +#endif /* GENAM_H */ diff --git a/src/include/access/gist.h b/src/include/access/gist.h index 15294ce06c..8bcf24ae7f 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -188,25 +188,22 @@ typedef struct intrange int flag; } INTRANGE; -extern void -gistbuild(Relation heap, +extern void gistbuild(Relation heap, Relation index, int natts, AttrNumber *attnum, IndexStrategy istrat, uint16 pint, Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo); -extern InsertIndexResult -gistinsert(Relation r, Datum *datum, +extern InsertIndexResult gistinsert(Relation r, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel); extern void _gistdump(Relation r); extern void gistfreestack(GISTSTACK *s); extern void initGISTstate(GISTSTATE *giststate, Relation index); -extern void -gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, +extern void gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, Relation r, Page pg, OffsetNumber o, int b, bool l); extern StrategyNumber RelationGetGISTStrategy(Relation, AttrNumber, RegProcedure); /* gistget.c */ extern RetrieveIndexResult gistgettuple(IndexScanDesc s, ScanDirection dir); -#endif /* GIST_H */ +#endif /* GIST_H */ diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h index 071238bd17..553705f139 100644 --- a/src/include/access/gistscan.h +++ b/src/include/access/gistscan.h @@ -16,8 +16,7 @@ #include <storage/block.h> #include <utils/rel.h> -extern IndexScanDesc -gistbeginscan(Relation r, bool fromEnd, +extern IndexScanDesc gistbeginscan(Relation r, bool fromEnd, uint16 nkeys, ScanKey key); extern void gistrescan(IndexScanDesc s, bool fromEnd, ScanKey key); extern void gistmarkpos(IndexScanDesc s); @@ -25,4 +24,4 @@ extern void gistrestrpos(IndexScanDesc s); extern void gistendscan(IndexScanDesc s); extern void gistadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); -#endif /* GISTSCAN_H */ +#endif /* GISTSCAN_H */ diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h index 1007dd3ec2..9fb0a10da6 100644 --- a/src/include/access/giststrat.h +++ b/src/include/access/giststrat.h @@ -15,8 +15,7 @@ #include <access/strat.h> #include <utils/rel.h> -extern StrategyNumber -RelationGetGISTStrategy(Relation r, +extern StrategyNumber RelationGetGISTStrategy(Relation r, AttrNumber attnum, RegProcedure proc); -#endif /* GISTSTRAT_H */ +#endif /* GISTSTRAT_H */ diff --git a/src/include/access/hash.h b/src/include/access/hash.h index bbc34dbb81..fe49bad037 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hash.h,v 1.18 1998/09/01 03:27:31 momjian Exp $ + * $Id: hash.h,v 1.19 1998/09/01 04:34:11 momjian Exp $ * * NOTES * modeled after Margo Seltzer's hash implementation for unix. @@ -248,16 +248,13 @@ typedef HashItemData *HashItem; /* public routines */ -extern void -hashbuild(Relation heap, Relation index, int natts, +extern void hashbuild(Relation heap, Relation index, int natts, AttrNumber *attnum, IndexStrategy istrat, uint16 pcount, Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo); -extern InsertIndexResult -hashinsert(Relation rel, Datum *datum, char *nulls, +extern InsertIndexResult hashinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel); extern char *hashgettuple(IndexScanDesc scan, ScanDirection dir); -extern char * -hashbeginscan(Relation rel, bool fromEnd, uint16 keysz, +extern char *hashbeginscan(Relation rel, bool fromEnd, uint16 keysz, ScanKey scankey); extern void hashrescan(IndexScanDesc scan, bool fromEnd, ScanKey scankey); extern void hashendscan(IndexScanDesc scan); @@ -285,11 +282,9 @@ extern InsertIndexResult _hash_doinsert(Relation rel, HashItem hitem); /* hashovfl.c */ extern Buffer _hash_addovflpage(Relation rel, Buffer *metabufp, Buffer buf); extern Buffer _hash_freeovflpage(Relation rel, Buffer ovflbuf); -extern int32 -_hash_initbitmap(Relation rel, HashMetaPage metap, int32 pnum, +extern int32 _hash_initbitmap(Relation rel, HashMetaPage metap, int32 pnum, int32 nbits, int32 ndx); -extern void -_hash_squeezebucket(Relation rel, HashMetaPage metap, +extern void _hash_squeezebucket(Relation rel, HashMetaPage metap, Bucket bucket); @@ -299,8 +294,7 @@ extern Buffer _hash_getbuf(Relation rel, BlockNumber blkno, int access); extern void _hash_relbuf(Relation rel, Buffer buf, int access); extern void _hash_wrtbuf(Relation rel, Buffer buf); extern void _hash_wrtnorelbuf(Relation rel, Buffer buf); -extern Page -_hash_chgbufaccess(Relation rel, Buffer *bufp, int from_access, +extern Page _hash_chgbufaccess(Relation rel, Buffer *bufp, int from_access, int to_access); extern void _hash_pageinit(Page page, Size size); extern void _hash_pagedel(Relation rel, ItemPointer tid); @@ -314,19 +308,16 @@ extern void _hash_adjscans(Relation rel, ItemPointer tid); /* hashsearch.c */ -extern void -_hash_search(Relation rel, int keysz, ScanKey scankey, +extern void _hash_search(Relation rel, int keysz, ScanKey scankey, Buffer *bufP, HashMetaPage metap); extern RetrieveIndexResult _hash_next(IndexScanDesc scan, ScanDirection dir); extern RetrieveIndexResult _hash_first(IndexScanDesc scan, ScanDirection dir); -extern bool -_hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir, +extern bool _hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir, Buffer metabuf); /* hashutil.c */ -extern ScanKey -_hash_mkscankey(Relation rel, IndexTuple itup, +extern ScanKey _hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap); extern void _hash_freeskey(ScanKey skey); extern bool _hash_checkqual(IndexScanDesc scan, IndexTuple itup); @@ -335,4 +326,4 @@ extern Bucket _hash_call(Relation rel, HashMetaPage metap, Datum key); extern uint32 _hash_log2(uint32 num); extern void _hash_checkpage(Page page, int flags); -#endif /* HASH_H */ +#endif /* HASH_H */ diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index f8e05b60cf..ecaed32c9f 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.36 1998/09/01 03:27:32 momjian Exp $ + * $Id: heapam.h,v 1.37 1998/09/01 04:34:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -127,53 +127,54 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics; ) \ ) -#else /* !defined(DISABLE_COMPLEX_MACRO) */ +#else /* !defined(DISABLE_COMPLEX_MACRO) */ extern Datum nocachegetattr(HeapTuple tup, int attnum, - TupleDesc att, bool *isnull); + TupleDesc att, bool *isnull); -static Datum fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc, - bool *isnull) +static Datum +fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc, + bool *isnull) { - return ( - (attnum) > 0 ? - ( - ((isnull) ? (*(isnull) = false) : (dummyret)NULL), - HeapTupleNoNulls(tup) ? + return ( + (attnum) > 0 ? ( - ((tupleDesc)->attrs[(attnum)-1]->attcacheoff != -1 || - (attnum) == 1) ? - ( - (Datum)fetchatt(&((tupleDesc)->attrs[(attnum)-1]), - (char *) (tup) + (tup)->t_hoff + - ( - ((attnum) != 1) ? - (tupleDesc)->attrs[(attnum)-1]->attcacheoff - : - 0 - ) - ) - ) - : - nocachegetattr((tup), (attnum), (tupleDesc), (isnull)) - ) + ((isnull) ? (*(isnull) = false) : (dummyret) NULL), + HeapTupleNoNulls(tup) ? + ( + ((tupleDesc)->attrs[(attnum) - 1]->attcacheoff != -1 || + (attnum) == 1) ? + ( + (Datum) fetchatt(&((tupleDesc)->attrs[(attnum) - 1]), + (char *) (tup) + (tup)->t_hoff + + ( + ((attnum) != 1) ? + (tupleDesc)->attrs[(attnum) - 1]->attcacheoff + : + 0 + ) + ) + ) + : + nocachegetattr((tup), (attnum), (tupleDesc), (isnull)) + ) + : + ( + att_isnull((attnum) - 1, (tup)->t_bits) ? + ( + ((isnull) ? (*(isnull) = true) : (dummyret) NULL), + (Datum) NULL + ) + : + ( + nocachegetattr((tup), (attnum), (tupleDesc), (isnull)) + ) + ) + ) : ( - att_isnull((attnum)-1, (tup)->t_bits) ? - ( - ((isnull) ? (*(isnull) = true) : (dummyret)NULL), - (Datum)NULL - ) - : - ( - nocachegetattr((tup), (attnum), (tupleDesc), (isnull)) - ) - ) - ) - : - ( - (Datum)NULL - ) + (Datum) NULL + ) ); } @@ -246,8 +247,7 @@ extern void doinsert(Relation relation, HeapTuple tup); extern Relation heap_open(Oid relationId); extern Relation heap_openr(char *relationName); extern void heap_close(Relation relation); -extern HeapScanDesc -heap_beginscan(Relation relation, int atend, +extern HeapScanDesc heap_beginscan(Relation relation, int atend, Snapshot snapshot, unsigned nkeys, ScanKey key); extern void heap_rescan(HeapScanDesc scan, bool scanFromEnd, ScanKey key); extern void heap_endscan(HeapScanDesc scan); @@ -255,31 +255,26 @@ extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw); extern HeapTuple heap_fetch(Relation relation, Snapshot snapshot, ItemPointer tid, Buffer *userbuf); extern Oid heap_insert(Relation relation, HeapTuple tup); extern int heap_delete(Relation relation, ItemPointer tid); -extern int -heap_replace(Relation relation, ItemPointer otid, +extern int heap_replace(Relation relation, ItemPointer otid, HeapTuple tup); extern void heap_markpos(HeapScanDesc scan); extern void heap_restrpos(HeapScanDesc scan); /* in common/heaptuple.c */ extern Size ComputeDataSize(TupleDesc tupleDesc, Datum *value, char *nulls); -extern void -DataFill(char *data, TupleDesc tupleDesc, +extern void DataFill(char *data, TupleDesc tupleDesc, Datum *value, char *nulls, uint16 *infomask, bits8 *bit); extern int heap_attisnull(HeapTuple tup, int attnum); extern int heap_sysattrlen(AttrNumber attno); extern bool heap_sysattrbyval(AttrNumber attno); extern Datum heap_getsysattr(HeapTuple tup, Buffer b, int attnum); -extern Datum -nocachegetattr(HeapTuple tup, int attnum, +extern Datum nocachegetattr(HeapTuple tup, int attnum, TupleDesc att, bool *isnull); extern HeapTuple heap_copytuple(HeapTuple tuple); -extern HeapTuple -heap_formtuple(TupleDesc tupleDescriptor, +extern HeapTuple heap_formtuple(TupleDesc tupleDescriptor, Datum *value, char *nulls); -extern HeapTuple -heap_modifytuple(HeapTuple tuple, +extern HeapTuple heap_modifytuple(HeapTuple tuple, Relation relation, Datum *replValue, char *replNull, char *repl); HeapTuple heap_addheader(uint32 natts, int structlen, char *structure); @@ -288,9 +283,8 @@ extern void PrintHeapAccessStatistics(HeapAccessStatistics stats); extern void initam(void); /* hio.c */ -extern void -RelationPutHeapTuple(Relation relation, BlockNumber blockIndex, +extern void RelationPutHeapTuple(Relation relation, BlockNumber blockIndex, HeapTuple tuple); extern void RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple); -#endif /* HEAPAM_H */ +#endif /* HEAPAM_H */ diff --git a/src/include/access/hio.h b/src/include/access/hio.h index 5b38a42d63..caa5380083 100644 --- a/src/include/access/hio.h +++ b/src/include/access/hio.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hio.h,v 1.7 1998/02/26 04:40:11 momjian Exp $ + * $Id: hio.h,v 1.8 1998/09/01 04:34:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,9 +17,8 @@ #include <utils/rel.h> -extern void -RelationPutHeapTuple(Relation relation, BlockNumber blockIndex, +extern void RelationPutHeapTuple(Relation relation, BlockNumber blockIndex, HeapTuple tuple); extern void RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple); -#endif /* HIO_H */ +#endif /* HIO_H */ diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 2479fe9d4b..703b032cdd 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: htup.h,v 1.9 1998/02/26 04:40:14 momjian Exp $ + * $Id: htup.h,v 1.10 1998/09/01 04:34:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -106,4 +106,4 @@ extern long heap_sysoffset[]; #define HeapTupleAllFixed(tuple) \ (!(((HeapTuple) (tuple))->t_infomask & HEAP_HASVARLENA)) -#endif /* HTUP_H */ +#endif /* HTUP_H */ diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h index 5e96f79505..f03ef639bf 100644 --- a/src/include/access/ibit.h +++ b/src/include/access/ibit.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: ibit.h,v 1.7 1997/09/08 21:50:47 momjian Exp $ + * $Id: ibit.h,v 1.8 1998/09/01 04:34:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,4 +31,4 @@ typedef IndexAttributeBitMapData *IndexAttributeBitMap; */ #define IndexAttributeBitMapIsValid(bits) PointerIsValid(bits) -#endif /* IBIT_H */ +#endif /* IBIT_H */ diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h index 977045f0dc..dbab405282 100644 --- a/src/include/access/iqual.h +++ b/src/include/access/iqual.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: iqual.h,v 1.9 1998/02/26 04:40:17 momjian Exp $ + * $Id: iqual.h,v 1.10 1998/09/01 04:34:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,8 +24,7 @@ extern int NIndexTupleProcessed; -extern bool -index_keytest(IndexTuple tuple, TupleDesc tupdesc, +extern bool index_keytest(IndexTuple tuple, TupleDesc tupdesc, int scanKeySize, ScanKey key); -#endif /* IQUAL_H */ +#endif /* IQUAL_H */ diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h index f1d202a778..2a35556fe4 100644 --- a/src/include/access/istrat.h +++ b/src/include/access/istrat.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: istrat.h,v 1.10 1998/02/26 04:40:19 momjian Exp $ + * $Id: istrat.h,v 1.11 1998/09/01 04:34:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,26 +47,21 @@ */ #define IndexStrategyIsValid(s) PointerIsValid(s) -extern StrategyMap -IndexStrategyGetStrategyMap(IndexStrategy indexStrategy, +extern StrategyMap IndexStrategyGetStrategyMap(IndexStrategy indexStrategy, StrategyNumber maxStrategyNum, AttrNumber attrNum); -extern Size -AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber, +extern Size AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber, StrategyNumber maxStrategyNumber); -extern StrategyNumber -RelationGetStrategy(Relation relation, +extern StrategyNumber RelationGetStrategy(Relation relation, AttrNumber attributeNumber, StrategyEvaluation evaluation, RegProcedure procedure); -extern bool -RelationInvokeStrategy(Relation relation, +extern bool RelationInvokeStrategy(Relation relation, StrategyEvaluation evaluation, AttrNumber attributeNumber, StrategyNumber strategy, Datum left, Datum right); -extern void -IndexSupportInitialize(IndexStrategy indexStrategy, +extern void IndexSupportInitialize(IndexStrategy indexStrategy, RegProcedure *indexSupport, Oid indexObjectId, Oid accessMethodObjectId, StrategyNumber maxStrategyNumber, StrategyNumber maxSupportNumber, AttrNumber maxAttributeNumber); -#endif /* ISTRAT_H */ +#endif /* ISTRAT_H */ diff --git a/src/include/access/itup.h b/src/include/access/itup.h index 9b02b6a937..07560fffdb 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: itup.h,v 1.15 1998/09/01 03:27:34 momjian Exp $ + * $Id: itup.h,v 1.16 1998/09/01 04:34:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -160,16 +160,13 @@ typedef struct PredInfo /* indextuple.h */ -extern IndexTuple -index_formtuple(TupleDesc tupleDescriptor, +extern IndexTuple index_formtuple(TupleDesc tupleDescriptor, Datum *value, char *null); -extern Datum -nocache_index_getattr(IndexTuple tup, int attnum, +extern Datum nocache_index_getattr(IndexTuple tup, int attnum, TupleDesc tupleDesc, bool *isnull); -extern RetrieveIndexResult -FormRetrieveIndexResult(ItemPointer indexItemPointer, +extern RetrieveIndexResult FormRetrieveIndexResult(ItemPointer indexItemPointer, ItemPointer heapItemPointer); extern void CopyIndexTuple(IndexTuple source, IndexTuple *target); -#endif /* ITUP_H */ +#endif /* ITUP_H */ diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index 5e3d03af3b..848b28164c 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.21 1998/07/30 05:05:05 vadim Exp $ + * $Id: nbtree.h,v 1.22 1998/09/01 04:34:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -73,15 +73,15 @@ typedef BTPageOpaqueData *BTPageOpaque; typedef struct BTScanOpaqueData { - Buffer btso_curbuf; - Buffer btso_mrkbuf; - ItemPointerData curHeapIptr; - ItemPointerData mrkHeapIptr; - uint16 qual_ok; /* 0 for quals like key == 1 && key > 2 */ - uint16 numberOfKeys; /* number of keys */ - uint16 numberOfFirstKeys; /* number of keys for 1st - * attribute */ - ScanKey keyData; /* key descriptor */ + Buffer btso_curbuf; + Buffer btso_mrkbuf; + ItemPointerData curHeapIptr; + ItemPointerData mrkHeapIptr; + uint16 qual_ok; /* 0 for quals like key == 1 && key > 2 */ + uint16 numberOfKeys; /* number of keys */ + uint16 numberOfFirstKeys; /* number of keys for 1st + * attribute */ + ScanKey keyData; /* key descriptor */ } BTScanOpaqueData; typedef BTScanOpaqueData *BTScanOpaque; @@ -221,13 +221,11 @@ typedef struct BTPageState /* * prototypes for functions in nbtinsert.c */ -extern InsertIndexResult -_bt_doinsert(Relation rel, BTItem btitem, +extern InsertIndexResult _bt_doinsert(Relation rel, BTItem btitem, bool index_is_unique, Relation heapRel); /* default is to allow duplicates */ -extern bool -_bt_itemcmp(Relation rel, Size keysz, BTItem item1, BTItem item2, +extern bool _bt_itemcmp(Relation rel, Size keysz, BTItem item1, BTItem item2, StrategyNumber strat); /* @@ -249,16 +247,13 @@ extern void _bt_pagedel(Relation rel, ItemPointer tid); */ extern bool BuildingBtree; /* in nbtree.c */ -extern void -btbuild(Relation heap, Relation index, int natts, +extern void btbuild(Relation heap, Relation index, int natts, AttrNumber *attnum, IndexStrategy istrat, uint16 pcount, Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo); -extern InsertIndexResult -btinsert(Relation rel, Datum *datum, char *nulls, +extern InsertIndexResult btinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel); extern char *btgettuple(IndexScanDesc scan, ScanDirection dir); -extern char * -btbeginscan(Relation rel, bool fromEnd, uint16 keysz, +extern char *btbeginscan(Relation rel, bool fromEnd, uint16 keysz, ScanKey scankey); extern void btrescan(IndexScanDesc scan, bool fromEnd, ScanKey scankey); @@ -278,17 +273,13 @@ extern void _bt_adjscans(Relation rel, ItemPointer tid, int op); /* * prototypes for functions in nbtsearch.c */ -extern BTStack -_bt_search(Relation rel, int keysz, ScanKey scankey, +extern BTStack _bt_search(Relation rel, int keysz, ScanKey scankey, Buffer *bufP); -extern Buffer -_bt_moveright(Relation rel, Buffer buf, int keysz, +extern Buffer _bt_moveright(Relation rel, Buffer buf, int keysz, ScanKey scankey, int access); -extern bool -_bt_skeycmp(Relation rel, Size keysz, ScanKey scankey, +extern bool _bt_skeycmp(Relation rel, Size keysz, ScanKey scankey, Page page, ItemId itemid, StrategyNumber strat); -extern OffsetNumber -_bt_binsrch(Relation rel, Buffer buf, int keysz, +extern OffsetNumber _bt_binsrch(Relation rel, Buffer buf, int keysz, ScanKey scankey, int srchtype); extern RetrieveIndexResult _bt_next(IndexScanDesc scan, ScanDirection dir); extern RetrieveIndexResult _bt_first(IndexScanDesc scan, ScanDirection dir); @@ -297,11 +288,9 @@ extern bool _bt_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir); /* * prototypes for functions in nbtstrat.c */ -extern StrategyNumber -_bt_getstrat(Relation rel, AttrNumber attno, +extern StrategyNumber _bt_getstrat(Relation rel, AttrNumber attno, RegProcedure proc); -extern bool -_bt_invokestrat(Relation rel, AttrNumber attno, +extern bool _bt_invokestrat(Relation rel, AttrNumber attno, StrategyNumber strat, Datum left, Datum right); /* @@ -322,4 +311,4 @@ extern void _bt_spooldestroy(void *spool); extern void _bt_spool(Relation index, BTItem btitem, void *spool); extern void _bt_leafbuild(Relation index, void *spool); -#endif /* NBTREE_H */ +#endif /* NBTREE_H */ diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h index a86a4596d6..4b7aa7c2dd 100644 --- a/src/include/access/printtup.h +++ b/src/include/access/printtup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: printtup.h,v 1.4 1997/09/08 02:34:19 momjian Exp $ + * $Id: printtup.h,v 1.5 1998/09/01 04:34:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern void debugtup(HeapTuple tuple, TupleDesc typeinfo); extern void printtup_internal(HeapTuple tuple, TupleDesc typeinfo); extern Oid gettypelem(Oid type); -#endif /* PRINTTUP_H */ +#endif /* PRINTTUP_H */ diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index efb970b44b..c16b022bf2 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: relscan.h,v 1.11 1998/07/27 19:38:29 vadim Exp $ + * $Id: relscan.h,v 1.12 1998/09/01 04:34:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -80,4 +80,4 @@ typedef IndexScanDesc *IndexScanDescPtr; */ #define IndexScanIsValid(scan) PointerIsValid(scan) -#endif /* RELSCAN_H */ +#endif /* RELSCAN_H */ diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h index ea45c08c11..a31f2c2d64 100644 --- a/src/include/access/rtree.h +++ b/src/include/access/rtree.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rtree.h,v 1.12 1998/02/26 04:40:25 momjian Exp $ + * $Id: rtree.h,v 1.13 1998/09/01 04:34:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -114,34 +114,29 @@ extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir); * RTree code. * Defined in access/index-rtree/ */ -extern InsertIndexResult -rtinsert(Relation r, Datum *datum, char *nulls, +extern InsertIndexResult rtinsert(Relation r, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel); extern char *rtdelete(Relation r, ItemPointer tid); extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir); -extern IndexScanDesc -rtbeginscan(Relation r, bool fromEnd, uint16 nkeys, +extern IndexScanDesc rtbeginscan(Relation r, bool fromEnd, uint16 nkeys, ScanKey key); extern void rtendscan(IndexScanDesc s); extern void rtmarkpos(IndexScanDesc s); extern void rtrestrpos(IndexScanDesc s); extern void rtrescan(IndexScanDesc s, bool fromEnd, ScanKey key); -extern void -rtbuild(Relation heap, Relation index, int natts, +extern void rtbuild(Relation heap, Relation index, int natts, AttrNumber *attnum, IndexStrategy istrat, uint16 pcount, Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo); extern void _rtdump(Relation r); /* rtscan.c */ -extern void -rtadjscans(Relation r, int op, BlockNumber blkno, +extern void rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); /* rtstrat.h */ -extern RegProcedure -RTMapOperator(Relation r, AttrNumber attnum, +extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum, RegProcedure proc); -#endif /* RTREE_H */ +#endif /* RTREE_H */ diff --git a/src/include/access/rtscan.h b/src/include/access/rtscan.h index f3b450023a..067c8374b0 100644 --- a/src/include/access/rtscan.h +++ b/src/include/access/rtscan.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rtscan.h,v 1.4 1997/11/26 01:12:06 momjian Exp $ + * $Id: rtscan.h,v 1.5 1998/09/01 04:34:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,4 @@ void rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); -#endif /* RTSCAN_H */ +#endif /* RTSCAN_H */ diff --git a/src/include/access/rtstrat.h b/src/include/access/rtstrat.h index 06236ae220..f9d3639da3 100644 --- a/src/include/access/rtstrat.h +++ b/src/include/access/rtstrat.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rtstrat.h,v 1.7 1998/02/26 04:40:26 momjian Exp $ + * $Id: rtstrat.h,v 1.8 1998/09/01 04:34:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,8 +16,7 @@ #include <utils/rel.h> #include <access/attnum.h> -extern RegProcedure -RTMapOperator(Relation r, AttrNumber attnum, +extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum, RegProcedure proc); -#endif /* RTSTRAT_H */ +#endif /* RTSTRAT_H */ diff --git a/src/include/access/sdir.h b/src/include/access/sdir.h index cc8826c528..89aa8b25c9 100644 --- a/src/include/access/sdir.h +++ b/src/include/access/sdir.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: sdir.h,v 1.3 1997/09/07 04:56:12 momjian Exp $ + * $Id: sdir.h,v 1.4 1998/09/01 04:34:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -54,4 +54,4 @@ typedef enum ScanDirection #define ScanDirectionIsForward(direction) \ ((bool) (direction == ForwardScanDirection)) -#endif /* SDIR_H */ +#endif /* SDIR_H */ diff --git a/src/include/access/skey.h b/src/include/access/skey.h index af60c7656a..c4d3aa7e50 100644 --- a/src/include/access/skey.h +++ b/src/include/access/skey.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: skey.h,v 1.9 1998/02/26 04:40:27 momjian Exp $ + * $Id: skey.h,v 1.10 1998/09/01 04:34:29 momjian Exp $ * * * Note: @@ -46,8 +46,7 @@ typedef ScanKeyData *ScanKey; * prototypes for functions in access/common/scankey.c */ extern void ScanKeyEntrySetIllegal(ScanKey entry); -extern void -ScanKeyEntryInitialize(ScanKey entry, bits16 flags, +extern void ScanKeyEntryInitialize(ScanKey entry, bits16 flags, AttrNumber attributeNumber, RegProcedure procedure, Datum argument); -#endif /* SKEY_H */ +#endif /* SKEY_H */ diff --git a/src/include/access/strat.h b/src/include/access/strat.h index a5d08ed2b4..305911ce70 100644 --- a/src/include/access/strat.h +++ b/src/include/access/strat.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: strat.h,v 1.10 1998/08/11 19:32:39 momjian Exp $ + * $Id: strat.h,v 1.11 1998/09/01 04:34:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,6 +29,8 @@ typedef struct StrategyTransformMapData * * * + * + * * STRUCTURE */ typedef StrategyTransformMapData *StrategyTransformMap; @@ -90,4 +92,4 @@ typedef struct IndexStrategyData typedef IndexStrategyData *IndexStrategy; -#endif /* STRAT_H */ +#endif /* STRAT_H */ diff --git a/src/include/access/transam.h b/src/include/access/transam.h index 2662c7ad2e..0d6d3e4bbf 100644 --- a/src/include/access/transam.h +++ b/src/include/access/transam.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: transam.h,v 1.15 1998/07/21 06:17:39 vadim Exp $ + * $Id: transam.h,v 1.16 1998/09/01 04:34:31 momjian Exp $ * * NOTES * Transaction System Version 101 now support proper oid @@ -124,13 +124,13 @@ typedef VariableRelationContentsData *VariableRelationContents; */ typedef struct VariableCacheData { - uint32 xid_count; - TransactionId nextXid; - uint32 oid_count; /* not implemented, yet */ - Oid nextOid; -} VariableCacheData; + uint32 xid_count; + TransactionId nextXid; + uint32 oid_count; /* not implemented, yet */ + Oid nextOid; +} VariableCacheData; -typedef VariableCacheData *VariableCache; +typedef VariableCacheData *VariableCache; /* ---------------- * extern declarations @@ -148,14 +148,11 @@ extern void TransactionIdAbort(TransactionId transactionId); /* in transam/transsup.c */ extern void AmiTransactionOverride(bool flag); -extern void -TransComputeBlockNumber(Relation relation, +extern void TransComputeBlockNumber(Relation relation, TransactionId transactionId, BlockNumber *blockNumberOutP); -extern XidStatus -TransBlockNumberGetXidStatus(Relation relation, +extern XidStatus TransBlockNumberGetXidStatus(Relation relation, BlockNumber blockNumber, TransactionId xid, bool *failP); -extern void -TransBlockNumberSetXidStatus(Relation relation, +extern void TransBlockNumberSetXidStatus(Relation relation, BlockNumber blockNumber, TransactionId xid, XidStatus xstatus, bool *failP); @@ -189,4 +186,4 @@ extern bool AMI_OVERRIDE; /* in varsup.c */ extern int OidGenLockId; -#endif /* TRAMSAM_H */ +#endif /* TRAMSAM_H */ diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index 050fba81f5..43432b3e17 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tupdesc.h,v 1.19 1998/09/01 03:27:35 momjian Exp $ + * $Id: tupdesc.h,v 1.20 1998/09/01 04:34:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,11 +53,11 @@ typedef struct tupleDesc Form_pg_attribute *attrs; /* attrs[N] is a pointer to the description of Attribute Number N+1. */ TupleConstr *constr; -} *TupleDesc; +} *TupleDesc; extern TupleDesc CreateTemplateTupleDesc(int natts); -extern TupleDesc CreateTupleDesc(int natts, Form_pg_attribute *attrs); +extern TupleDesc CreateTupleDesc(int natts, Form_pg_attribute * attrs); extern TupleDesc CreateTupleDescCopy(TupleDesc tupdesc); @@ -65,8 +65,7 @@ extern TupleDesc CreateTupleDescCopyConstr(TupleDesc tupdesc); extern void FreeTupleDesc(TupleDesc tupdesc); -extern bool -TupleDescInitEntry(TupleDesc desc, +extern bool TupleDescInitEntry(TupleDesc desc, AttrNumber attributeNumber, char *attributeName, Oid typeid, @@ -76,4 +75,4 @@ TupleDescInitEntry(TupleDesc desc, extern TupleDesc BuildDescForRelation(List *schema, char *relname); -#endif /* TUPDESC_H */ +#endif /* TUPDESC_H */ diff --git a/src/include/access/valid.h b/src/include/access/valid.h index 2eeed643fb..aadaf827c4 100644 --- a/src/include/access/valid.h +++ b/src/include/access/valid.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: valid.h,v 1.14 1998/09/01 03:27:38 momjian Exp $ + * $Id: valid.h,v 1.15 1998/09/01 04:34:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -156,4 +156,4 @@ do \ extern bool TupleUpdatedByCurXactAndCmd(HeapTuple t); -#endif /* VALID_H */ +#endif /* VALID_H */ diff --git a/src/include/access/xact.h b/src/include/access/xact.h index fa24882061..a612910047 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: xact.h,v 1.14 1998/07/27 19:38:30 vadim Exp $ + * $Id: xact.h,v 1.15 1998/09/01 04:34:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,21 +22,21 @@ */ typedef struct TransactionStateData { - TransactionId transactionIdData; - CommandId commandId; - CommandId scanCommandId; - AbsoluteTime startTime; - int state; - int blockState; + TransactionId transactionIdData; + CommandId commandId; + CommandId scanCommandId; + AbsoluteTime startTime; + int state; + int blockState; } TransactionStateData; /* * Xact isolation levels */ -#define XACT_DIRTY_READ 0 /* not implemented */ -#define XACT_READ_COMMITTED 1 -#define XACT_REPEATABLE_READ 2 /* not implemented */ -#define XACT_SERIALIZED 3 +#define XACT_DIRTY_READ 0 /* not implemented */ +#define XACT_READ_COMMITTED 1 +#define XACT_REPEATABLE_READ 2 /* not implemented */ +#define XACT_SERIALIZED 3 /* ---------------- * transaction states @@ -117,4 +117,4 @@ extern bool xideq(TransactionId xid1, TransactionId xid2); extern bool TransactionIdIsLessThan(TransactionId id1, TransactionId id2); extern void TransactionIdAdd(TransactionId *xid, int value); -#endif /* XACT_H */ +#endif /* XACT_H */ |