diff options
Diffstat (limited to 'src/include/access')
-rw-r--r-- | src/include/access/genam.h | 20 | ||||
-rw-r--r-- | src/include/access/gist.h | 9 | ||||
-rw-r--r-- | src/include/access/gistscan.h | 3 | ||||
-rw-r--r-- | src/include/access/giststrat.h | 3 | ||||
-rw-r--r-- | src/include/access/hash.h | 29 | ||||
-rw-r--r-- | src/include/access/heapam.h | 29 | ||||
-rw-r--r-- | src/include/access/hio.h | 5 | ||||
-rw-r--r-- | src/include/access/htup.h | 26 | ||||
-rw-r--r-- | src/include/access/iqual.h | 5 | ||||
-rw-r--r-- | src/include/access/istrat.h | 17 | ||||
-rw-r--r-- | src/include/access/itup.h | 17 | ||||
-rw-r--r-- | src/include/access/nbtree.h | 35 | ||||
-rw-r--r-- | src/include/access/rtree.h | 17 | ||||
-rw-r--r-- | src/include/access/rtstrat.h | 5 | ||||
-rw-r--r-- | src/include/access/skey.h | 5 | ||||
-rw-r--r-- | src/include/access/strat.h | 3 | ||||
-rw-r--r-- | src/include/access/transam.h | 27 | ||||
-rw-r--r-- | src/include/access/tupdesc.h | 5 | ||||
-rw-r--r-- | src/include/access/tupmacs.h | 4 | ||||
-rw-r--r-- | src/include/access/xact.h | 4 |
20 files changed, 164 insertions, 104 deletions
diff --git a/src/include/access/genam.h b/src/include/access/genam.h index 79aa1fc89f7..b92e38379bd 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.11 1998/01/24 22:47:48 momjian Exp $ + * $Id: genam.h,v 1.12 1998/02/26 04:39:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,25 +25,31 @@ 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 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, Buffer buffer); /* 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); diff --git a/src/include/access/gist.h b/src/include/access/gist.h index 4c665aeaecc..15294ce06cc 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -188,18 +188,21 @@ 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); diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h index e38b26d9904..071238bd173 100644 --- a/src/include/access/gistscan.h +++ b/src/include/access/gistscan.h @@ -16,7 +16,8 @@ #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); diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h index f5e6e45d777..1007dd3ec26 100644 --- a/src/include/access/giststrat.h +++ b/src/include/access/giststrat.h @@ -15,7 +15,8 @@ #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 */ diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 268edd82eaf..b74b074e81e 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.12 1998/01/24 22:47:55 momjian Exp $ + * $Id: hash.h,v 1.13 1998/02/26 04:39:59 momjian Exp $ * * NOTES * modeled after Margo Seltzer's hash implementation for unix. @@ -248,13 +248,16 @@ 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,9 +288,11 @@ 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); @@ -297,7 +302,8 @@ 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); @@ -311,16 +317,19 @@ 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); diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index ad1114c5bf0..7dc25337357 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.29 1998/02/06 20:18:00 momjian Exp $ + * $Id: heapam.h,v 1.30 1998/02/26 04:40:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -99,7 +99,7 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics; (attnum) == 1) ? \ ( \ (Datum)fetchatt(&((tupleDesc)->attrs[(attnum)-1]), \ - (char *) (tup) + (tup)->t_hoff + \ + (char *) (tup) + (tup)->t_hoff + \ ( \ ((attnum) != 1) ? \ (tupleDesc)->attrs[(attnum)-1]->attcacheoff \ @@ -131,7 +131,7 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics; ) - + /* ---------------- * heap_getattr * @@ -205,7 +205,8 @@ 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, bool seeself, unsigned nkeys, ScanKey key); extern void heap_rescan(HeapScanDesc sdesc, bool scanFromEnd, ScanKey key); extern void heap_endscan(HeapScanDesc sdesc); @@ -213,26 +214,31 @@ extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw, Buffer *b); extern HeapTuple heap_fetch(Relation relation, bool seeself, ItemPointer tid, Buffer *b); 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 sdesc); extern void heap_restrpos(HeapScanDesc sdesc); /* 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, - TupleDesc att, bool *isnull); +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, Buffer buffer, +extern HeapTuple +heap_modifytuple(HeapTuple tuple, Buffer buffer, Relation relation, Datum replValue[], char replNull[], char repl[]); HeapTuple heap_addheader(uint32 natts, int structlen, char *structure); @@ -241,7 +247,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); diff --git a/src/include/access/hio.h b/src/include/access/hio.h index 0f7c40e1ed2..5b38a42d634 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.6 1998/01/24 22:48:01 momjian Exp $ + * $Id: hio.h,v 1.7 1998/02/26 04:40:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +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); diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 6e7674ea7c8..2479fe9d4b5 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.8 1998/01/31 04:39:22 momjian Exp $ + * $Id: htup.h,v 1.9 1998/02/26 04:40:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,25 +28,25 @@ */ typedef struct HeapTupleData { - unsigned int t_len; /* length of entire tuple */ + unsigned int t_len; /* length of entire tuple */ - Oid t_oid; /* OID of this tuple -- 4 bytes */ + Oid t_oid; /* OID of this tuple -- 4 bytes */ - CommandId t_cmin; /* insert CID stamp -- 4 bytes each */ - CommandId t_cmax; /* delete CommandId stamp */ + CommandId t_cmin; /* insert CID stamp -- 4 bytes each */ + CommandId t_cmax; /* delete CommandId stamp */ - TransactionId t_xmin; /* insert XID stamp -- 4 bytes each */ - TransactionId t_xmax; /* delete XID stamp */ + TransactionId t_xmin; /* insert XID stamp -- 4 bytes each */ + TransactionId t_xmax; /* delete XID stamp */ - ItemPointerData t_ctid; /* current TID of this tuple */ - - int16 t_natts; /* number of attributes */ + ItemPointerData t_ctid; /* current TID of this tuple */ - uint16 t_infomask; /* various infos */ + int16 t_natts; /* number of attributes */ - uint8 t_hoff; /* sizeof tuple header */ + uint16 t_infomask; /* various infos */ - bits8 t_bits[MinHeapTupleBitmapSize / 8]; + uint8 t_hoff; /* sizeof tuple header */ + + bits8 t_bits[MinHeapTupleBitmapSize / 8]; /* bit map of domains */ /* MORE DATA FOLLOWS AT END OF STRUCT */ diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h index 3cc1700f9c2..977045f0dc3 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.8 1998/01/24 22:48:05 momjian Exp $ + * $Id: iqual.h,v 1.9 1998/02/26 04:40:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,8 @@ 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 */ diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h index f2dcf2f554d..f1d202a7788 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.9 1998/01/24 22:48:05 momjian Exp $ + * $Id: istrat.h,v 1.10 1998/02/26 04:40:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,18 +47,23 @@ */ #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); diff --git a/src/include/access/itup.h b/src/include/access/itup.h index b230ab2265e..68fa5e2a7b0 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.12 1998/02/06 20:18:01 momjian Exp $ + * $Id: itup.h,v 1.13 1998/02/26 04:40:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -127,7 +127,7 @@ typedef struct PredInfo (attnum) == 1) ? \ ( \ (Datum)fetchatt(&((tupleDesc)->attrs[(attnum)-1]), \ - (char *) (tup) + \ + (char *) (tup) + \ ( \ IndexTupleHasMinHeader(tup) ? \ sizeof (*(tup)) \ @@ -164,13 +164,16 @@ 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, - TupleDesc tupleDesc, bool *isnull); -extern RetrieveIndexResult FormRetrieveIndexResult(ItemPointer indexItemPointer, +extern Datum +nocache_index_getattr(IndexTuple tup, int attnum, + TupleDesc tupleDesc, bool *isnull); +extern RetrieveIndexResult +FormRetrieveIndexResult(ItemPointer indexItemPointer, ItemPointer heapItemPointer); extern void CopyIndexTuple(IndexTuple source, IndexTuple *target); diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index 8370422efc8..c7012005563 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.19 1998/01/24 22:48:07 momjian Exp $ + * $Id: nbtree.h,v 1.20 1998/02/26 04:40:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -213,11 +213,13 @@ 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); /* @@ -239,13 +241,16 @@ 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); @@ -265,13 +270,17 @@ 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); @@ -280,9 +289,11 @@ 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); /* diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h index 2af1c90a8ce..ea45c08c113 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.11 1998/01/24 22:48:08 momjian Exp $ + * $Id: rtree.h,v 1.12 1998/02/26 04:40:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -114,29 +114,34 @@ 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 */ diff --git a/src/include/access/rtstrat.h b/src/include/access/rtstrat.h index edb6b32db59..06236ae220a 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.6 1998/01/24 22:48:08 momjian Exp $ + * $Id: rtstrat.h,v 1.7 1998/02/26 04:40:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,7 +16,8 @@ #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 */ diff --git a/src/include/access/skey.h b/src/include/access/skey.h index e51b521518c..af60c7656ab 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.8 1998/01/24 22:48:10 momjian Exp $ + * $Id: skey.h,v 1.9 1998/02/26 04:40:27 momjian Exp $ * * * Note: @@ -46,7 +46,8 @@ 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 */ diff --git a/src/include/access/strat.h b/src/include/access/strat.h index 0ad737b36ce..0c3e82e9a2a 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.8 1997/09/08 21:51:02 momjian Exp $ + * $Id: strat.h,v 1.9 1998/02/26 04:40:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,6 +28,7 @@ typedef struct StrategyTransformMapData * * * + * * STRUCTURE */ typedef StrategyTransformMapData *StrategyTransformMap; diff --git a/src/include/access/transam.h b/src/include/access/transam.h index 7f8417ca0f7..282e0ce8479 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.13 1998/01/24 22:48:11 momjian Exp $ + * $Id: transam.h,v 1.14 1998/02/26 04:40:30 momjian Exp $ * * NOTES * Transaction System Version 101 now support proper oid @@ -41,10 +41,10 @@ * commiting of child xactions. * ---------------- */ -#define XID_COMMIT 2 /* transaction commited */ -#define XID_ABORT 1 /* transaction aborted */ -#define XID_INPROGRESS 0 /* transaction in progress */ -#define XID_COMMIT_CHILD 3 /* child xact commited */ +#define XID_COMMIT 2 /* transaction commited */ +#define XID_ABORT 1 /* transaction aborted */ +#define XID_INPROGRESS 0 /* transaction in progress */ +#define XID_COMMIT_CHILD 3 /* child xact commited */ typedef unsigned char XidStatus;/* (2 bits) */ @@ -106,10 +106,10 @@ typedef LogRelationContentsData *LogRelationContents; */ typedef struct VariableRelationContentsData { - int TransSystemVersion; - TransactionId nextXidData; - TransactionId lastXidData; /* unused */ - Oid nextOid; + int TransSystemVersion; + TransactionId nextXidData; + TransactionId lastXidData; /* unused */ + Oid nextOid; } VariableRelationContentsData; typedef VariableRelationContentsData *VariableRelationContents; @@ -130,11 +130,14 @@ 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); diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index 4af80270684..276a83b86b3 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.15 1998/02/10 16:03:57 momjian Exp $ + * $Id: tupdesc.h,v 1.16 1998/02/26 04:40:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,7 +65,8 @@ 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, diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h index c7711f5333a..173ac2cdcbe 100644 --- a/src/include/access/tupmacs.h +++ b/src/include/access/tupmacs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tupmacs.h,v 1.3 1998/02/01 05:38:40 momjian Exp $ + * $Id: tupmacs.h,v 1.4 1998/02/26 04:40:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,7 +51,7 @@ ( \ (char *) (long) *((int32 *)(T)) \ ) \ - : \ + : \ ( \ (*(A))->attlen < sizeof(int16) ? \ (char *) (long) *((char *)(T)) \ diff --git a/src/include/access/xact.h b/src/include/access/xact.h index 92588e3512b..60bd8cab611 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.11 1997/11/07 18:39:38 thomas Exp $ + * $Id: xact.h,v 1.12 1998/02/26 04:40:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,7 +57,7 @@ typedef TransactionStateData *TransactionState; #define TransactionIdIsValid(xid) ((bool) (xid != NullTransactionId)) #define TransactionIdStore(xid, dest) \ (*((TransactionId*)dest) = (TransactionId)xid) -#define StoreInvalidTransactionId(dest) \ +#define StoreInvalidTransactionId(dest) \ (*((TransactionId*)dest) = NullTransactionId) /* ---------------- |