diff options
author | Bruce Momjian <bruce@momjian.us> | 1998-09-01 04:40:42 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 1998-09-01 04:40:42 +0000 |
commit | fa1a8d6a97068295fe30ac646aec7493a6305bc2 (patch) | |
tree | 645f7cef3c78fbab4d6d7bbc7c9a61ad2893d273 /src/include | |
parent | af74855a608da4cd7ef88ceb2241ec1c75537f39 (diff) | |
download | postgresql-fa1a8d6a97068295fe30ac646aec7493a6305bc2.tar.gz postgresql-fa1a8d6a97068295fe30ac646aec7493a6305bc2.zip |
OK, folks, here is the pgindent output.
Diffstat (limited to 'src/include')
265 files changed, 1316 insertions, 1531 deletions
diff --git a/src/include/access/attnum.h b/src/include/access/attnum.h index eb1194f5f32..e85a1602624 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 a996bb4738e..d30dcc704f0 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 7885d1cd0d9..647d2d7ff8b 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 15294ce06cc..8bcf24ae7f5 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 071238bd173..553705f1396 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 1007dd3ec26..9fb0a10da6b 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 bbc34dbb810..fe49bad037c 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 f8e05b60cf6..ecaed32c9fe 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 5b38a42d634..caa5380083d 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 2479fe9d4b5..703b032cdd1 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 5e96f795058..f03ef639bf9 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 977045f0dc3..dbab4052821 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 f1d202a7788..2a35556fe47 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 9b02b6a937f..07560fffdbc 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 5e3d03af3b8..848b28164c1 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 a86a4596d66..4b7aa7c2dd6 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 efb970b44bd..c16b022bf28 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 ea45c08c113..a31f2c2d645 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 f3b450023a3..067c8374b0f 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 06236ae220a..f9d3639da35 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 cc8826c528c..89aa8b25c9d 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 af60c7656ab..c4d3aa7e508 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 a5d08ed2b40..305911ce709 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 2662c7ad2e5..0d6d3e4bbff 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 050fba81f5d..43432b3e17d 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 2eeed643fb7..aadaf827c4b 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 fa24882061f..a6129100477 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 */ diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index e357f9ecc4e..7726228014a 100644 --- a/src/include/bootstrap/bootstrap.h +++ b/src/include/bootstrap/bootstrap.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: bootstrap.h,v 1.12 1998/09/01 03:27:40 momjian Exp $ + * $Id: bootstrap.h,v 1.13 1998/09/01 04:34:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,8 +33,7 @@ extern int numattr; extern int DebugMode; extern int BootstrapMain(int ac, char *av[]); -extern void -index_register(char *heap, +extern void index_register(char *heap, char *ind, int natts, AttrNumber *attnos, @@ -57,4 +56,4 @@ extern char *CleanUpStr(char *s); extern int EnterString(char *str); extern void build_indices(void); -#endif /* BOOTSTRAP_H */ +#endif /* BOOTSTRAP_H */ diff --git a/src/include/c.h b/src/include/c.h index 3d7c08ddd4f..02d469bee94 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.44 1998/08/29 04:05:41 momjian Exp $ + * $Id: c.h,v 1.45 1998/09/01 04:33:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,16 +63,16 @@ #ifndef __cplusplus typedef char bool; -#endif /* not C++ */ +#endif /* not C++ */ typedef bool *BoolPtr; #ifndef TRUE #define TRUE 1 -#endif /* TRUE */ +#endif /* TRUE */ #ifndef FALSE #define FALSE 0 -#endif /* FALSE */ +#endif /* FALSE */ /* ---------------------------------------------------------------- * Section 2: __STDC__, non-ansi C definitions: @@ -102,13 +102,13 @@ typedef char *Pointer; * Null pointer. */ #define NULL ((void *) 0) -#endif /* !defined(NULL) */ +#endif /* !defined(NULL) */ #define HAVE_ANSI_CPP /* all ANSI C compilers must have this! */ #if defined(NEED_STD_HDRS) #undef NEED_STD_HDRS /* all ANSI systems must have * stddef/stdlib */ -#endif /* NEED_STD_HDRS */ +#endif /* NEED_STD_HDRS */ #else /* !defined(__STDC__) *//* NOT ANSI C */ @@ -124,7 +124,7 @@ typedef char *Pointer; * Null pointer. */ #define NULL 0 -#endif /* !defined(NULL) */ +#endif /* !defined(NULL) */ /* * const -- @@ -153,7 +153,7 @@ typedef char *Pointer; */ #define volatile /* volatile */ -#endif /* !defined(__STDC__) *//* NOT ANSI C */ +#endif /* !defined(__STDC__) */ /* NOT ANSI C */ /* * CppAsString -- @@ -181,7 +181,7 @@ typedef char *Pointer; #define _priv_CppIdentity(x)x #define CppConcat(x, y) _priv_CppIdentity(x)y -#endif /* !HAVE_ANSI_CPP */ +#endif /* !HAVE_ANSI_CPP */ #ifndef __GNUC__ /* GNU cc */ #endif @@ -207,7 +207,7 @@ typedef char *Pointer; #else /* NEED_STD_HDRS */ #include <stddef.h> #include <stdlib.h> -#endif /* NEED_STD_HDRS */ +#endif /* NEED_STD_HDRS */ /* ---------------------------------------------------------------- * Section 3: standard system types @@ -555,7 +555,7 @@ typedef Datum *DatumPtr; */ #ifndef offsetof #define offsetof(type, field) ((long) &((type *)0)->field) -#endif /* offsetof */ +#endif /* offsetof */ /* * lengthof -- @@ -633,8 +633,9 @@ typedef struct Exception #define AssertState(condition) \ Trap(!(condition), BadState) -extern int assert_enabled; -#endif /* USE_ASSERT_CHECKING */ +extern int assert_enabled; + +#endif /* USE_ASSERT_CHECKING */ /* * LogTrap -- @@ -676,10 +677,12 @@ extern int assert_enabled; LogTrap(!(condition), BadState, printArgs) extern int assertEnable(int val); + #ifdef ASSERT_CHECKING_TEST extern int assertTest(int val); + #endif -#endif /* USE_ASSERT_CHECKING */ +#endif /* USE_ASSERT_CHECKING */ /* ---------------------------------------------------------------- * Section 8: Min, Max, Abs macros @@ -756,8 +759,7 @@ extern Exception BadArg; extern Exception BadState; /* in utils/error/assert.c */ -extern int -ExceptionalCondition(char *conditionName, +extern int ExceptionalCondition(char *conditionName, Exception *exceptionP, char *details, char *fileName, int lineNumber); @@ -804,7 +806,7 @@ extern char *form(const char *fmt,...); #ifdef FIXADE #if defined(hpux) #include "port/hpux/fixade.h" /* for unaligned access fixup */ -#endif /* hpux */ +#endif /* hpux */ #endif #if defined(sun) && defined(sparc) && !defined(__SVR4) @@ -821,4 +823,4 @@ extern char *form(const char *fmt,...); * end of c.h * ---------------- */ -#endif /* C_H */ +#endif /* C_H */ diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h index dfa041f4215..7fc7ed9fc82 100644 --- a/src/include/catalog/catalog.h +++ b/src/include/catalog/catalog.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: catalog.h,v 1.5 1998/09/01 03:27:42 momjian Exp $ + * $Id: catalog.h,v 1.6 1998/09/01 04:34:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,4 @@ extern bool IsSharedSystemRelationName(char *relname); extern Oid newoid(void); extern void fillatt(TupleDesc att); -#endif /* CATALOG_H */ +#endif /* CATALOG_H */ diff --git a/src/include/catalog/catname.h b/src/include/catalog/catname.h index 04d1696d76a..3c25cdece25 100644 --- a/src/include/catalog/catname.h +++ b/src/include/catalog/catname.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: catname.h,v 1.9 1998/02/25 13:09:21 scrappy Exp $ + * $Id: catname.h,v 1.10 1998/09/01 04:34:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,4 +46,4 @@ extern char *SharedSystemRelationNames[]; -#endif /* CATNAME_H */ +#endif /* CATNAME_H */ diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h index 7f0f91df1ee..545bc7c5b8c 100644 --- a/src/include/catalog/heap.h +++ b/src/include/catalog/heap.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: heap.h,v 1.15 1998/09/01 03:27:44 momjian Exp $ + * $Id: heap.h,v 1.16 1998/09/01 04:34:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,8 +17,8 @@ extern Relation heap_create(char *relname, TupleDesc att); -extern Oid heap_create_with_catalog(char *relname, - TupleDesc tupdesc, char relkind); +extern Oid heap_create_with_catalog(char *relname, + TupleDesc tupdesc, char relkind); extern void heap_destroy_with_catalog(char *relname); extern void heap_destroy(Relation rel); @@ -26,4 +26,4 @@ extern void heap_destroy(Relation rel); extern void InitTempRelList(void); extern void DestroyTempRels(void); -#endif /* HEAP_H */ +#endif /* HEAP_H */ diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index f4fcce96579..d377832241b 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: index.h,v 1.12 1998/09/01 03:27:46 momjian Exp $ + * $Id: index.h,v 1.13 1998/09/01 04:34:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,13 +22,11 @@ extern Form_pg_am AccessMethodObjectIdGetForm(Oid accessMethodObjectId); extern void UpdateIndexPredicate(Oid indexoid, Node *oldPred, Node *predicate); -extern void -InitIndexStrategy(int numatts, +extern void InitIndexStrategy(int numatts, Relation indexRelation, Oid accessMethodObjectId); -extern void -index_create(char *heapRelationName, +extern void index_create(char *heapRelationName, char *indexRelationName, FuncIndexInfo *funcInfo, List *attributeList, @@ -44,20 +42,17 @@ index_create(char *heapRelationName, extern void index_destroy(Oid indexId); -extern void -FormIndexDatum(int numberOfAttributes, +extern void FormIndexDatum(int numberOfAttributes, AttrNumber *attributeNumber, HeapTuple heapTuple, TupleDesc heapDescriptor, Datum *datum, char *nullv, FuncIndexInfoPtr fInfo); extern void UpdateStats(Oid relid, long reltuples, bool hasindex); -extern void -FillDummyExprContext(ExprContext *econtext, TupleTableSlot *slot, +extern void FillDummyExprContext(ExprContext *econtext, TupleTableSlot *slot, TupleDesc tupdesc, Buffer buffer); -extern void -index_build(Relation heapRelation, Relation indexRelation, +extern void index_build(Relation heapRelation, Relation indexRelation, int numberOfAttributes, AttrNumber *attributeNumber, uint16 parameterCount, Datum *parameter, FuncIndexInfo *funcInfo, PredInfo *predInfo); @@ -65,4 +60,4 @@ index_build(Relation heapRelation, Relation indexRelation, extern bool IndexIsUnique(Oid indexId); extern bool IndexIsUniqueNoCache(Oid indexId); -#endif /* INDEX_H */ +#endif /* INDEX_H */ diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h index 7f0b440a79d..dd9b4c40267 100644 --- a/src/include/catalog/indexing.h +++ b/src/include/catalog/indexing.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: indexing.h,v 1.17 1998/09/01 03:27:47 momjian Exp $ + * $Id: indexing.h,v 1.18 1998/09/01 04:34:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -66,25 +66,21 @@ extern char *IndexedCatalogNames[]; */ extern void CatalogOpenIndices(int nIndices, char **names, Relation *idescs); extern void CatalogCloseIndices(int nIndices, Relation *idescs); -extern void -CatalogIndexInsert(Relation *idescs, +extern void CatalogIndexInsert(Relation *idescs, int nIndices, Relation heapRelation, HeapTuple heapTuple); extern bool CatalogHasIndex(char *catName, Oid catId); -extern HeapTuple -AttributeNameIndexScan(Relation heapRelation, +extern HeapTuple AttributeNameIndexScan(Relation heapRelation, Oid relid, char *attname); -extern HeapTuple -AttributeNumIndexScan(Relation heapRelation, +extern HeapTuple AttributeNumIndexScan(Relation heapRelation, Oid relid, AttrNumber attnum); extern HeapTuple ProcedureOidIndexScan(Relation heapRelation, Oid procId); -extern HeapTuple -ProcedureNameIndexScan(Relation heapRelation, +extern HeapTuple ProcedureNameIndexScan(Relation heapRelation, char *procName, int2 nargs, Oid *argTypes); extern HeapTuple ProcedureSrcIndexScan(Relation heapRelation, text *procSrc); extern HeapTuple TypeOidIndexScan(Relation heapRelation, Oid typeId); @@ -125,4 +121,4 @@ DECLARE_INDEX(pg_description_objoid_index on pg_description using btree(objoid o /* now build indices in the initialization scripts */ BUILD_INDICES -#endif /* INDEXING_H */ +#endif /* INDEXING_H */ diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h index fd45b249887..a4acb012f82 100644 --- a/src/include/catalog/pg_aggregate.h +++ b/src/include/catalog/pg_aggregate.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_aggregate.h,v 1.16 1998/08/11 18:28:36 momjian Exp $ + * $Id: pg_aggregate.h,v 1.17 1998/09/01 04:34:45 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -88,7 +88,7 @@ typedef FormData_pg_aggregate *Form_pg_aggregate; * --------------- */ -DATA(insert OID = 0 ( avg PGUID int8pl int4inc int84div 20 20 23 20 _null_ 0 )); +DATA(insert OID = 0 ( avg PGUID int8pl int4inc int84div 20 20 23 20 _null_ 0 )); DATA(insert OID = 0 ( avg PGUID int4pl int4inc int4div 23 23 23 23 _null_ 0 )); DATA(insert OID = 0 ( avg PGUID int2pl int2inc int2div 21 21 21 21 _null_ 0 )); DATA(insert OID = 0 ( avg PGUID float4pl float4inc float4div 700 700 700 700 _null_ 0.0 )); @@ -133,8 +133,7 @@ DATA(insert OID = 0 ( count PGUID - int4inc - 0 0 23 23 _null_ 0 )); /* * prototypes for functions in pg_aggregate.c */ -extern void -AggregateCreate(char *aggName, +extern void AggregateCreate(char *aggName, char *aggtransfn1Name, char *aggtransfn2Name, char *aggfinalfnName, @@ -143,8 +142,7 @@ AggregateCreate(char *aggName, char *aggtransfn2typeName, char *agginitval1, char *agginitval2); -extern char * -AggNameGetInitVal(char *aggName, Oid basetype, +extern char *AggNameGetInitVal(char *aggName, Oid basetype, int xfuncno, bool *isNull); -#endif /* PG_AGGREGATE_H */ +#endif /* PG_AGGREGATE_H */ diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h index 05e9b797f8b..3106ffa7cc1 100644 --- a/src/include/catalog/pg_am.h +++ b/src/include/catalog/pg_am.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_am.h,v 1.8 1998/08/19 02:03:48 momjian Exp $ + * $Id: pg_am.h,v 1.9 1998/09/01 04:34:47 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -109,4 +109,4 @@ DESCR(""); DATA(insert OID = 783 ( gist PGUID "o" 100 7 gistgettuple gistinsert gistdelete - - - - gistbeginscan gistrescan gistendscan gistmarkpos gistrestrpos - - gistbuild - - )); DESCR(""); -#endif /* PG_AM_H */ +#endif /* PG_AM_H */ diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h index 2044bff6ea2..40a112e642b 100644 --- a/src/include/catalog/pg_amop.h +++ b/src/include/catalog/pg_amop.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_amop.h,v 1.14 1998/08/19 02:03:49 momjian Exp $ + * $Id: pg_amop.h,v 1.15 1998/09/01 04:34:48 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -182,10 +182,10 @@ DATA(insert OID = 0 ( 403 427 610 5 btreesel btreenpage )); */ DATA(insert OID = 0 ( 403 435 645 1 btreesel btreenpage )); -DATA(insert OID = 0 ( 403 435 647 2 btreesel btreenpage )); +DATA(insert OID = 0 ( 403 435 647 2 btreesel btreenpage )); DATA(insert OID = 0 ( 403 435 649 3 btreesel btreenpage )); -DATA(insert OID = 0 ( 403 435 648 4 btreesel btreenpage )); -DATA(insert OID = 0 ( 403 435 646 5 btreesel btreenpage )); +DATA(insert OID = 0 ( 403 435 648 4 btreesel btreenpage )); +DATA(insert OID = 0 ( 403 435 646 5 btreesel btreenpage )); /* * nbtree float4_ops @@ -333,4 +333,4 @@ DATA(insert OID = 0 ( 405 1312 1320 1 hashsel hashnpage )); /* timespan_ops */ DATA(insert OID = 0 ( 405 1313 1330 1 hashsel hashnpage )); -#endif /* PG_AMOP_H */ +#endif /* PG_AMOP_H */ diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h index e1726a59619..4c12668d662 100644 --- a/src/include/catalog/pg_amproc.h +++ b/src/include/catalog/pg_amproc.h @@ -9,7 +9,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_amproc.h,v 1.9 1998/08/19 02:03:51 momjian Exp $ + * $Id: pg_amproc.h,v 1.10 1998/09/01 04:34:49 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -61,7 +61,7 @@ typedef FormData_pg_amproc *Form_pg_amproc; * initial contents of pg_amproc * ---------------- */ - + /* rtree */ DATA(insert OID = 0 (402 422 193 1)); DATA(insert OID = 0 (402 422 194 2)); @@ -122,4 +122,4 @@ DATA(insert OID = 0 (405 1181 455 1)); DATA(insert OID = 0 (405 1312 452 1)); DATA(insert OID = 0 (405 1313 452 1)); -#endif /* PG_AMPROC_H */ +#endif /* PG_AMPROC_H */ diff --git a/src/include/catalog/pg_attrdef.h b/src/include/catalog/pg_attrdef.h index 6a3b6309d99..22e89c17c14 100644 --- a/src/include/catalog/pg_attrdef.h +++ b/src/include/catalog/pg_attrdef.h @@ -52,4 +52,4 @@ typedef FormData_pg_attrdef *Form_pg_attrdef; #define Anum_pg_attrdef_adsrc 4 -#endif /* PG_ATTRDEF_H */ +#endif /* PG_ATTRDEF_H */ diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index 4e4832fe170..4a3bbd6ce55 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_attribute.h,v 1.42 1998/09/01 03:27:49 momjian Exp $ + * $Id: pg_attribute.h,v 1.43 1998/09/01 04:34:51 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -178,10 +178,10 @@ typedef FormData_pg_attribute *Form_pg_attribute; * ---------------- */ #define Schema_pg_type \ -{ 1247, {"typname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ +{ 1247, {"typname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ { 1247, {"typowner"}, 23, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1247, {"typlen"}, 21, 0, 2, 3, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ -{ 1247, {"typprtlen"}, 21, 0, 2, 4, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ +{ 1247, {"typprtlen"}, 21, 0, 2, 4, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ { 1247, {"typbyval"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1247, {"typtype"}, 18, 0, 1, 6, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1247, {"typisdefined"}, 16, 0, 1, 7, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ @@ -189,7 +189,7 @@ typedef FormData_pg_attribute *Form_pg_attribute; { 1247, {"typrelid"}, 26, 0, 4, 9, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1247, {"typelem"}, 26, 0, 4, 10, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1247, {"typinput"}, 24, 0, 4, 11, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1247, {"typoutput"}, 24, 0, 4, 12, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1247, {"typoutput"}, 24, 0, 4, 12, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1247, {"typreceive"}, 24, 0, 4, 13, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1247, {"typsend"}, 24, 0, 4, 14, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1247, {"typalign"}, 18, 0, 1, 15, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ @@ -239,21 +239,21 @@ DATA(insert OID = 0 ( 1262 cmax 29 0 4 -6 0 -1 -1 t f i f f)); */ #define Schema_pg_proc \ { 1255, {"proname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ -{ 1255, {"proowner"}, 23, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1255, {"prolang"}, 26, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1255, {"proisinh"}, 16, 0, 1, 4, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1255, {"proistrusted"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1255, {"proiscachable"}, 16, 0, 1, 6, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1255, {"pronargs"}, 21, 0, 2, 7, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ -{ 1255, {"proretset"}, 16, 0, 1, 8, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1255, {"prorettype"}, 26, 0, 4, 9, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1255, {"proowner"}, 23, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1255, {"prolang"}, 26, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1255, {"proisinh"}, 16, 0, 1, 4, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1255, {"proistrusted"}, 16, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1255, {"proiscachable"}, 16, 0, 1, 6, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1255, {"pronargs"}, 21, 0, 2, 7, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ +{ 1255, {"proretset"}, 16, 0, 1, 8, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1255, {"prorettype"}, 26, 0, 4, 9, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1255, {"proargtypes"}, 30, 0, 32, 10, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ -{ 1255, {"probyte_pct"}, 23, 0, 4, 11, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1255, {"properbyte_cpu"}, 23, 0, 4, 12, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1255, {"propercall_cpu"}, 23, 0, 4, 13, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1255, {"prooutin_ratio"}, 23, 0, 4, 14, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1255, {"prosrc"}, 25, 0, -1, 15, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ -{ 1255, {"probin"}, 17, 0, -1, 16, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' } +{ 1255, {"probyte_pct"}, 23, 0, 4, 11, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1255, {"properbyte_cpu"}, 23, 0, 4, 12, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1255, {"propercall_cpu"}, 23, 0, 4, 13, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1255, {"prooutin_ratio"}, 23, 0, 4, 14, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1255, {"prosrc"}, 25, 0, -1, 15, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ +{ 1255, {"probin"}, 17, 0, -1, 16, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' } DATA(insert OID = 0 ( 1255 proname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f)); DATA(insert OID = 0 ( 1255 proowner 23 0 4 2 0 -1 -1 t f i f f)); @@ -328,8 +328,8 @@ DATA(insert OID = 0 ( 1261 cmax 29 0 4 -6 0 -1 -1 t f i f f)); { 1249, {"attbyval"}, 16, 0, 1, 10, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1249, {"attisset"}, 16, 0, 1, 11, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1249, {"attalign"}, 18, 0, 1, 12, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1249, {"attnotnull"}, 16, 0, 1, 13, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1249, {"atthasdef"}, 16, 0, 1, 14, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' } +{ 1249, {"attnotnull"}, 16, 0, 1, 13, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1249, {"atthasdef"}, 16, 0, 1, 14, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' } DATA(insert OID = 0 ( 1249 attrelid 26 0 4 1 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1249 attname 19 0 NAMEDATALEN 2 0 -1 -1 f f i f f)); @@ -357,20 +357,20 @@ DATA(insert OID = 0 ( 1249 cmax 29 0 4 -6 0 -1 -1 t f i f f)); * ---------------- */ #define Schema_pg_class \ -{ 1259, {"relname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ +{ 1259, {"relname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ { 1259, {"reltype"}, 26, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259, {"relowner"}, 23, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259, {"relam"}, 26, 0, 4, 4, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1259, {"relpages"}, 23, 0, 4, 5, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1259, {"reltuples"}, 23, 0, 4, 6, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1259, {"relhasindex"}, 16, 0, 1, 7, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1259, {"relisshared"}, 16, 0, 1, 8, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1259, {"relkind"}, 18, 0, 1, 9, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1259, {"relnatts"}, 21, 0, 2, 10, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ -{ 1259, {"relchecks"}, 21, 0, 2, 11, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ +{ 1259, {"relpages"}, 23, 0, 4, 5, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1259, {"reltuples"}, 23, 0, 4, 6, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1259, {"relhasindex"}, 16, 0, 1, 7, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1259, {"relisshared"}, 16, 0, 1, 8, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1259, {"relkind"}, 18, 0, 1, 9, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1259, {"relnatts"}, 21, 0, 2, 10, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ +{ 1259, {"relchecks"}, 21, 0, 2, 11, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ { 1259, {"reltriggers"}, 21, 0, 2, 12, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ -{ 1259, {"relhasrules"}, 16, 0, 1, 13, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1259, {"relacl"}, 1034, 0, -1, 14, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' } +{ 1259, {"relhasrules"}, 16, 0, 1, 13, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1259, {"relacl"}, 1034, 0, -1, 14, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' } DATA(insert OID = 0 ( 1259 relname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f)); DATA(insert OID = 0 ( 1259 reltype 26 0 4 2 0 -1 -1 t f i f f)); @@ -463,4 +463,4 @@ DATA(insert OID = 0 ( 1264 varfoo 26 0 4 1 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1269 logfoo 26 0 4 1 0 -1 -1 t f i f f)); -#endif /* PG_ATTRIBUTE_H */ +#endif /* PG_ATTRIBUTE_H */ diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h index 4fe24603346..e9f860fb446 100644 --- a/src/include/catalog/pg_class.h +++ b/src/include/catalog/pg_class.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_class.h,v 1.23 1998/08/24 01:14:13 momjian Exp $ + * $Id: pg_class.h,v 1.24 1998/09/01 04:34:53 momjian Exp $ * * NOTES * ``pg_relation'' is being replaced by ``pg_class''. currently @@ -163,4 +163,4 @@ DESCR(""); #define RELKIND_SEQUENCE 'S' /* SEQUENCE relation */ #define RELKIND_UNCATALOGED 'u' /* temporary heap */ -#endif /* PG_RELATION_H */ +#endif /* PG_RELATION_H */ diff --git a/src/include/catalog/pg_database.h b/src/include/catalog/pg_database.h index ef680941521..5b546c32b8d 100644 --- a/src/include/catalog/pg_database.h +++ b/src/include/catalog/pg_database.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_database.h,v 1.6 1998/08/24 01:14:17 momjian Exp $ + * $Id: pg_database.h,v 1.7 1998/09/01 04:34:54 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -37,6 +37,7 @@ CATALOG(pg_database) BOOTSTRAP int4 encoding; text datpath; /* VARIABLE LENGTH FIELD */ } FormData_pg_database; + /* ---------------- * Form_pg_database corresponds to a pointer to a tuple with * the format of pg_database relation. @@ -53,4 +54,4 @@ typedef FormData_pg_database *Form_pg_database; #define Anum_pg_database_datdba 2 #define Anum_pg_database_encoding 3 #define Anum_pg_database_datpath 4 -#endif /* PG_DATABASE_H */ +#endif /* PG_DATABASE_H */ diff --git a/src/include/catalog/pg_description.h b/src/include/catalog/pg_description.h index 3a2c4e6b38a..b85d6cab4af 100644 --- a/src/include/catalog/pg_description.h +++ b/src/include/catalog/pg_description.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_description.h,v 1.6 1998/08/19 19:59:47 momjian Exp $ + * $Id: pg_description.h,v 1.7 1998/09/01 04:34:55 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -60,8 +60,8 @@ typedef FormData_pg_description *Form_pg_description; /* * Because the contents of this table are taken from the other *.h files, - * there is no initialization. It is loaded from initdb using a COPY + * there is no initialization. It is loaded from initdb using a COPY * statement. */ -#endif /* PG_DESCRIPTION_H */ +#endif /* PG_DESCRIPTION_H */ diff --git a/src/include/catalog/pg_group.h b/src/include/catalog/pg_group.h index 5680c0fe1b6..863fe78c065 100644 --- a/src/include/catalog/pg_group.h +++ b/src/include/catalog/pg_group.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_group.h,v 1.4 1997/09/08 02:35:07 momjian Exp $ + * $Id: pg_group.h,v 1.5 1998/09/01 04:34:56 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -40,4 +40,4 @@ typedef FormData_pg_group *Form_pg_group; #define Anum_pg_group_grosysid 2 #define Anum_pg_group_grolist 3 -#endif /* PG_GROUP_H */ +#endif /* PG_GROUP_H */ diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h index ef39b13b7f2..4cf6ad95efc 100644 --- a/src/include/catalog/pg_index.h +++ b/src/include/catalog/pg_index.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_index.h,v 1.7 1998/09/01 03:27:51 momjian Exp $ + * $Id: pg_index.h,v 1.8 1998/09/01 04:34:58 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -81,4 +81,4 @@ typedef FormData_pg_index *Form_pg_index; #define Anum_pg_index_indisunique 8 #define Anum_pg_index_indpred 10 -#endif /* PG_INDEX_H */ +#endif /* PG_INDEX_H */ diff --git a/src/include/catalog/pg_inheritproc.h b/src/include/catalog/pg_inheritproc.h index 60bad51b939..e23bbf880c6 100644 --- a/src/include/catalog/pg_inheritproc.h +++ b/src/include/catalog/pg_inheritproc.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_inheritproc.h,v 1.4 1997/09/08 02:35:13 momjian Exp $ + * $Id: pg_inheritproc.h,v 1.5 1998/09/01 04:34:59 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -56,4 +56,4 @@ typedef FormData_pg_inheritproc *Form_pg_inheritproc; #define Anum_pg_inheritproc_inhproc 4 -#endif /* PG_INHERITPROC_H */ +#endif /* PG_INHERITPROC_H */ diff --git a/src/include/catalog/pg_inherits.h b/src/include/catalog/pg_inherits.h index 1ad2b782cbd..45b09a49c17 100644 --- a/src/include/catalog/pg_inherits.h +++ b/src/include/catalog/pg_inherits.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_inherits.h,v 1.5 1998/09/01 03:27:53 momjian Exp $ + * $Id: pg_inherits.h,v 1.6 1998/09/01 04:35:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -54,4 +54,4 @@ typedef FormData_pg_inherits *Form_pg_inherits; #define Anum_pg_inherits_inhseqno 3 -#endif /* PG_INHERITS_H */ +#endif /* PG_INHERITS_H */ diff --git a/src/include/catalog/pg_ipl.h b/src/include/catalog/pg_ipl.h index ea3eb34512a..64786ece0ab 100644 --- a/src/include/catalog/pg_ipl.h +++ b/src/include/catalog/pg_ipl.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_ipl.h,v 1.4 1997/09/08 02:35:15 momjian Exp $ + * $Id: pg_ipl.h,v 1.5 1998/09/01 04:35:01 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -54,4 +54,4 @@ typedef FormData_pg_ipl *Form_pg_ipl; #define Anum_pg_ipl_iplseqno 3 -#endif /* PG_IPL_H */ +#endif /* PG_IPL_H */ diff --git a/src/include/catalog/pg_language.h b/src/include/catalog/pg_language.h index 9bf4c110838..5eb8db2a807 100644 --- a/src/include/catalog/pg_language.h +++ b/src/include/catalog/pg_language.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_language.h,v 1.6 1997/11/13 03:23:02 momjian Exp $ + * $Id: pg_language.h,v 1.7 1998/09/01 04:35:03 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -75,4 +75,4 @@ DESCR(""); #define SQLlanguageId 14 -#endif /* PG_LANGUAGE_H */ +#endif /* PG_LANGUAGE_H */ diff --git a/src/include/catalog/pg_listener.h b/src/include/catalog/pg_listener.h index d80bf9df299..4a8717cb9b0 100644 --- a/src/include/catalog/pg_listener.h +++ b/src/include/catalog/pg_listener.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_listener.h,v 1.4 1997/09/08 02:35:17 momjian Exp $ + * $Id: pg_listener.h,v 1.5 1998/09/01 04:35:04 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -53,4 +53,4 @@ CATALOG(pg_listener) */ -#endif /* PG_LISTENER_H */ +#endif /* PG_LISTENER_H */ diff --git a/src/include/catalog/pg_log.h b/src/include/catalog/pg_log.h index 0cf9dc130bc..36f61a96f55 100644 --- a/src/include/catalog/pg_log.h +++ b/src/include/catalog/pg_log.h @@ -9,7 +9,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_log.h,v 1.4 1997/09/08 02:35:18 momjian Exp $ + * $Id: pg_log.h,v 1.5 1998/09/01 04:35:05 momjian Exp $ * * NOTES * The structures and macros used by the transam/ code @@ -37,4 +37,4 @@ typedef FormData_pg_log *Form_pg_log; #define Natts_pg_log 1 #define Anum_pg_log_logfoo 1 -#endif /* PG_LOG_H */ +#endif /* PG_LOG_H */ diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h index 882830be0bb..3f7814a11f7 100644 --- a/src/include/catalog/pg_opclass.h +++ b/src/include/catalog/pg_opclass.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_opclass.h,v 1.10 1998/08/19 02:03:52 momjian Exp $ + * $Id: pg_opclass.h,v 1.11 1998/09/01 04:35:06 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -108,4 +108,4 @@ DESCR(""); DATA(insert OID = 1313 ( timespan_ops 1186 )); DESCR(""); -#endif /* PG_OPCLASS_H */ +#endif /* PG_OPCLASS_H */ diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h index 526da0883ac..7c2ff3150a6 100644 --- a/src/include/catalog/pg_operator.h +++ b/src/include/catalog/pg_operator.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_operator.h,v 1.35 1998/09/01 03:27:55 momjian Exp $ + * $Id: pg_operator.h,v 1.36 1998/09/01 04:35:08 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -88,26 +88,26 @@ typedef FormData_pg_operator *Form_pg_operator; * ---------------- */ -DATA(insert OID = 15 ( "=" PGUID 0 b t t 23 20 16 416 417 37 37 int48eq eqsel eqjoinsel )); -DATA(insert OID = 36 ( "<>" PGUID 0 b t t 23 20 16 417 416 0 0 int48ne neqsel neqjoinsel )); -DATA(insert OID = 37 ( "<" PGUID 0 b t f 23 20 16 430 430 0 0 int48lt intltsel intltjoinsel )); -DATA(insert OID = 76 ( ">" PGUID 0 b t f 23 20 16 420 420 0 0 int48gt intgtsel intgtjoinsel )); -DATA(insert OID = 80 ( "<=" PGUID 0 b t f 23 20 16 419 419 0 0 int48le intlesel intlejoinsel )); -DATA(insert OID = 82 ( ">=" PGUID 0 b t f 23 20 16 418 418 0 0 int48ge intgesel intgejoinsel )); - -DATA(insert OID = 58 ( "<" PGUID 0 b t f 16 16 16 85 91 0 0 boollt intltsel intltjoinsel )); -DATA(insert OID = 59 ( ">" PGUID 0 b t f 16 16 16 85 91 0 0 boolgt intltsel intltjoinsel )); -DATA(insert OID = 85 ( "<>" PGUID 0 b t f 16 16 16 85 91 0 0 boolne neqsel neqjoinsel )); -DATA(insert OID = 91 ( "=" PGUID 0 b t t 16 16 16 91 85 0 0 booleq eqsel eqjoinsel )); +DATA(insert OID = 15 ( "=" PGUID 0 b t t 23 20 16 416 417 37 37 int48eq eqsel eqjoinsel )); +DATA(insert OID = 36 ( "<>" PGUID 0 b t t 23 20 16 417 416 0 0 int48ne neqsel neqjoinsel )); +DATA(insert OID = 37 ( "<" PGUID 0 b t f 23 20 16 430 430 0 0 int48lt intltsel intltjoinsel )); +DATA(insert OID = 76 ( ">" PGUID 0 b t f 23 20 16 420 420 0 0 int48gt intgtsel intgtjoinsel )); +DATA(insert OID = 80 ( "<=" PGUID 0 b t f 23 20 16 419 419 0 0 int48le intlesel intlejoinsel )); +DATA(insert OID = 82 ( ">=" PGUID 0 b t f 23 20 16 418 418 0 0 int48ge intgesel intgejoinsel )); + +DATA(insert OID = 58 ( "<" PGUID 0 b t f 16 16 16 85 91 0 0 boollt intltsel intltjoinsel )); +DATA(insert OID = 59 ( ">" PGUID 0 b t f 16 16 16 85 91 0 0 boolgt intltsel intltjoinsel )); +DATA(insert OID = 85 ( "<>" PGUID 0 b t f 16 16 16 85 91 0 0 boolne neqsel neqjoinsel )); +DATA(insert OID = 91 ( "=" PGUID 0 b t t 16 16 16 91 85 0 0 booleq eqsel eqjoinsel )); #define BooleanEqualOperator 91 -DATA(insert OID = 92 ( "=" PGUID 0 b t t 18 18 16 92 630 631 631 chareq eqsel eqjoinsel )); -DATA(insert OID = 93 ( "=" PGUID 0 b t t 19 19 16 93 643 660 660 nameeq eqsel eqjoinsel )); -DATA(insert OID = 94 ( "=" PGUID 0 b t t 21 21 16 94 519 95 95 int2eq eqsel eqjoinsel )); -DATA(insert OID = 95 ( "<" PGUID 0 b t f 21 21 16 520 524 0 0 int2lt intltsel intltjoinsel )); -DATA(insert OID = 96 ( "=" PGUID 0 b t t 23 23 16 96 518 97 97 int4eq eqsel eqjoinsel )); -DATA(insert OID = 97 ( "<" PGUID 0 b t f 23 23 16 521 525 0 0 int4lt intltsel intltjoinsel )); -DATA(insert OID = 98 ( "=" PGUID 0 b t t 25 25 16 98 531 664 664 texteq eqsel eqjoinsel )); +DATA(insert OID = 92 ( "=" PGUID 0 b t t 18 18 16 92 630 631 631 chareq eqsel eqjoinsel )); +DATA(insert OID = 93 ( "=" PGUID 0 b t t 19 19 16 93 643 660 660 nameeq eqsel eqjoinsel )); +DATA(insert OID = 94 ( "=" PGUID 0 b t t 21 21 16 94 519 95 95 int2eq eqsel eqjoinsel )); +DATA(insert OID = 95 ( "<" PGUID 0 b t f 21 21 16 520 524 0 0 int2lt intltsel intltjoinsel )); +DATA(insert OID = 96 ( "=" PGUID 0 b t t 23 23 16 96 518 97 97 int4eq eqsel eqjoinsel )); +DATA(insert OID = 97 ( "<" PGUID 0 b t f 23 23 16 521 525 0 0 int4lt intltsel intltjoinsel )); +DATA(insert OID = 98 ( "=" PGUID 0 b t t 25 25 16 98 531 664 664 texteq eqsel eqjoinsel )); DATA(insert OID = 329 ( "=" PGUID 0 b t t 1000 1000 16 329 0 0 0 array_eq eqsel eqjoinsel )); DATA(insert OID = 349 ( "=" PGUID 0 b t t 1001 1001 16 349 0 0 0 array_eq eqsel eqjoinsel )); @@ -142,19 +142,19 @@ DATA(insert OID = 399 ( "=" PGUID 0 b t t 1026 1026 16 399 0 0 0 array_e DATA(insert OID = 400 ( "=" PGUID 0 b t t 1027 1027 16 400 0 0 0 array_eq eqsel eqjoinsel )); DATA(insert OID = 401 ( "=" PGUID 0 b t t 1034 1034 16 401 0 0 0 array_eq eqsel eqjoinsel )); -DATA(insert OID = 410 ( "=" PGUID 0 b t t 20 20 16 410 411 412 412 int8eq eqsel eqjoinsel )); -DATA(insert OID = 411 ( "<>" PGUID 0 b t t 20 20 16 411 410 0 0 int8ne neqsel neqjoinsel )); -DATA(insert OID = 412 ( "<" PGUID 0 b t f 20 20 16 415 415 0 0 int8lt intltsel intltjoinsel )); -DATA(insert OID = 413 ( ">" PGUID 0 b t f 20 20 16 414 414 0 0 int8gt intgtsel intgtjoinsel )); -DATA(insert OID = 414 ( "<=" PGUID 0 b t f 20 20 16 413 413 0 0 int8le intlesel intlejoinsel )); -DATA(insert OID = 415 ( ">=" PGUID 0 b t f 20 20 16 412 412 0 0 int8ge intgesel intgejoinsel )); +DATA(insert OID = 410 ( "=" PGUID 0 b t t 20 20 16 410 411 412 412 int8eq eqsel eqjoinsel )); +DATA(insert OID = 411 ( "<>" PGUID 0 b t t 20 20 16 411 410 0 0 int8ne neqsel neqjoinsel )); +DATA(insert OID = 412 ( "<" PGUID 0 b t f 20 20 16 415 415 0 0 int8lt intltsel intltjoinsel )); +DATA(insert OID = 413 ( ">" PGUID 0 b t f 20 20 16 414 414 0 0 int8gt intgtsel intgtjoinsel )); +DATA(insert OID = 414 ( "<=" PGUID 0 b t f 20 20 16 413 413 0 0 int8le intlesel intlejoinsel )); +DATA(insert OID = 415 ( ">=" PGUID 0 b t f 20 20 16 412 412 0 0 int8ge intgesel intgejoinsel )); -DATA(insert OID = 416 ( "=" PGUID 0 b t t 20 23 16 15 36 418 418 int84eq eqsel eqjoinsel )); -DATA(insert OID = 417 ( "<>" PGUID 0 b t t 20 23 16 36 15 0 0 int84ne neqsel neqjoinsel )); -DATA(insert OID = 418 ( "<" PGUID 0 b t f 20 23 16 82 82 0 0 int84lt intltsel intltjoinsel )); -DATA(insert OID = 419 ( ">" PGUID 0 b t f 20 23 16 80 80 0 0 int84gt intgtsel intgtjoinsel )); -DATA(insert OID = 420 ( "<=" PGUID 0 b t f 20 23 16 76 76 0 0 int84le intlesel intlejoinsel )); -DATA(insert OID = 430 ( ">=" PGUID 0 b t f 20 23 16 37 37 0 0 int84ge intgesel intgejoinsel )); +DATA(insert OID = 416 ( "=" PGUID 0 b t t 20 23 16 15 36 418 418 int84eq eqsel eqjoinsel )); +DATA(insert OID = 417 ( "<>" PGUID 0 b t t 20 23 16 36 15 0 0 int84ne neqsel neqjoinsel )); +DATA(insert OID = 418 ( "<" PGUID 0 b t f 20 23 16 82 82 0 0 int84lt intltsel intltjoinsel )); +DATA(insert OID = 419 ( ">" PGUID 0 b t f 20 23 16 80 80 0 0 int84gt intgtsel intgtjoinsel )); +DATA(insert OID = 420 ( "<=" PGUID 0 b t f 20 23 16 76 76 0 0 int84le intlesel intlejoinsel )); +DATA(insert OID = 430 ( ">=" PGUID 0 b t f 20 23 16 37 37 0 0 int84ge intgesel intgejoinsel )); DATA(insert OID = 484 ( "-" PGUID 0 l t f 0 20 20 0 0 0 0 int8um intltsel intltjoinsel )); DATA(insert OID = 485 ( "<<" PGUID 0 b t f 604 604 16 0 0 0 0 poly_left intltsel intltjoinsel )); @@ -639,8 +639,7 @@ DATA(insert OID = 1617 ( "#" PGUID 0 b t f 628 628 600 1617 0 0 0 line_in /* * function prototypes */ -extern void -OperatorCreate(char *operatorName, +extern void OperatorCreate(char *operatorName, char *leftTypeName, char *rightTypeName, char *procedureName, @@ -654,4 +653,4 @@ OperatorCreate(char *operatorName, char *leftSortName, char *rightSortName); -#endif /* PG_OPERATOR_H */ +#endif /* PG_OPERATOR_H */ diff --git a/src/include/catalog/pg_parg.h b/src/include/catalog/pg_parg.h index 28404998565..d70c7de4d96 100644 --- a/src/include/catalog/pg_parg.h +++ b/src/include/catalog/pg_parg.h @@ -8,7 +8,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_parg.h,v 1.5 1997/09/08 02:35:21 momjian Exp $ + * $Id: pg_parg.h,v 1.6 1998/09/01 04:35:09 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -114,4 +114,4 @@ DATA(insert OID = 0 ( 66 2 - 23 )); DATA(insert OID = 0 ( 67 1 - 25 )); DATA(insert OID = 0 ( 67 2 - 25 )); -#endif /* PG_PARG_H */ +#endif /* PG_PARG_H */ diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 88f304ea1ad..06cb99d0c15 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_proc.h,v 1.68 1998/08/25 21:25:44 scrappy Exp $ + * $Id: pg_proc.h,v 1.69 1998/09/01 04:35:10 momjian Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -785,13 +785,13 @@ DESCR(""); /* OIDS 400 - 499 */ -DATA(insert OID = 406 ( name_text PGUID 11 f t f 1 f 25 "19" 100 0 0 100 foo bar )); +DATA(insert OID = 406 ( name_text PGUID 11 f t f 1 f 25 "19" 100 0 0 100 foo bar )); DESCR("convert"); -DATA(insert OID = 407 ( text_name PGUID 11 f t f 1 f 19 "25" 100 0 0 100 foo bar )); +DATA(insert OID = 407 ( text_name PGUID 11 f t f 1 f 19 "25" 100 0 0 100 foo bar )); DESCR("convert"); -DATA(insert OID = 408 ( name_bpchar PGUID 11 f t f 1 f 1042 "19" 100 0 0 100 foo bar )); +DATA(insert OID = 408 ( name_bpchar PGUID 11 f t f 1 f 1042 "19" 100 0 0 100 foo bar )); DESCR("convert"); -DATA(insert OID = 409 ( bpchar_name PGUID 11 f t f 1 f 19 "1042" 100 0 0 100 foo bar )); +DATA(insert OID = 409 ( bpchar_name PGUID 11 f t f 1 f 19 "1042" 100 0 0 100 foo bar )); DESCR("convert"); DATA(insert OID = 438 ( hashsel PGUID 11 f t t 7 f 701 "26 26 21 0 23 23 26" 100 0 0 100 foo bar )); @@ -876,11 +876,11 @@ DESCR("less-than-or-equal"); DATA(insert OID = 479 ( int84ge PGUID 11 f t f 2 f 16 "20 23" 100 0 0 100 foo bar )); DESCR("greater-than-or-equal"); -DATA(insert OID = 480 ( int84 PGUID 11 f t f 1 f 23 "20" 100 0 0 100 foo bar )); +DATA(insert OID = 480 ( int84 PGUID 11 f t f 1 f 23 "20" 100 0 0 100 foo bar )); DESCR("convert int8 to int4"); -DATA(insert OID = 481 ( int48 PGUID 11 f t f 1 f 20 "23" 100 0 0 100 foo bar )); +DATA(insert OID = 481 ( int48 PGUID 11 f t f 1 f 20 "23" 100 0 0 100 foo bar )); DESCR("convert int4 to int8"); -DATA(insert OID = 482 ( i8tod PGUID 11 f t f 1 f 701 "20" 100 0 0 100 foo bar )); +DATA(insert OID = 482 ( i8tod PGUID 11 f t f 1 f 701 "20" 100 0 0 100 foo bar )); DESCR("convert int8 to float8"); DATA(insert OID = 483 ( dtoi8 PGUID 11 f t f 1 f 20 "701" 100 0 0 100 foo bar )); DESCR("convert float8 to int8"); @@ -1076,9 +1076,9 @@ DESCR("matches LIKE expression"); DATA(insert OID = 859 ( namenlike PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100 foo bar )); DESCR("does not match LIKE expression"); -DATA(insert OID = 846 ( cash_mul_flt4 PGUID 11 f t f 2 f 790 "790 700" 100 0 0 100 foo bar )); +DATA(insert OID = 846 ( cash_mul_flt4 PGUID 11 f t f 2 f 790 "790 700" 100 0 0 100 foo bar )); DESCR("multiply"); -DATA(insert OID = 847 ( cash_div_flt4 PGUID 11 f t f 2 f 790 "790 700" 100 0 0 100 foo bar )); +DATA(insert OID = 847 ( cash_div_flt4 PGUID 11 f t f 2 f 790 "790 700" 100 0 0 100 foo bar )); DESCR("divide"); DATA(insert OID = 848 ( flt4_mul_cash PGUID 11 f t f 2 f 790 "700 790" 100 0 0 100 foo bar )); DESCR("multiply"); @@ -1096,9 +1096,9 @@ DESCR("less-than-or-equal"); DATA(insert OID = 857 ( int48ge PGUID 11 f t f 2 f 16 "21 20" 100 0 0 100 foo bar )); DESCR("greater-than-or-equal"); -DATA(insert OID = 860 ( char_bpchar PGUID 11 f t f 1 f 1042 "18" 100 0 0 100 foo bar )); +DATA(insert OID = 860 ( char_bpchar PGUID 11 f t f 1 f 1042 "18" 100 0 0 100 foo bar )); DESCR("convert to bpchar"); -DATA(insert OID = 861 ( bpchar_char PGUID 11 f t f 1 f 18 "1042" 100 0 0 100 foo bar )); +DATA(insert OID = 861 ( bpchar_char PGUID 11 f t f 1 f 18 "1042" 100 0 0 100 foo bar )); DESCR("convert to char"); DATA(insert OID = 862 ( int4_mul_cash PGUID 11 f t f 2 f 790 "23 790" 100 0 0 100 foo bar )); @@ -1465,9 +1465,9 @@ DESCR("truncate datetime to specified units"); DATA(insert OID = 1218 ( timespan_trunc PGUID 11 f t f 2 f 1186 "25 1186" 100 0 0 100 foo bar )); DESCR("truncate timespan to specified units"); -DATA(insert OID = 1230 ( bpchar PGUID 14 f t f 1 f 1042 "18" 100 0 0 100 "select char_bpchar($1)" - )); +DATA(insert OID = 1230 ( bpchar PGUID 14 f t f 1 f 1042 "18" 100 0 0 100 "select char_bpchar($1)" - )); DESCR("convert to bpchar"); -DATA(insert OID = 1231 ( char PGUID 14 f t f 1 f 23 "1042" 100 0 0 100 "select bpchar_char($1)" - )); +DATA(insert OID = 1231 ( char PGUID 14 f t f 1 f 23 "1042" 100 0 0 100 "select bpchar_char($1)" - )); DESCR("convert to char"); DATA(insert OID = 1236 ( int8larger PGUID 11 f t f 2 f 20 "20 20" 100 0 0 100 foo bar )); @@ -1657,15 +1657,15 @@ DESCR("boolean test"); DATA(insert OID = 1393 ( timespan PGUID 14 f t f 1 f 1186 "25" 100 0 0 100 "select text_timespan($1)" - )); DESCR("convert"); -DATA(insert OID = 1394 ( name PGUID 14 f t f 1 f 19 "25" 100 0 0 100 "select text_name($1)" - )); +DATA(insert OID = 1394 ( name PGUID 14 f t f 1 f 19 "25" 100 0 0 100 "select text_name($1)" - )); DESCR("convert"); -DATA(insert OID = 1395 ( text PGUID 14 f t f 1 f 25 "19" 100 0 0 100 "select name_text($1)" - )); +DATA(insert OID = 1395 ( text PGUID 14 f t f 1 f 25 "19" 100 0 0 100 "select name_text($1)" - )); DESCR("convert"); -DATA(insert OID = 1396 ( name PGUID 14 f t f 1 f 19 "1042" 100 0 0 100 "select bpchar_name($1)" - )); +DATA(insert OID = 1396 ( name PGUID 14 f t f 1 f 19 "1042" 100 0 0 100 "select bpchar_name($1)" - )); DESCR("convert"); DATA(insert OID = 1397 ( bpchar PGUID 14 f t f 1 f 1042 "19" 100 0 0 100 "select name_bpchar($1)" - )); DESCR("convert"); -DATA(insert OID = 1398 ( name PGUID 14 f t f 1 f 19 "1043" 100 0 0 100 "select text_name($1)" - )); +DATA(insert OID = 1398 ( name PGUID 14 f t f 1 f 19 "1043" 100 0 0 100 "select text_name($1)" - )); DESCR("convert"); DATA(insert OID = 1399 ( varchar PGUID 14 f t f 1 f 1043 "19" 100 0 0 100 "select name_text($1)" - )); DESCR("convert"); @@ -1856,25 +1856,25 @@ DESCR("closest point to line on line segment"); DATA(insert OID = 1489 ( close_lseg PGUID 11 f t f 2 f 600 "601 601" 100 0 10 100 foo bar )); DESCR("closest point to line segment on line segment"); -DATA(insert OID = 1490 ( line_in PGUID 11 f t f 1 f 628 "0" 100 0 0 100 foo bar )); +DATA(insert OID = 1490 ( line_in PGUID 11 f t f 1 f 628 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); -DATA(insert OID = 1491 ( line_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); +DATA(insert OID = 1491 ( line_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); -DATA(insert OID = 1492 ( line_eq PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar )); +DATA(insert OID = 1492 ( line_eq PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar )); DESCR("lines equal?"); -DATA(insert OID = 1493 ( line_construct_pp PGUID 11 f t f 2 f 628 "600 600" 100 0 0 100 foo bar )); +DATA(insert OID = 1493 ( line_construct_pp PGUID 11 f t f 2 f 628 "600 600" 100 0 0 100 foo bar )); DESCR("line from points"); DATA(insert OID = 1494 ( line_interpt PGUID 11 f t f 2 f 600 "628 628" 100 0 0 100 foo bar )); DESCR("intersection point"); -DATA(insert OID = 1495 ( line_intersect PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar )); +DATA(insert OID = 1495 ( line_intersect PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar )); DESCR("lines intersect?"); -DATA(insert OID = 1496 ( line_parallel PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar )); +DATA(insert OID = 1496 ( line_parallel PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar )); DESCR("lines parallel?"); -DATA(insert OID = 1497 ( line_perp PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar )); +DATA(insert OID = 1497 ( line_perp PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar )); DESCR("lines perpendicular?"); -DATA(insert OID = 1498 ( line_vertical PGUID 11 f t f 1 f 16 "628" 100 0 0 100 foo bar )); +DATA(insert OID = 1498 ( line_vertical PGUID 11 f t f 1 f 16 "628" 100 0 0 100 foo bar )); DESCR("lines vertical?"); -DATA(insert OID = 1499 ( line_horizontal PGUID 11 f t f 1 f 16 "628" 100 0 0 100 foo bar )); +DATA(insert OID = 1499 ( line_horizontal PGUID 11 f t f 1 f 16 "628" 100 0 0 100 foo bar )); DESCR("lines horizontal?"); /* OIDS 1500 - 1599 */ @@ -1965,13 +1965,13 @@ DESCR(""); DATA(insert OID = 1584 ( area PGUID 14 f t f 1 f 701 "718" 100 0 0 100 "select circle_area($1)" - )); DESCR(""); -DATA(insert OID = 1592 ( int8 PGUID 14 f t f 1 f 20 "20" 100 0 0 100 "select $1" - )); +DATA(insert OID = 1592 ( int8 PGUID 14 f t f 1 f 20 "20" 100 0 0 100 "select $1" - )); DESCR("convert int8 to int8 (no-op)"); -DATA(insert OID = 1593 ( int8 PGUID 14 f t f 1 f 20 "23" 100 0 0 100 "select int48($1)" - )); +DATA(insert OID = 1593 ( int8 PGUID 14 f t f 1 f 20 "23" 100 0 0 100 "select int48($1)" - )); DESCR("convert int4 to int8"); -DATA(insert OID = 1594 ( int8 PGUID 14 f t f 1 f 20 "701" 100 0 0 100 "select dtoi8($1)" - )); +DATA(insert OID = 1594 ( int8 PGUID 14 f t f 1 f 20 "701" 100 0 0 100 "select dtoi8($1)" - )); DESCR("convert float8 to int8"); -DATA(insert OID = 1595 ( int4 PGUID 14 f t f 1 f 23 "20" 100 0 0 100 "select int84($1)" - )); +DATA(insert OID = 1595 ( int4 PGUID 14 f t f 1 f 23 "20" 100 0 0 100 "select int84($1)" - )); DESCR("convert int8 to int4"); DATA(insert OID = 1596 ( float8 PGUID 14 f t f 1 f 701 "20" 100 0 0 100 "select i8tod($1)" - )); DESCR("convert int8 to float8"); @@ -1980,11 +1980,11 @@ DESCR("convert int8 to float8"); DATA(insert OID = 1600 ( line PGUID 14 f t f 2 f 628 "600 600" 100 0 0 100 "select line_construct_pp($1, $2)" - )); DESCR(""); -DATA(insert OID = 1601 ( ishorizontal PGUID 14 f t f 1 f 16 "628" 100 0 0 100 "select line_horizontal($1)" - )); +DATA(insert OID = 1601 ( ishorizontal PGUID 14 f t f 1 f 16 "628" 100 0 0 100 "select line_horizontal($1)" - )); DESCR(""); -DATA(insert OID = 1602 ( isvertical PGUID 14 f t f 1 f 16 "628" 100 0 0 100 "select line_vertical($1)" - )); +DATA(insert OID = 1602 ( isvertical PGUID 14 f t f 1 f 16 "628" 100 0 0 100 "select line_vertical($1)" - )); DESCR(""); -DATA(insert OID = 1603 ( isparallel PGUID 14 f t f 2 f 16 "628 628" 100 0 0 100 "select line_parallel($1, $2)" - )); +DATA(insert OID = 1603 ( isparallel PGUID 14 f t f 2 f 16 "628 628" 100 0 0 100 "select line_parallel($1, $2)" - )); DESCR(""); /* Oracle Compatibility Related Functions - By Edmund Mergl <E.Mergl@bawue.de> */ @@ -2044,8 +2044,7 @@ DESCR("select statement of a view"); /* * prototypes for functions pg_proc.c */ -extern Oid -ProcedureCreate(char *procedureName, +extern Oid ProcedureCreate(char *procedureName, bool returnsSet, char *returnTypeName, char *languageName, @@ -2061,4 +2060,4 @@ ProcedureCreate(char *procedureName, CommandDest dest); -#endif /* PG_PROC_H */ +#endif /* PG_PROC_H */ diff --git a/src/include/catalog/pg_relcheck.h b/src/include/catalog/pg_relcheck.h index 2b80bd94243..1c027348552 100644 --- a/src/include/catalog/pg_relcheck.h +++ b/src/include/catalog/pg_relcheck.h @@ -51,4 +51,4 @@ typedef FormData_pg_relcheck *Form_pg_relcheck; #define Anum_pg_relcheck_rcbin 3 #define Anum_pg_relcheck_rcsrc 4 -#endif /* PG_RELCHECK_H */ +#endif /* PG_RELCHECK_H */ diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h index 8ec1ba8b9fe..39ec022b47c 100644 --- a/src/include/catalog/pg_rewrite.h +++ b/src/include/catalog/pg_rewrite.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_rewrite.h,v 1.5 1997/10/25 05:25:10 thomas Exp $ + * $Id: pg_rewrite.h,v 1.6 1998/09/01 04:35:13 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -61,4 +61,4 @@ typedef FormData_pg_rewrite *Form_pg_rewrite; #define Anum_pg_rewrite_ev_qual 6 #define Anum_pg_rewrite_ev_action 7 -#endif /* PG_REWRITE_H */ +#endif /* PG_REWRITE_H */ diff --git a/src/include/catalog/pg_shadow.h b/src/include/catalog/pg_shadow.h index fbe03775cd1..9d4c4549b8d 100644 --- a/src/include/catalog/pg_shadow.h +++ b/src/include/catalog/pg_shadow.h @@ -8,7 +8,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_shadow.h,v 1.2 1998/02/26 04:41:00 momjian Exp $ + * $Id: pg_shadow.h,v 1.3 1998/09/01 04:35:14 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -99,7 +99,7 @@ DATA(insert OID = 0 ( woodruff 31026 t t t t _null_ 2116994400 )); DATA(insert OID = 0 ( searcher 8261 t t t t _null_ 2116994400 )); BKI_BEGIN -#endif /* ALLOW_PG_GROUP */ +#endif /* ALLOW_PG_GROUP */ BKI_END -#endif /* PG_SHADOW_H */ +#endif /* PG_SHADOW_H */ diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h index 7b0919b1e1d..3e968eb775d 100644 --- a/src/include/catalog/pg_statistic.h +++ b/src/include/catalog/pg_statistic.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_statistic.h,v 1.4 1997/09/08 02:35:27 momjian Exp $ + * $Id: pg_statistic.h,v 1.5 1998/09/01 04:35:15 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -57,4 +57,4 @@ typedef FormData_pg_statistic *Form_pg_statistic; #define Anum_pg_statistic_stalokey 4 #define Anum_pg_statistic_stahikey 5 -#endif /* PG_STATISTIC_H */ +#endif /* PG_STATISTIC_H */ diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h index 83fcbef656b..9b25508dd70 100644 --- a/src/include/catalog/pg_trigger.h +++ b/src/include/catalog/pg_trigger.h @@ -78,4 +78,4 @@ typedef FormData_pg_trigger *Form_pg_trigger; #define TRIGGER_FOR_DELETE(type) (type & TRIGGER_TYPE_DELETE) #define TRIGGER_FOR_UPDATE(type) (type & TRIGGER_TYPE_UPDATE) -#endif /* PG_TRIGGER_H */ +#endif /* PG_TRIGGER_H */ diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index 9f204bfec1e..99d0de22dce 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_type.h,v 1.46 1998/09/01 03:27:58 momjian Exp $ + * $Id: pg_type.h,v 1.47 1998/09/01 04:35:18 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -67,8 +67,8 @@ CATALOG(pg_type) BOOTSTRAP * the I/O routines are written to expect pass by reference. Note that * float4 is written for pass by reference and has a declared length * of 4 bytes, so it looks like pass by reference must be consistant - * with the declared length, and typbyval is used somewhere. - * - tgl 1997-03-20). + * with the declared length, and typbyval is used somewhere. - tgl + * 1997-03-20). */ char typtype; bool typisdefined; @@ -166,7 +166,7 @@ DATA(insert OID = 19 ( name PGUID NAMEDATALEN NAMEDATALEN f b t \054 0 18 na DESCR("31-character type for storing system identifiers"); #define NAMEOID 19 -DATA(insert OID = 20 ( int8 PGUID 8 20 f b t \054 0 0 int8in int8out int8in int8out d _null_ )); +DATA(insert OID = 20 ( int8 PGUID 8 20 f b t \054 0 0 int8in int8out int8in int8out d _null_ )); DESCR("eight-byte integer, >18 digits"); #define INT8OID 20 @@ -374,8 +374,7 @@ DESCR("limited-range ISO-format date and time"); */ extern Oid TypeGet(char *typeName, bool *defined); extern Oid TypeShellMake(char *typeName); -extern Oid -TypeCreate(char *typeName, +extern Oid TypeCreate(char *typeName, Oid relationOid, int16 internalSize, int16 externalSize, @@ -392,4 +391,4 @@ extern void TypeRename(char *oldTypeName, char *newTypeName); extern char *makeArrayTypeName(char *typeName); -#endif /* PG_TYPE_H */ +#endif /* PG_TYPE_H */ diff --git a/src/include/catalog/pg_variable.h b/src/include/catalog/pg_variable.h index 95063125c8a..79db4abfb19 100644 --- a/src/include/catalog/pg_variable.h +++ b/src/include/catalog/pg_variable.h @@ -9,7 +9,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_variable.h,v 1.4 1997/09/08 02:35:34 momjian Exp $ + * $Id: pg_variable.h,v 1.5 1998/09/01 04:35:19 momjian Exp $ * * NOTES * The structures and macros used by the transam/ code @@ -37,4 +37,4 @@ typedef FormData_pg_variable *Form_pg_variable; #define Natts_pg_variable 1 #define Anum_pg_variable_varfoo 1 -#endif /* PG_VARIABLE_H */ +#endif /* PG_VARIABLE_H */ diff --git a/src/include/catalog/pg_version.h b/src/include/catalog/pg_version.h index eaf98ffa0ea..a38ab0d2df6 100644 --- a/src/include/catalog/pg_version.h +++ b/src/include/catalog/pg_version.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_version.h,v 1.6 1998/09/01 03:28:00 momjian Exp $ + * $Id: pg_version.h,v 1.7 1998/09/01 04:35:20 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -54,4 +54,4 @@ typedef FormData_pg_version *Form_pg_version; #define Anum_pg_version_vertime 3 -#endif /* PG_VERSION_H */ +#endif /* PG_VERSION_H */ diff --git a/src/include/commands/async.h b/src/include/commands/async.h index bf92a27ee54..2c9d0a348a5 100644 --- a/src/include/commands/async.h +++ b/src/include/commands/async.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: async.h,v 1.8 1998/08/25 21:37:00 scrappy Exp $ + * $Id: async.h,v 1.9 1998/09/01 04:35:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,4 @@ extern void Async_Unlisten(char *relname, int pid); extern GlobalMemory notifyContext; -#endif /* ASYNC_H */ +#endif /* ASYNC_H */ diff --git a/src/include/commands/cluster.h b/src/include/commands/cluster.h index ed89240ae7a..ece07382e6a 100644 --- a/src/include/commands/cluster.h +++ b/src/include/commands/cluster.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994-5, Regents of the University of California * - * $Id: cluster.h,v 1.5 1998/09/01 03:28:02 momjian Exp $ + * $Id: cluster.h,v 1.6 1998/09/01 04:35:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,4 @@ */ extern void cluster(char *oldrelname, char *oldindexname); -#endif /* CLUSTER_H */ +#endif /* CLUSTER_H */ diff --git a/src/include/commands/command.h b/src/include/commands/command.h index c10807668d9..4091a5583e7 100644 --- a/src/include/commands/command.h +++ b/src/include/commands/command.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: command.h,v 1.9 1998/02/26 04:41:04 momjian Exp $ + * $Id: command.h,v 1.10 1998/09/01 04:35:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,8 +26,7 @@ extern MemoryContext PortalExecutorHeapMemory; * BadArg if forward invalid. * "WARN" if portal not found. */ -extern void -PerformPortalFetch(char *name, bool forward, int count, +extern void PerformPortalFetch(char *name, bool forward, int count, char *tag, CommandDest dest); /* @@ -42,8 +41,7 @@ extern void PortalCleanup(Portal portal); * PerformAddAttribute -- * Performs the POSTQUEL function ADD. */ -extern void -PerformAddAttribute(char *relationName, char *userName, +extern void PerformAddAttribute(char *relationName, char *userName, bool inh, ColumnDef *colDef); -#endif /* COMMAND_H */ +#endif /* COMMAND_H */ diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h index e1fb6a37838..16254a33ad3 100644 --- a/src/include/commands/copy.h +++ b/src/include/commands/copy.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: copy.h,v 1.3 1997/09/07 04:57:23 momjian Exp $ + * $Id: copy.h,v 1.4 1998/09/01 04:35:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,8 +14,7 @@ #define COPY_H -void -DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe, char *filename, +void DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe, char *filename, char *delim); -#endif /* COPY_H */ +#endif /* COPY_H */ diff --git a/src/include/commands/creatinh.h b/src/include/commands/creatinh.h index f4e5f396682..a80e7547000 100644 --- a/src/include/commands/creatinh.h +++ b/src/include/commands/creatinh.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: creatinh.h,v 1.7 1998/08/06 05:13:10 momjian Exp $ + * $Id: creatinh.h,v 1.8 1998/09/01 04:35:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,4 @@ extern void DefineRelation(CreateStmt *stmt, char relkind); extern void RemoveRelation(char *name); -#endif /* CREATINH_H */ +#endif /* CREATINH_H */ diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h index 0ee47857c8a..d55f45cbfea 100644 --- a/src/include/commands/dbcommands.h +++ b/src/include/commands/dbcommands.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dbcommands.h,v 1.5 1998/08/24 01:14:20 momjian Exp $ + * $Id: dbcommands.h,v 1.6 1998/09/01 04:35:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern void createdb(char *dbname, char *dbpath, int encoding); extern void destroydb(char *dbname); -#endif /* DBCOMMANDS_H */ +#endif /* DBCOMMANDS_H */ diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h index 9a78b32942e..37b287d9fac 100644 --- a/src/include/commands/defrem.h +++ b/src/include/commands/defrem.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: defrem.h,v 1.12 1998/02/26 04:41:06 momjian Exp $ + * $Id: defrem.h,v 1.13 1998/09/01 04:35:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,8 +19,7 @@ /* * prototypes in defind.c */ -extern void -DefineIndex(char *heapRelationName, +extern void DefineIndex(char *heapRelationName, char *indexRelationName, char *accessMethodName, List *attributeList, @@ -28,8 +27,7 @@ DefineIndex(char *heapRelationName, bool unique, Expr *predicate, List *rangetable); -extern void -ExtendIndex(char *indexRelationName, +extern void ExtendIndex(char *indexRelationName, Expr *predicate, List *rangetable); extern void RemoveIndex(char *name); @@ -47,10 +45,9 @@ extern void CreateFunction(ProcedureStmt *stmt, CommandDest dest); * prototypes in remove.c */ extern void RemoveFunction(char *functionName, int nargs, List *argNameList); -extern void -RemoveOperator(char *operatorName, +extern void RemoveOperator(char *operatorName, char *typeName1, char *typeName2); extern void RemoveType(char *typeName); extern void RemoveAggregate(char *aggName, char *aggType); -#endif /* DEFREM_H */ +#endif /* DEFREM_H */ diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h index 6b808582a0e..d9ca4b1995d 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994-5, Regents of the University of California * - * $Id: explain.h,v 1.6 1997/11/26 01:12:16 momjian Exp $ + * $Id: explain.h,v 1.7 1998/09/01 04:35:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,4 @@ extern void ExplainQuery(Query *query, bool verbose, CommandDest dest); -#endif /* EXPLAIN_H */ +#endif /* EXPLAIN_H */ diff --git a/src/include/commands/proclang.h b/src/include/commands/proclang.h index 7b9fdf34da9..b1ad0f8493b 100644 --- a/src/include/commands/proclang.h +++ b/src/include/commands/proclang.h @@ -14,4 +14,4 @@ extern void CreateProceduralLanguage(CreatePLangStmt *stmt); extern void DropProceduralLanguage(DropPLangStmt *stmt); -#endif /* PROCLANG_H */ +#endif /* PROCLANG_H */ diff --git a/src/include/commands/recipe.h b/src/include/commands/recipe.h index c90d663295e..119e2e12801 100644 --- a/src/include/commands/recipe.h +++ b/src/include/commands/recipe.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: recipe.h,v 1.5 1997/11/26 01:12:24 momjian Exp $ + * $Id: recipe.h,v 1.6 1998/09/01 04:35:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,4 +16,4 @@ extern void beginRecipe(RecipeStmt *stmt); -#endif /* RECIPE_H */ +#endif /* RECIPE_H */ diff --git a/src/include/commands/rename.h b/src/include/commands/rename.h index 49c42b6b33f..e2ddce6d9a1 100644 --- a/src/include/commands/rename.h +++ b/src/include/commands/rename.h @@ -6,21 +6,19 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rename.h,v 1.4 1998/02/26 04:41:08 momjian Exp $ + * $Id: rename.h,v 1.5 1998/09/01 04:35:34 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef RENAME_H #define RENAME_H -extern void -renameatt(char *relname, +extern void renameatt(char *relname, char *oldattname, char *newattname, char *userName, int recurse); -extern void -renamerel(char *oldrelname, +extern void renamerel(char *oldrelname, char *newrelname); -#endif /* RENAME_H */ +#endif /* RENAME_H */ diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h index f2186cccda3..89b628b4374 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -30,7 +30,7 @@ extern void DefineSequence(CreateSeqStmt *stmt); extern int4 nextval(struct varlena * seqname); extern int4 currval(struct varlena * seqname); -extern int4 setval (struct varlena * seqname, int4 next); +extern int4 setval(struct varlena * seqname, int4 next); extern void CloseSequences(void); -#endif /* SEQUENCE_H */ +#endif /* SEQUENCE_H */ diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h index 1ed6b61d1dd..3cc0fdcc066 100644 --- a/src/include/commands/trigger.h +++ b/src/include/commands/trigger.h @@ -70,4 +70,4 @@ extern void ExecARDeleteTriggers(Relation rel, ItemPointer tupleid); extern HeapTuple ExecBRUpdateTriggers(Relation rel, ItemPointer tupleid, HeapTuple tuple); extern void ExecARUpdateTriggers(Relation rel, ItemPointer tupleid, HeapTuple tuple); -#endif /* TRIGGER_H */ +#endif /* TRIGGER_H */ diff --git a/src/include/commands/user.h b/src/include/commands/user.h index d75478403db..a81c6617e82 100644 --- a/src/include/commands/user.h +++ b/src/include/commands/user.h @@ -14,4 +14,4 @@ extern void DefineUser(CreateUserStmt *stmt); extern void AlterUser(AlterUserStmt *stmt); extern void RemoveUser(char *user); -#endif /* USER_H */ +#endif /* USER_H */ diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index 47a818fb4be..126a9e9f5a0 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: vacuum.h,v 1.15 1998/09/01 03:28:04 momjian Exp $ + * $Id: vacuum.h,v 1.16 1998/09/01 04:35:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,9 +33,11 @@ typedef struct VPageDescrData { BlockNumber vpd_blkno; /* BlockNumber of this Page */ Size vpd_free; /* FreeSpace on this Page */ - uint16 vpd_offsets_used; /* Number of OffNums used by vacuum */ - uint16 vpd_offsets_free; /* Number of OffNums free or to be free */ - OffsetNumber vpd_offsets[1]; /* Array of its OffNums */ + uint16 vpd_offsets_used; /* Number of OffNums used by + * vacuum */ + uint16 vpd_offsets_free; /* Number of OffNums free or to be + * free */ + OffsetNumber vpd_offsets[1];/* Array of its OffNums */ } VPageDescrData; typedef VPageDescrData *VPageDescr; @@ -43,7 +45,7 @@ typedef VPageDescrData *VPageDescr; typedef struct VPageListData { int vpl_empty_end_pages; /* Number of "empty" end-pages */ - int vpl_num_pages; /* Number of pages in vpl_pagedesc */ + int vpl_num_pages; /* Number of pages in vpl_pagedesc */ VPageDescr *vpl_pagedesc; /* Descriptions of pages */ } VPageListData; @@ -112,4 +114,4 @@ extern void vacuum(char *vacrel, bool verbose, bool analyze, List *va_spec); #define ATTNVALS_SCALE 1000000000 /* XXX so it can act as a float4 */ -#endif /* VACUUM_H */ +#endif /* VACUUM_H */ diff --git a/src/include/commands/variable.h b/src/include/commands/variable.h index 92f4bda3462..4acb4267106 100644 --- a/src/include/commands/variable.h +++ b/src/include/commands/variable.h @@ -2,7 +2,7 @@ * Headers for handling of 'SET var TO', 'SHOW var' and 'RESET var' * statements * - * $Id: variable.h,v 1.5 1998/07/26 04:31:24 scrappy Exp $ + * $Id: variable.h,v 1.6 1998/09/01 04:35:40 momjian Exp $ * */ #ifndef VARIABLE_H @@ -55,4 +55,4 @@ extern bool show_geqo(void); extern bool reset_geqo(void); extern bool parse_geqo(const char *); -#endif /* VARIABLE_H */ +#endif /* VARIABLE_H */ diff --git a/src/include/commands/version.h b/src/include/commands/version.h index 7365a829629..7dd3c4e68e8 100644 --- a/src/include/commands/version.h +++ b/src/include/commands/version.h @@ -6,11 +6,11 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: version.h,v 1.5 1997/09/07 04:57:35 momjian Exp $ + * $Id: version.h,v 1.6 1998/09/01 04:35:41 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef VERSION_H #define VERSION_H -#endif /* VERSION_H */ +#endif /* VERSION_H */ diff --git a/src/include/commands/view.h b/src/include/commands/view.h index da1276d9a73..d039b56b91e 100644 --- a/src/include/commands/view.h +++ b/src/include/commands/view.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: view.h,v 1.5 1997/11/26 01:12:33 momjian Exp $ + * $Id: view.h,v 1.6 1998/09/01 04:35:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,4 @@ extern char *MakeRetrieveViewRuleName(char *view_name); extern void DefineView(char *view_name, Query *view_parse); extern void RemoveView(char *view_name); -#endif /* VIEW_H */ +#endif /* VIEW_H */ diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h index 3ecb90810b0..36f434804f7 100644 --- a/src/include/executor/execFlatten.h +++ b/src/include/executor/execFlatten.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execFlatten.h,v 1.6 1997/11/26 01:12:36 momjian Exp $ + * $Id: execFlatten.h,v 1.7 1998/09/01 04:35:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern Datum ExecEvalIter(Iter *iterNode, ExprContext *econtext, bool *resultIsN extern void ExecEvalFjoin(TargetEntry *tlist, ExprContext *econtext, bool *isNullVect, bool *fj_isDone); -#endif /* EXECFLATTEN_H */ +#endif /* EXECFLATTEN_H */ diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h index d9a746a7255..40ffd4a1d4f 100644 --- a/src/include/executor/execdebug.h +++ b/src/include/executor/execdebug.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execdebug.h,v 1.5 1998/06/15 18:39:55 momjian Exp $ + * $Id: execdebug.h,v 1.6 1998/09/01 04:35:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -202,7 +202,7 @@ extern int NIndexTupleInserted; #define IncrProcessed() (void)(0) #define IncrIndexProcessed() (void)(0) #define IncrIndexInserted() (void)(0) -#endif /* EXEC_TUPLECOUNT */ +#endif /* EXEC_TUPLECOUNT */ /* ---------------- * memory context debugging defines @@ -214,7 +214,7 @@ extern int NIndexTupleInserted; #else #define CXT_printf(s) #define CXT1_printf(s, a) -#endif /* EXEC_CONTEXTDEBUG */ +#endif /* EXEC_CONTEXTDEBUG */ /* ---------------- * eutils debugging defines @@ -234,7 +234,7 @@ extern int NIndexTupleInserted; #define EU2_printf(s, a, b) #define EU3_printf(s, a, b, c) #define EU4_printf(s, a, b, c, d) -#endif /* EXEC_UTILSDEBUG */ +#endif /* EXEC_UTILSDEBUG */ /* ---------------- @@ -253,7 +253,7 @@ extern int NIndexTupleInserted; #define NL1_printf(s, a) #define NL4_printf(s, a, b, c, d) #define ENL1_printf(message) -#endif /* EXEC_NESTLOOPDEBUG */ +#endif /* EXEC_NESTLOOPDEBUG */ /* ---------------- * proc node debugging defines @@ -265,7 +265,7 @@ extern int NIndexTupleInserted; #else #define PN_printf(s) #define PN1_printf(s, p) -#endif /* EXEC_PROCDEBUG */ +#endif /* EXEC_PROCDEBUG */ /* ---------------- * exec eval / target list debugging defines @@ -281,7 +281,7 @@ extern int NIndexTupleInserted; #define EV_printf(s) #define EV1_printf(s, a) #define EV5_printf(s, a, b, c, d, e) -#endif /* EXEC_EVALDEBUG */ +#endif /* EXEC_EVALDEBUG */ /* ---------------- * scan debugging defines @@ -295,7 +295,7 @@ extern int NIndexTupleInserted; #define S_nodeDisplay(l) #define S_printf(s) #define S1_printf(s, p) -#endif /* EXEC_SCANDEBUG */ +#endif /* EXEC_SCANDEBUG */ /* ---------------- * sort node debugging defines @@ -309,7 +309,7 @@ extern int NIndexTupleInserted; #define SO_nodeDisplay(l) #define SO_printf(s) #define SO1_printf(s, p) -#endif /* EXEC_SORTDEBUG */ +#endif /* EXEC_SORTDEBUG */ /* ---------------- * merge join debugging defines @@ -343,7 +343,7 @@ extern int NIndexTupleInserted; #define MJ_DEBUG_QUAL(clause, res) #define MJ_DEBUG_MERGE_COMPARE(qual, res) #define MJ_DEBUG_PROC_NODE(slot) -#endif /* EXEC_MERGEJOINDEBUG */ +#endif /* EXEC_MERGEJOINDEBUG */ /* ---------------------------------------------------------------- * DO NOT DEFINE THESE EVER OR YOU WILL BURN! @@ -381,4 +381,4 @@ extern int NIndexTupleInserted; extern long NDirectFileRead; extern long NDirectFileWrite; -#endif /* ExecDebugIncluded */ +#endif /* ExecDebugIncluded */ diff --git a/src/include/executor/execdefs.h b/src/include/executor/execdefs.h index 59748cfe9be..330801e2f9a 100644 --- a/src/include/executor/execdefs.h +++ b/src/include/executor/execdefs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execdefs.h,v 1.2 1997/09/07 04:57:46 momjian Exp $ + * $Id: execdefs.h,v 1.3 1998/09/01 04:35:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,4 +44,4 @@ #define EXEC_MJ_SKIPINNER 8 #define EXEC_MJ_SKIPOUTER 9 -#endif /* EXECDEFS_H */ +#endif /* EXECDEFS_H */ diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index b7d71250ea0..258ff39fae8 100644 --- a/src/include/executor/execdesc.h +++ b/src/include/executor/execdesc.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execdesc.h,v 1.8 1998/02/26 04:41:17 momjian Exp $ + * $Id: execdesc.h,v 1.9 1998/09/01 04:35:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,8 +33,7 @@ typedef struct QueryDesc } QueryDesc; /* in pquery.c */ -extern QueryDesc * -CreateQueryDesc(Query *parsetree, Plan *plantree, +extern QueryDesc *CreateQueryDesc(Query *parsetree, Plan *plantree, CommandDest dest); -#endif /* EXECDESC_H */ +#endif /* EXECDESC_H */ diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index fea963fc110..cf218dcd7fd 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: executor.h,v 1.24 1998/09/01 03:28:06 momjian Exp $ + * $Id: executor.h,v 1.25 1998/09/01 04:35:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -59,14 +59,12 @@ /* * prototypes from functions in execAmi.c */ -extern void -ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex, - ScanDirection dir, Snapshot snapshot, +extern void ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex, + ScanDirection dir, Snapshot snapshot, Relation *returnRelation, Pointer *returnScanDesc); extern void ExecCloseR(Plan *node); extern void ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent); -extern HeapScanDesc -ExecReScanR(Relation relDesc, HeapScanDesc scanDesc, +extern HeapScanDesc ExecReScanR(Relation relDesc, HeapScanDesc scanDesc, ScanDirection direction, int nkeys, ScanKey skeys); extern void ExecMarkPos(Plan *node); extern void ExecRestrPos(Plan *node); @@ -76,8 +74,7 @@ extern Relation ExecCreatR(TupleDesc tupType, Oid relationOid); * prototypes from functions in execJunk.c */ extern JunkFilter *ExecInitJunkFilter(List *targetList); -extern bool -ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot, +extern bool ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot, char *attrName, Datum *value, bool *isNull); extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot); @@ -104,20 +101,16 @@ extern void ExecEndNode(Plan *node, Plan *parent); extern bool execConstByVal; extern int execConstLen; -extern Datum -ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum, +extern Datum ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum, bool *isNull); -extern Datum -ExecEvalParam(Param *expression, ExprContext *econtext, +extern Datum ExecEvalParam(Param *expression, ExprContext *econtext, bool *isNull); /* stop here */ -extern char * -GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno, +extern char *GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno, bool *isNull); extern char *GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull); -extern Datum -ExecEvalExpr(Node *expression, ExprContext *econtext, bool *isNull, +extern Datum ExecEvalExpr(Node *expression, ExprContext *econtext, bool *isNull, bool *isDone); extern bool ExecQual(List *qual, ExprContext *econtext); extern int ExecTargetListLength(List *targetlist); @@ -134,20 +127,17 @@ extern TupleTableSlot *ExecScan(Scan *node, TupleTableSlot *(*accessMtd) ()); extern TupleTable ExecCreateTupleTable(int initialSize); extern void ExecDestroyTupleTable(TupleTable table, bool shouldFree); extern TupleTableSlot *ExecAllocTableSlot(TupleTable table); -extern TupleTableSlot * -ExecStoreTuple(HeapTuple tuple, +extern TupleTableSlot *ExecStoreTuple(HeapTuple tuple, TupleTableSlot *slot, Buffer buffer, bool shouldFree); extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot); extern bool ExecSetSlotPolicy(TupleTableSlot *slot, bool shouldFree); -extern TupleDesc -ExecSetSlotDescriptor(TupleTableSlot *slot, +extern TupleDesc ExecSetSlotDescriptor(TupleTableSlot *slot, TupleDesc tupdesc); extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew); extern void ExecInitResultTupleSlot(EState *estate, CommonState *commonstate); -extern void -ExecInitScanTupleSlot(EState *estate, +extern void ExecInitScanTupleSlot(EState *estate, CommonScanState *commonscanstate); extern void ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate); extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate); @@ -160,35 +150,28 @@ extern void SetChangedParamList(Plan *node, List *newchg); * prototypes from functions in execTuples.c */ extern void ResetTupleCount(void); -extern void -ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode, +extern void ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode, Plan *parent); extern void ExecAssignExprContext(EState *estate, CommonState *commonstate); -extern void -ExecAssignResultType(CommonState *commonstate, +extern void ExecAssignResultType(CommonState *commonstate, TupleDesc tupDesc); -extern void -ExecAssignResultTypeFromOuterPlan(Plan *node, +extern void ExecAssignResultTypeFromOuterPlan(Plan *node, CommonState *commonstate); extern void ExecAssignResultTypeFromTL(Plan *node, CommonState *commonstate); extern TupleDesc ExecGetResultType(CommonState *commonstate); extern void ExecAssignProjectionInfo(Plan *node, CommonState *commonstate); extern void ExecFreeProjectionInfo(CommonState *commonstate); extern TupleDesc ExecGetScanType(CommonScanState *csstate); -extern void -ExecAssignScanType(CommonScanState *csstate, +extern void ExecAssignScanType(CommonScanState *csstate, TupleDesc tupDesc); -extern void -ExecAssignScanTypeFromOuterPlan(Plan *node, +extern void ExecAssignScanTypeFromOuterPlan(Plan *node, CommonScanState *csstate); extern Form_pg_attribute ExecGetTypeInfo(Relation relDesc); -extern void -ExecOpenIndices(Oid resultRelationOid, +extern void ExecOpenIndices(Oid resultRelationOid, RelationInfo *resultRelationInfo); extern void ExecCloseIndices(RelationInfo *resultRelationInfo); -extern void -ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid, +extern void ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid, EState *estate, bool is_update); -#endif /* EXECUTOR_H */ +#endif /* EXECUTOR_H */ diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h index 209d4b34e9d..c521b9efd61 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: functions.h,v 1.7 1998/02/26 04:41:20 momjian Exp $ + * $Id: functions.h,v 1.8 1998/09/01 04:35:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,12 +18,10 @@ #include "nodes/primnodes.h" #include "utils/syscache.h" -extern Datum -ProjectAttribute(TupleDesc TD, TargetEntry *tlist, +extern Datum ProjectAttribute(TupleDesc TD, TargetEntry *tlist, HeapTuple tup, bool *isnullP); -extern Datum -postquel_function(Func *funcNode, char **args, +extern Datum postquel_function(Func *funcNode, char **args, bool *isNull, bool *isDone); -#endif /* FUNCTIONS_H */ +#endif /* FUNCTIONS_H */ diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index e6f0766b720..3dceec85f34 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hashjoin.h,v 1.6 1997/09/08 21:52:00 momjian Exp $ + * $Id: hashjoin.h,v 1.7 1998/09/01 04:35:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -81,4 +81,4 @@ typedef HashBucketData *HashBucket; #define HASH_PERMISSION 0700 -#endif /* HASHJOIN_H */ +#endif /* HASHJOIN_H */ diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h index ca8de787d17..7c3ee010e87 100644 --- a/src/include/executor/nodeAgg.h +++ b/src/include/executor/nodeAgg.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeAgg.h,v 1.7 1998/02/13 03:43:34 vadim Exp $ + * $Id: nodeAgg.h,v 1.8 1998/09/01 04:35:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern int ExecCountSlotsAgg(Agg *node); extern void ExecEndAgg(Agg *node); extern void ExecReScanAgg(Agg *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEAGG_H */ +#endif /* NODEAGG_H */ diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h index 2825cf573f4..10549fbaca8 100644 --- a/src/include/executor/nodeAppend.h +++ b/src/include/executor/nodeAppend.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeAppend.h,v 1.8 1998/07/15 22:16:21 momjian Exp $ + * $Id: nodeAppend.h,v 1.9 1998/09/01 04:35:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern TupleTableSlot *ExecProcAppend(Append *node); extern void ExecEndAppend(Append *node); extern void ExecReScanAppend(Append *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEAPPEND_H */ +#endif /* NODEAPPEND_H */ diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h index 4449a09b4ac..0c23aa02d33 100644 --- a/src/include/executor/nodeGroup.h +++ b/src/include/executor/nodeGroup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeGroup.h,v 1.6 1998/07/16 01:49:19 momjian Exp $ + * $Id: nodeGroup.h,v 1.7 1998/09/01 04:35:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern int ExecCountSlotsGroup(Group *node); extern void ExecEndGroup(Group *node); extern void ExecReScanGroup(Group *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEGROUP_H */ +#endif /* NODEGROUP_H */ diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index 720fcf80678..27ae5f80d3f 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHash.h,v 1.9 1998/02/26 04:41:21 momjian Exp $ + * $Id: nodeHash.h,v 1.10 1998/09/01 04:35:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,18 +26,15 @@ extern bool ExecInitHash(Hash *node, EState *estate, Plan *parent); extern int ExecCountSlotsHash(Hash *node); extern void ExecEndHash(Hash *node); extern HashJoinTable ExecHashTableCreate(Hash *node); -extern void -ExecHashTableInsert(HashJoinTable hashtable, ExprContext *econtext, +extern void ExecHashTableInsert(HashJoinTable hashtable, ExprContext *econtext, Var *hashkey, File *batches); extern void ExecHashTableDestroy(HashJoinTable hashtable); -extern int -ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext, +extern int ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext, Var *hashkey); -extern HeapTuple -ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket, +extern HeapTuple ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket, HeapTuple curtuple, List *hjclauses, ExprContext *econtext); extern void ExecHashTableReset(HashJoinTable hashtable, int ntuples); extern void ExecReScanHash(Hash *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEHASH_H */ +#endif /* NODEHASH_H */ diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index 08827cec072..8699e593362 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHashjoin.h,v 1.9 1998/02/26 04:41:23 momjian Exp $ + * $Id: nodeHashjoin.h,v 1.10 1998/09/01 04:35:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,10 +21,9 @@ extern TupleTableSlot *ExecHashJoin(HashJoin *node); extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent); extern int ExecCountSlotsHashJoin(HashJoin *node); extern void ExecEndHashJoin(HashJoin *node); -extern char * -ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer, +extern char *ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer, File file, char *position); extern void ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEHASHJOIN_H */ +#endif /* NODEHASHJOIN_H */ diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h index 1e13cc9666b..2990e75b480 100644 --- a/src/include/executor/nodeIndexscan.h +++ b/src/include/executor/nodeIndexscan.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeIndexscan.h,v 1.6 1997/11/26 01:12:52 momjian Exp $ + * $Id: nodeIndexscan.h,v 1.7 1998/09/01 04:35:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,4 @@ extern bool ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent); extern int ExecCountSlotsIndexScan(IndexScan *node); extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEINDEXSCAN_H */ +#endif /* NODEINDEXSCAN_H */ diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h index c52e06ec98f..dbd755bae8c 100644 --- a/src/include/executor/nodeMaterial.h +++ b/src/include/executor/nodeMaterial.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMaterial.h,v 1.7 1998/02/26 04:41:24 momjian Exp $ + * $Id: nodeMaterial.h,v 1.8 1998/09/01 04:36:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,4 @@ extern List ExecMaterialMarkPos(Material *node); extern void ExecMaterialRestrPos(Material *node); #endif -#endif /* NODEMATERIAL_H */ +#endif /* NODEMATERIAL_H */ diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h index e3d1b15500d..1095315978c 100644 --- a/src/include/executor/nodeMergejoin.h +++ b/src/include/executor/nodeMergejoin.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMergejoin.h,v 1.8 1998/02/27 16:12:09 vadim Exp $ + * $Id: nodeMergejoin.h,v 1.9 1998/09/01 04:36:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern int ExecCountSlotsMergeJoin(MergeJoin *node); extern void ExecEndMergeJoin(MergeJoin *node); extern void ExecReScanMergeJoin(MergeJoin *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEMERGEJOIN_H; */ +#endif /* NODEMERGEJOIN_H; */ diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h index 50d2f49820f..2c79b4d62a2 100644 --- a/src/include/executor/nodeNestloop.h +++ b/src/include/executor/nodeNestloop.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeNestloop.h,v 1.6 1998/02/13 03:43:38 vadim Exp $ + * $Id: nodeNestloop.h,v 1.7 1998/09/01 04:36:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern int ExecCountSlotsNestLoop(NestLoop *node); extern void ExecEndNestLoop(NestLoop *node); extern void ExecReScanNestLoop(NestLoop *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODENESTLOOP_H */ +#endif /* NODENESTLOOP_H */ diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h index fffdf52e6ab..f966ab0dc90 100644 --- a/src/include/executor/nodeResult.h +++ b/src/include/executor/nodeResult.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeResult.h,v 1.6 1998/02/13 03:43:39 vadim Exp $ + * $Id: nodeResult.h,v 1.7 1998/09/01 04:36:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern int ExecCountSlotsResult(Result *node); extern void ExecEndResult(Result *node); extern void ExecReScanResult(Result *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODERESULT_H */ +#endif /* NODERESULT_H */ diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h index 2c980d8eaad..1064b02b97a 100644 --- a/src/include/executor/nodeSeqscan.h +++ b/src/include/executor/nodeSeqscan.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSeqscan.h,v 1.6 1997/11/26 01:13:00 momjian Exp $ + * $Id: nodeSeqscan.h,v 1.7 1998/09/01 04:36:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,4 +25,4 @@ extern void ExecSeqReScan(SeqScan *node, ExprContext *exprCtxt, Plan *parent); extern void ExecSeqMarkPos(SeqScan *node); extern void ExecSeqRestrPos(SeqScan *node); -#endif /* NODESEQSCAN_H */ +#endif /* NODESEQSCAN_H */ diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h index 89beeb8c721..5d405fcc003 100644 --- a/src/include/executor/nodeSort.h +++ b/src/include/executor/nodeSort.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSort.h,v 1.6 1998/02/23 06:27:55 vadim Exp $ + * $Id: nodeSort.h,v 1.7 1998/09/01 04:36:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,4 +25,4 @@ extern void ExecSortMarkPos(Sort *node); extern void ExecSortRestrPos(Sort *node); extern void ExecReScanSort(Sort *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODESORT_H */ +#endif /* NODESORT_H */ diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h index dc25902a793..a28cd2c4852 100644 --- a/src/include/executor/nodeSubplan.h +++ b/src/include/executor/nodeSubplan.h @@ -17,4 +17,4 @@ extern void ExecReScanSetParamPlan(SubPlan *node, Plan *parent); extern void ExecSetParamPlan(SubPlan *node); extern void ExecEndSubPlan(SubPlan *node); -#endif /* NODESUBPLAN_H */ +#endif /* NODESUBPLAN_H */ diff --git a/src/include/executor/nodeTee.h b/src/include/executor/nodeTee.h index d58b0b1cf6d..349c091e6a4 100644 --- a/src/include/executor/nodeTee.h +++ b/src/include/executor/nodeTee.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeTee.h,v 1.5 1997/11/26 01:13:06 momjian Exp $ + * $Id: nodeTee.h,v 1.6 1998/09/01 04:36:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern void ExecTeeReScan(Tee *node, ExprContext *exprCtxt, Plan *parent); extern void ExecEndTee(Tee *node, Plan *parent); extern int ExecCountSlotsTee(Tee *node); -#endif /* NODETEE_H */ +#endif /* NODETEE_H */ diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h index ba4112cb8de..f414b7b6598 100644 --- a/src/include/executor/nodeUnique.h +++ b/src/include/executor/nodeUnique.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeUnique.h,v 1.6 1998/02/23 06:27:56 vadim Exp $ + * $Id: nodeUnique.h,v 1.7 1998/09/01 04:36:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern int ExecCountSlotsUnique(Unique *node); extern void ExecEndUnique(Unique *node); extern void ExecReScanUnique(Unique *node, ExprContext *exprCtxt, Plan *parent); -#endif /* NODEUNIQUE_H */ +#endif /* NODEUNIQUE_H */ diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index d5479007087..72b6fe0f1fa 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -78,8 +78,7 @@ extern void *SPI_prepare(char *src, int nargs, Oid *argtypes); extern void *SPI_saveplan(void *plan); extern HeapTuple SPI_copytuple(HeapTuple tuple); -extern HeapTuple -SPI_modifytuple(Relation rel, HeapTuple tuple, int natts, +extern HeapTuple SPI_modifytuple(Relation rel, HeapTuple tuple, int natts, int *attnum, Datum *Values, char *Nulls); extern int SPI_fnumber(TupleDesc tupdesc, char *fname); extern char *SPI_fname(TupleDesc tupdesc, int fnumber); @@ -92,4 +91,4 @@ extern void *SPI_palloc(Size size); extern void *SPI_repalloc(void *pointer, Size size); extern void SPI_pfree(void *pointer); -#endif /* SPI_H */ +#endif /* SPI_H */ diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index 1df589265e2..e0ab50b5f38 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tuptable.h,v 1.7 1997/09/08 21:52:16 momjian Exp $ + * $Id: tuptable.h,v 1.8 1998/09/01 04:36:13 momjian Exp $ * * NOTES * The tuple table interface is getting pretty ugly. @@ -75,4 +75,4 @@ typedef TupleTableData *TupleTable; - jolly */ -#endif /* TUPTABLE_H */ +#endif /* TUPTABLE_H */ diff --git a/src/include/lib/dllist.h b/src/include/lib/dllist.h index 238ac3b8ea0..09428512a08 100644 --- a/src/include/lib/dllist.h +++ b/src/include/lib/dllist.h @@ -26,7 +26,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dllist.h,v 1.7 1997/09/08 21:52:17 momjian Exp $ + * $Id: dllist.h,v 1.8 1998/09/01 04:36:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -69,4 +69,4 @@ extern Dlelem *DLRemHead(Dllist *list); /* remove and return the head */ #define DLE_VAL(x) (x->dle_val) -#endif /* DLLIST_H */ +#endif /* DLLIST_H */ diff --git a/src/include/lib/fstack.h b/src/include/lib/fstack.h index 2fbf62606cd..d71fe6ce422 100644 --- a/src/include/lib/fstack.h +++ b/src/include/lib/fstack.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: fstack.h,v 1.5 1997/09/08 21:52:20 momjian Exp $ + * $Id: fstack.h,v 1.6 1998/09/01 04:36:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -111,4 +111,4 @@ extern Pointer FixedStackGetTop(FixedStack stack); */ extern Pointer FixedStackGetNext(FixedStack stack, Pointer pointer); -#endif /* FSTACK_H */ +#endif /* FSTACK_H */ diff --git a/src/include/lib/hasht.h b/src/include/lib/hasht.h index f2261d3eccf..f23197c0b90 100644 --- a/src/include/lib/hasht.h +++ b/src/include/lib/hasht.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hasht.h,v 1.5 1997/09/08 21:52:21 momjian Exp $ + * $Id: hasht.h,v 1.6 1998/09/01 04:36:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,4 +20,4 @@ typedef void (*HashtFunc) (); extern void HashTableWalk(HTAB *hashtable, HashtFunc function, int arg); -#endif /* HASHT_H */ +#endif /* HASHT_H */ diff --git a/src/include/lib/lispsort.h b/src/include/lib/lispsort.h index d4d074ba54d..a75c3e1e145 100644 --- a/src/include/lib/lispsort.h +++ b/src/include/lib/lispsort.h @@ -6,11 +6,11 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lispsort.h,v 1.3 1997/09/07 04:58:12 momjian Exp $ + * $Id: lispsort.h,v 1.4 1998/09/01 04:36:19 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef LISPSORT_H #define LISPSORT_H -#endif /* LISPSORT_H */ +#endif /* LISPSORT_H */ diff --git a/src/include/lib/qsort.h b/src/include/lib/qsort.h index 9bf57408d43..9d27da8f573 100644 --- a/src/include/lib/qsort.h +++ b/src/include/lib/qsort.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: qsort.h,v 1.5 1998/02/26 04:41:31 momjian Exp $ + * $Id: qsort.h,v 1.6 1998/09/01 04:36:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,10 +14,9 @@ #define QSORT_H -extern void -pg_qsort(void *bot, +extern void pg_qsort(void *bot, size_t nmemb, size_t size, int (*compar) (void *, void *)); -#endif /* QSORT_H */ +#endif /* QSORT_H */ diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h index f9987db1682..2c32fb4e92d 100644 --- a/src/include/lib/stringinfo.h +++ b/src/include/lib/stringinfo.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: stringinfo.h,v 1.6 1998/03/20 04:12:21 momjian Exp $ + * $Id: stringinfo.h,v 1.7 1998/09/01 04:36:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,4 +44,4 @@ extern StringInfo makeStringInfo(void); */ extern void appendStringInfo(StringInfo str, char *buffer); -#endif /* STRINGINFO_H */ +#endif /* STRINGINFO_H */ diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h index 0adc4d46582..e349cf661ea 100644 --- a/src/include/libpq/auth.h +++ b/src/include/libpq/auth.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: auth.h,v 1.9 1998/02/26 04:41:35 momjian Exp $ + * $Id: auth.h,v 1.10 1998/09/01 04:36:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,4 +26,4 @@ void auth_failed(Port *port); #define PG_KRB4_VERSION "PGVER4.1" /* at most KRB_SENDAUTH_VLEN chars */ #define PG_KRB5_VERSION "PGVER5.1" -#endif /* AUTH_H */ +#endif /* AUTH_H */ diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h index 108869dac95..6f858fee943 100644 --- a/src/include/libpq/be-fsstubs.h +++ b/src/include/libpq/be-fsstubs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: be-fsstubs.h,v 1.6 1998/07/21 04:17:26 momjian Exp $ + * $Id: be-fsstubs.h,v 1.7 1998/09/01 04:36:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,4 +42,4 @@ extern int lowrite(int fd, struct varlena * wbuf); */ extern void _lo_commit(void); -#endif /* BE_FSSTUBS_H */ +#endif /* BE_FSSTUBS_H */ diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index f8291ccb1c4..d93b02014c5 100644 --- a/src/include/libpq/hba.h +++ b/src/include/libpq/hba.h @@ -4,7 +4,7 @@ * Interface to hba.c * * - * $Id: hba.h,v 1.10 1998/09/01 03:28:10 momjian Exp $ + * $Id: hba.h,v 1.11 1998/09/01 04:36:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -50,11 +50,9 @@ typedef enum UserAuth uaCrypt } UserAuth; -int -hba_getauthmethod(SockAddr *raddr, char *user, char *database, +int hba_getauthmethod(SockAddr *raddr, char *user, char *database, char *auth_arg, UserAuth *auth_method); -int -authident(struct sockaddr_in * raddr, struct sockaddr_in * laddr, +int authident(struct sockaddr_in * raddr, struct sockaddr_in * laddr, const char *postgres_username, const char *auth_arg); #endif diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 5d0c6d7ac6e..bad77383c98 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-be.h,v 1.11 1998/07/09 03:29:00 scrappy Exp $ + * $Id: libpq-be.h,v 1.12 1998/09/01 04:36:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,7 +68,7 @@ typedef enum WritingPacket } PacketState; -typedef int (*PacketDoneProc) (void * arg, PacketLen pktlen, void * pktdata); +typedef int (*PacketDoneProc) (void *arg, PacketLen pktlen, void *pktdata); typedef struct Packet { @@ -76,11 +76,13 @@ typedef struct Packet PacketLen len; /* Actual length */ int nrtodo; /* Bytes still to transfer */ char *ptr; /* Buffer pointer */ - PacketDoneProc iodone; /* I/O complete callback */ + PacketDoneProc iodone; /* I/O complete callback */ void *arg; /* Argument to callback */ - /* We declare the data buffer as a union of the allowed packet types, - * mainly to ensure that enough space is allocated for the largest one. + /* + * We declare the data buffer as a union of the allowed packet types, + * mainly to ensure that enough space is allocated for the largest + * one. */ union @@ -143,4 +145,4 @@ void PacketSendSetup(Packet *pkt, int nbytes, PacketDoneProc iodone, void *arg) int PacketSendFragment(Packet *pkt, int sock); void PacketSendError(Packet *pkt, char *errormsg); -#endif /* LIBPQ_BE_H */ +#endif /* LIBPQ_BE_H */ diff --git a/src/include/libpq/libpq-fs.h b/src/include/libpq/libpq-fs.h index affc01777b7..514e259a6b4 100644 --- a/src/include/libpq/libpq-fs.h +++ b/src/include/libpq/libpq-fs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-fs.h,v 1.6 1997/11/21 19:02:59 momjian Exp $ + * $Id: libpq-fs.h,v 1.7 1998/09/01 04:36:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ #ifndef MAXNAMLEN #define MAXNAMLEN 255 -#endif /* MAXNAMLEN */ +#endif /* MAXNAMLEN */ struct pgdirent { @@ -38,7 +38,7 @@ struct pgdirent #else /* SYSV_DIRENT */ #define D_NAMLEN(dp) \ ((dp)->d_namlen) -#endif /* SYSV_DIRENT */ +#endif /* SYSV_DIRENT */ /* for stat(2) */ #ifndef S_IRUSR @@ -71,7 +71,7 @@ struct pgdirent #define S_ISDIR( mode ) (((mode) & _S_IFMT) == _S_IFDIR) -#endif /* S_IRUSR */ +#endif /* S_IRUSR */ /* * Inversion doesn't have links. @@ -103,4 +103,4 @@ struct pgdirent #define PENOTEMPTY 66 /* Directory not empty */ #define PEPGIO 99 /* postgres backend had problems */ -#endif /* LIBPQ_FS_H */ +#endif /* LIBPQ_FS_H */ diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index a328e6dacdf..ef7ec5d2cfd 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: libpq.h,v 1.20 1998/07/20 16:57:06 momjian Exp $ + * $Id: libpq.h,v 1.21 1998/09/01 04:36:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -50,7 +50,7 @@ typedef struct TypeBlock { char name[NAMEDATALEN]; /* name of the attribute */ int typid; /* typid of the type */ - int typlen; /* typlen of the type */ + int typlen; /* typlen of the type */ } TypeBlock; /* ---------------- @@ -179,11 +179,9 @@ extern int PQninstancesGroup(PortalBuffer *portal, int group_index); extern int PQnfieldsGroup(PortalBuffer *portal, int group_index); extern int PQfnumberGroup(PortalBuffer *portal, int group_index, char *field_name); extern char *PQfnameGroup(PortalBuffer *portal, int group_index, int field_number); -extern int -PQftypeGroup(PortalBuffer *portal, int group_index, +extern int PQftypeGroup(PortalBuffer *portal, int group_index, int field_number); -extern int -PQfsizeGroup(PortalBuffer *portal, int group_index, +extern int PQfsizeGroup(PortalBuffer *portal, int group_index, int field_number); extern GroupBuffer *PQgroup(PortalBuffer *portal, int tuple_index); extern int PQgetgroup(PortalBuffer *portal, int tuple_index); @@ -236,15 +234,13 @@ extern void be_portalpush(PortalEntry *entry); extern PortalEntry *be_portalpop(void); extern PortalEntry *be_currentportal(void); extern PortalEntry *be_newportal(void); -extern void -be_typeinit(PortalEntry *entry, TupleDesc attrs, +extern void be_typeinit(PortalEntry *entry, TupleDesc attrs, int natts); extern void be_printtup(HeapTuple tuple, TupleDesc typeinfo); /* in be-pqexec.c */ -extern char * -PQfn(int fnid, int *result_buf, int result_len, int result_is_int, +extern char *PQfn(int fnid, int *result_buf, int result_len, int result_is_int, PQArgBlock *args, int nargs); extern char *PQexec(char *query); extern int pqtest_PQexec(char *q); @@ -271,16 +267,16 @@ extern int pq_getinaddr(struct sockaddr_in * sin, char *host, int port); extern int pq_getinserv(struct sockaddr_in * sin, char *host, char *serv); #ifdef MULTIBYTE -extern void pq_putncharlen(char *s, int n); +extern void pq_putncharlen(char *s, int n); + #endif -extern int -pq_connect(char *dbname, char *user, char *args, char *hostName, +extern int pq_connect(char *dbname, char *user, char *args, char *hostName, char *debugTty, char *execFile, short portName); extern int StreamOpen(char *hostName, short portName, Port *port); extern void StreamDoUnlink(void); -extern int StreamServerPort(char *hostName, short portName, int *fdP); -extern int StreamConnection(int server_fd, Port *port); +extern int StreamServerPort(char *hostName, short portName, int *fdP); +extern int StreamConnection(int server_fd, Port *port); extern void StreamClose(int sock); -#endif /* LIBPQ_H */ +#endif /* LIBPQ_H */ diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h index e3b5a71b837..0f36e8e93eb 100644 --- a/src/include/libpq/pqcomm.h +++ b/src/include/libpq/pqcomm.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pqcomm.h,v 1.28 1998/08/29 04:05:43 momjian Exp $ + * $Id: pqcomm.h,v 1.29 1998/09/01 04:36:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,11 +41,11 @@ typedef union SockAddr #if defined(SUN_LEN) #define UNIXSOCK_PATH(sun,port) \ - (sprintf((sun).sun_path, "/tmp/.s.PGSQL.%d", (port)), SUN_LEN(&(sun))) + (sprintf((sun).sun_path, "/tmp/.s.PGSQL.%d", (port)), SUN_LEN(&(sun))) #else #define UNIXSOCK_PATH(sun,port) \ - (sprintf((sun).sun_path, "/tmp/.s.PGSQL.%d", (port)), \ - strlen((sun).sun_path)+ offsetof(struct sockaddr_un, sun_path)) + (sprintf((sun).sun_path, "/tmp/.s.PGSQL.%d", (port)), \ + strlen((sun).sun_path)+ offsetof(struct sockaddr_un, sun_path)) #endif /* @@ -140,15 +140,16 @@ typedef ProtocolVersion MsgType; /* The cancel request code must not match any protocol version number * we're ever likely to use. This random choice should do. */ -#define CANCEL_REQUEST_CODE PG_PROTOCOL(1234,5678) +#define CANCEL_REQUEST_CODE PG_PROTOCOL(1234,5678) typedef struct CancelRequestPacket { /* Note that each field is stored in network byte order! */ - MsgType cancelRequestCode; /* code to identify a cancel request */ - uint32 backendPID; /* PID of client's backend */ - uint32 cancelAuthCode; /* secret key to authorize cancel */ -} CancelRequestPacket; + MsgType cancelRequestCode; /* code to identify a cancel + * request */ + uint32 backendPID; /* PID of client's backend */ + uint32 cancelAuthCode; /* secret key to authorize cancel */ +} CancelRequestPacket; /* in pqcompriv.c */ @@ -164,4 +165,4 @@ int pqPutNBytes(const char *, size_t, FILE *); int pqPutString(const char *, FILE *); int pqPutByte(int, FILE *); -#endif /* PQCOMM_H */ +#endif /* PQCOMM_H */ diff --git a/src/include/libpq/pqsignal.h b/src/include/libpq/pqsignal.h index f85025a1592..ecdc23aac25 100644 --- a/src/include/libpq/pqsignal.h +++ b/src/include/libpq/pqsignal.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pqsignal.h,v 1.7 1997/09/08 02:37:09 momjian Exp $ + * $Id: pqsignal.h,v 1.8 1998/09/01 04:36:32 momjian Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -21,4 +21,4 @@ typedef void (*pqsigfunc) (int); extern pqsigfunc pqsignal(int signo, pqsigfunc func); -#endif /* PQSIGNAL_H */ +#endif /* PQSIGNAL_H */ diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index aec1ad06a91..5d7c2458dda 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -1,33 +1,34 @@ -/* $Id: pg_wchar.h,v 1.3 1998/08/24 01:14:22 momjian Exp $ */ +/* $Id: pg_wchar.h,v 1.4 1998/09/01 04:36:34 momjian Exp $ */ #ifndef PG_WCHAR_H #define PG_WCHAR_H #include <sys/types.h> #include "postgres.h" -#include "miscadmin.h" /* for getdatabaseencoding() */ +#include "miscadmin.h" /* for getdatabaseencoding() */ -#define SQL_ASCII 0 /* SQL/ASCII */ -#define EUC_JP 1 /* EUC for Japanese */ -#define EUC_CN 2 /* EUC for Chinese */ -#define EUC_KR 3 /* EUC for Korean */ -#define EUC_TW 3 /* EUC for Taiwan */ -#define UNICODE 5 /* Unicode UTF-8 */ -#define MULE_INTERNAL 6 /* Mule internal code */ -#define LATIN1 7 /* ISO-8859 Latin 1 */ -#define LATIN2 8 /* ISO-8859 Latin 2 */ -#define LATIN3 9 /* ISO-8859 Latin 3 */ -#define LATIN4 10 /* ISO-8859 Latin 4 */ -#define LATIN5 11 /* ISO-8859 Latin 5 */ -#define LATIN6 12 /* ISO-8859 Latin 6 */ -#define LATIN7 13 /* ISO-8859 Latin 7 */ -#define LATIN8 14 /* ISO-8859 Latin 8 */ -#define LATIN9 15 /* ISO-8859 Latin 9 */ +#define SQL_ASCII 0 /* SQL/ASCII */ +#define EUC_JP 1 /* EUC for Japanese */ +#define EUC_CN 2 /* EUC for Chinese */ +#define EUC_KR 3 /* EUC for Korean */ +#define EUC_TW 3 /* EUC for Taiwan */ +#define UNICODE 5 /* Unicode UTF-8 */ +#define MULE_INTERNAL 6 /* Mule internal code */ +#define LATIN1 7 /* ISO-8859 Latin 1 */ +#define LATIN2 8 /* ISO-8859 Latin 2 */ +#define LATIN3 9 /* ISO-8859 Latin 3 */ +#define LATIN4 10 /* ISO-8859 Latin 4 */ +#define LATIN5 11 /* ISO-8859 Latin 5 */ +#define LATIN6 12 /* ISO-8859 Latin 6 */ +#define LATIN7 13 /* ISO-8859 Latin 7 */ +#define LATIN8 14 /* ISO-8859 Latin 8 */ +#define LATIN9 15 /* ISO-8859 Latin 9 */ /* followings are for client encoding only */ -#define SJIS 32 /* Shift JIS */ +#define SJIS 32 /* Shift JIS */ #ifdef MULTIBYTE typedef unsigned int pg_wchar; + #else #define pg_wchar char #endif @@ -35,8 +36,8 @@ typedef unsigned int pg_wchar; /* * various definitions for EUC */ -#define SS2 0x8e /* single shift 2 */ -#define SS3 0x8f /* single shift 3 */ +#define SS2 0x8e /* single shift 2 */ +#define SS3 0x8f /* single shift 3 */ /* * various definitions for mule internal code @@ -49,56 +50,59 @@ typedef unsigned int pg_wchar; /* * leading characters */ -#define LC_ISO8859_1 0x81 /* ISO8859 Latin 1 */ -#define LC_ISO8859_2 0x82 /* ISO8859 Latin 2 */ -#define LC_ISO8859_3 0x83 /* ISO8859 Latin 3 */ -#define LC_ISO8859_4 0x84 /* ISO8859 Latin 4 */ -#define LC_ISO8859_5 0x8d /* ISO8859 Latin 5 */ -#define LC_JISX0201K 0x89 /* Japanese 1 byte kana */ -#define LC_JISX0201R 0x90 /* Japanese 1 byte Roman */ -#define LC_GB2312_80 0x91 /* Chinese */ -#define LC_JISX0208 0x92 /* Japanese Kanji */ -#define LC_KS5601 0x93 /* Korean */ -#define LC_JISX0212 0x94 /* Japanese Kanji (JISX0212) */ -#define LC_CNS11643_1 0x95 /* CNS 11643-1992 Plane 1 */ -#define LC_CNS11643_2 0x96 /* CNS 11643-1992 Plane 2 */ -#define LC_CNS11643_3 0xf6 /* CNS 11643-1992 Plane 3 */ -#define LC_CNS11643_4 0xf7 /* CNS 11643-1992 Plane 4 */ -#define LC_CNS11643_5 0xf8 /* CNS 11643-1992 Plane 5 */ -#define LC_CNS11643_6 0xf9 /* CNS 11643-1992 Plane 6 */ -#define LC_CNS11643_7 0xfa /* CNS 11643-1992 Plane 7 */ +#define LC_ISO8859_1 0x81 /* ISO8859 Latin 1 */ +#define LC_ISO8859_2 0x82 /* ISO8859 Latin 2 */ +#define LC_ISO8859_3 0x83 /* ISO8859 Latin 3 */ +#define LC_ISO8859_4 0x84 /* ISO8859 Latin 4 */ +#define LC_ISO8859_5 0x8d /* ISO8859 Latin 5 */ +#define LC_JISX0201K 0x89 /* Japanese 1 byte kana */ +#define LC_JISX0201R 0x90 /* Japanese 1 byte Roman */ +#define LC_GB2312_80 0x91 /* Chinese */ +#define LC_JISX0208 0x92 /* Japanese Kanji */ +#define LC_KS5601 0x93 /* Korean */ +#define LC_JISX0212 0x94 /* Japanese Kanji (JISX0212) */ +#define LC_CNS11643_1 0x95 /* CNS 11643-1992 Plane 1 */ +#define LC_CNS11643_2 0x96 /* CNS 11643-1992 Plane 2 */ +#define LC_CNS11643_3 0xf6 /* CNS 11643-1992 Plane 3 */ +#define LC_CNS11643_4 0xf7 /* CNS 11643-1992 Plane 4 */ +#define LC_CNS11643_5 0xf8 /* CNS 11643-1992 Plane 5 */ +#define LC_CNS11643_6 0xf9 /* CNS 11643-1992 Plane 6 */ +#define LC_CNS11643_7 0xfa /* CNS 11643-1992 Plane 7 */ #ifdef MULTIBYTE -typedef struct { - int encoding; /* encoding symbol value */ - char *name; /* encoding name */ - int is_client_only; /* 0: server/client bothg supported - 1: client only */ - void (*to_mic)(); /* client encoding to MIC */ - void (*from_mic)(); /* MIC to client encoding */ -} pg_encoding_conv_tbl; +typedef struct +{ + int encoding; /* encoding symbol value */ + char *name; /* encoding name */ + int is_client_only; /* 0: server/client bothg supported 1: + * client only */ + void (*to_mic) (); /* client encoding to MIC */ + void (*from_mic) (); /* MIC to client encoding */ +} pg_encoding_conv_tbl; extern pg_encoding_conv_tbl pg_conv_tbl[]; -typedef struct { - void (*mb2wchar_with_len)(); /* convert a multi-byte string to a wchar */ - int (*mblen)(); /* returns the length of a multi-byte word */ -} pg_wchar_tbl; +typedef struct +{ + void (*mb2wchar_with_len) (); /* convert a multi-byte + * string to a wchar */ + int (*mblen) (); /* returns the length of a multi-byte word */ +} pg_wchar_tbl; extern pg_wchar_tbl pg_wchar_table[]; extern void pg_mb2wchar(const unsigned char *, pg_wchar *); extern void pg_mb2wchar_with_len(const unsigned char *, pg_wchar *, int); -extern int pg_char_and_wchar_strcmp(const char *, const pg_wchar *); -extern int pg_wchar_strncmp(const pg_wchar *, const pg_wchar *, size_t); -extern int pg_char_and_wchar_strncmp(const char *, const pg_wchar *, size_t); +extern int pg_char_and_wchar_strcmp(const char *, const pg_wchar *); +extern int pg_wchar_strncmp(const pg_wchar *, const pg_wchar *, size_t); +extern int pg_char_and_wchar_strncmp(const char *, const pg_wchar *, size_t); extern size_t pg_wchar_strlen(const pg_wchar *); -extern int pg_mblen(const unsigned char *); -extern int pg_encoding_mblen(int, const unsigned char *); -extern int pg_mule_mblen(const unsigned char *); -extern int pg_mic_mblen(const unsigned char *); -extern int pg_mbstrlen(const unsigned char *); -extern int pg_mbstrlen_with_len(const unsigned char *, int); +extern int pg_mblen(const unsigned char *); +extern int pg_encoding_mblen(int, const unsigned char *); +extern int pg_mule_mblen(const unsigned char *); +extern int pg_mic_mblen(const unsigned char *); +extern int pg_mbstrlen(const unsigned char *); +extern int pg_mbstrlen_with_len(const unsigned char *, int); extern pg_encoding_conv_tbl *pg_get_encent_by_encoding(int); extern bool show_client_encoding(void); extern bool reset_client_encoding(void); @@ -106,18 +110,18 @@ extern bool parse_client_encoding(const char *); extern bool show_server_encoding(void); extern bool reset_server_encoding(void); extern bool parse_server_encoding(const char *); -extern int pg_set_client_encoding(int); -extern int pg_get_client_encoding(void); +extern int pg_set_client_encoding(int); +extern int pg_get_client_encoding(void); extern unsigned char *pg_client_to_server(unsigned char *, int); extern unsigned char *pg_server_to_client(unsigned char *, int); -extern int pg_valid_client_encoding(const char *); +extern int pg_valid_client_encoding(const char *); extern const char *pg_encoding_to_char(int); -extern int pg_char_to_encoding(const char *); -extern int GetDatabaseEncoding(void); +extern int pg_char_to_encoding(const char *); +extern int GetDatabaseEncoding(void); extern void SetDatabaseEncoding(int); extern void SetTemplateEncoding(int); -extern int GetTemplateEncoding(void); +extern int GetTemplateEncoding(void); -#endif /* MULTIBYTE */ +#endif /* MULTIBYTE */ -#endif /* PG_WCHAR_H */ +#endif /* PG_WCHAR_H */ diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index e2632d63e6c..6fe0bec78bf 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -11,7 +11,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: miscadmin.h,v 1.32 1998/08/25 21:24:12 scrappy Exp $ + * $Id: miscadmin.h,v 1.33 1998/09/01 04:33:59 momjian Exp $ * * NOTES * some of the information in this file will be moved to @@ -35,14 +35,14 @@ extern int PostmasterMain(int argc, char *argv[]); * from utils/init/globals.c */ extern int Portfd; -extern bool Noversion; -extern bool Quiet; -extern bool QueryCancel; +extern bool Noversion; +extern bool Quiet; +extern bool QueryCancel; extern char *DataDir; extern int MyProcPid; -extern struct Port *MyProcPort; -extern long MyCancelKey; +extern struct Port *MyProcPort; +extern long MyCancelKey; extern char OutputFileName[]; @@ -123,6 +123,7 @@ extern char *ExpandDatabasePath(char *path); /* now in utils/init/miscinit.c */ extern void SetDatabaseName(char *name); extern void SetDatabasePath(char *path); + /* even if MB is not enabled, this function is neccesary * since pg_proc.h does have. */ @@ -206,4 +207,4 @@ extern bool IsNormalProcessingMode(void); extern void SetProcessingMode(ProcessingMode mode); extern ProcessingMode GetProcessingMode(void); -#endif /* MISCADMIN_H */ +#endif /* MISCADMIN_H */ diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index c582cdd7994..a062456c68d 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execnodes.h,v 1.17 1998/08/03 19:41:31 momjian Exp $ + * $Id: execnodes.h,v 1.18 1998/09/01 04:36:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -194,20 +194,20 @@ typedef struct JunkFilter */ typedef struct EState { - NodeTag type; - ScanDirection es_direction; - Snapshot es_snapshot; - List *es_range_table; - RelationInfo *es_result_relation_info; - Relation es_into_relation_descriptor; - ParamListInfo es_param_list_info; - ParamExecData *es_param_exec_vals; /* this is for subselects */ - int es_BaseId; - TupleTable es_tupleTable; - JunkFilter *es_junkFilter; - int *es_refcount; - uint32 es_processed; /* # of tuples processed */ - Oid es_lastoid; /* last oid processed (by INSERT) */ + NodeTag type; + ScanDirection es_direction; + Snapshot es_snapshot; + List *es_range_table; + RelationInfo *es_result_relation_info; + Relation es_into_relation_descriptor; + ParamListInfo es_param_list_info; + ParamExecData *es_param_exec_vals; /* this is for subselects */ + int es_BaseId; + TupleTable es_tupleTable; + JunkFilter *es_junkFilter; + int *es_refcount; + uint32 es_processed; /* # of tuples processed */ + Oid es_lastoid; /* last oid processed (by INSERT) */ } EState; /* ---------------- @@ -704,4 +704,4 @@ typedef struct TeeState HeapScanDesc tee_rightScanDesc; } TeeState; -#endif /* EXECNODES_H */ +#endif /* EXECNODES_H */ diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index 58848328a65..43c8d088866 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: makefuncs.h,v 1.13 1998/07/20 20:48:52 momjian Exp $ + * $Id: makefuncs.h,v 1.14 1998/09/01 04:36:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,15 +17,13 @@ #include <nodes/parsenodes.h> #include <utils/fcache.h> -extern Oper * -makeOper(Oid opno, +extern Oper *makeOper(Oid opno, Oid opid, Oid opresulttype, int opsize, FunctionCachePtr op_fcache); -extern Var * -makeVar(Index varno, +extern Var *makeVar(Index varno, AttrNumber varattno, Oid vartype, int32 vartypmod, @@ -34,10 +32,9 @@ makeVar(Index varno, AttrNumber varoattno); extern TargetEntry * -makeTargetEntry(Resdom *resdom, Node *expr); + makeTargetEntry(Resdom *resdom, Node *expr); -extern Resdom * -makeResdom(AttrNumber resno, +extern Resdom *makeResdom(AttrNumber resno, Oid restype, int32 restypmod, char *resname, @@ -45,8 +42,7 @@ makeResdom(AttrNumber resno, Oid reskeyop, int resjunk); -extern Const * -makeConst(Oid consttype, +extern Const *makeConst(Oid consttype, int constlen, Datum constvalue, bool constisnull, @@ -54,4 +50,4 @@ makeConst(Oid consttype, bool constisset, bool constiscast); -#endif /* MAKEFUNC_H */ +#endif /* MAKEFUNC_H */ diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h index e3104996d4b..accf6ed131d 100644 --- a/src/include/nodes/memnodes.h +++ b/src/include/nodes/memnodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: memnodes.h,v 1.7 1997/09/08 21:52:44 momjian Exp $ + * $Id: memnodes.h,v 1.8 1998/09/01 04:36:39 momjian Exp $ * * XXX the typedefs in this file are different from the other ???nodes.h; * they are pointers to structures instead of the structures themselves. @@ -98,4 +98,4 @@ typedef struct PortalHeapMemory (IsA(context,MemoryContext) || IsA(context,GlobalMemory) || \ IsA(context,PortalVariableMemory) || IsA(context,PortalHeapMemory)) -#endif /* MEMNODES_H */ +#endif /* MEMNODES_H */ diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h index 696f5f7fa66..d7c1b2f696b 100644 --- a/src/include/nodes/nodeFuncs.h +++ b/src/include/nodes/nodeFuncs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeFuncs.h,v 1.6 1997/11/25 22:06:30 momjian Exp $ + * $Id: nodeFuncs.h,v 1.7 1998/09/01 04:36:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern bool var_is_rel(Var *var); extern Oper *replace_opid(Oper *oper); extern bool non_null(Expr *c); -#endif /* NODEFUNCS_H */ +#endif /* NODEFUNCS_H */ diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index b7fc3ede877..29124a839ce 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodes.h,v 1.29 1998/09/01 03:28:14 momjian Exp $ + * $Id: nodes.h,v 1.30 1998/09/01 04:36:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -306,13 +306,11 @@ typedef enum CmdType CMD_INSERT, /* insert stmt (formerly append) */ CMD_DELETE, CMD_NOTIFY, - CMD_UTILITY, /* cmds like create, destroy, copy, + CMD_UTILITY, /* cmds like create, destroy, copy, * vacuum, etc. */ - CMD_NOTHING /* dummy command for - * instead nothing - * rules with qual - */ + CMD_NOTHING /* dummy command for instead nothing rules + * with qual */ } CmdType; -#endif /* NODES_H */ +#endif /* NODES_H */ diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index aaa56572081..7d883135309 100644 --- a/src/include/nodes/params.h +++ b/src/include/nodes/params.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: params.h,v 1.8 1998/02/26 04:41:58 momjian Exp $ + * $Id: params.h,v 1.9 1998/09/01 04:36:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -99,4 +99,4 @@ typedef struct ParamExecData bool isnull; } ParamExecData; -#endif /* PARAMS_H */ +#endif /* PARAMS_H */ diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 3555ac49beb..26bdc420dd8 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.58 1998/08/26 05:22:55 momjian Exp $ + * $Id: parsenodes.h,v 1.59 1998/09/01 04:36:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -448,7 +448,7 @@ typedef struct UnlistenStmt { NodeTag type; char *relname; /* relation to unlisten on */ -} UnlistenStmt; +} UnlistenStmt; /* ---------------------- * {Begin|Abort|End} Transaction Statement @@ -490,8 +490,7 @@ typedef struct CreatedbStmt NodeTag type; char *dbname; /* database to create */ char *dbpath; /* location of database */ - int encoding; /* default encoding - (see regex/pg_wchar.h) */ + int encoding; /* default encoding (see regex/pg_wchar.h) */ } CreatedbStmt; /* ---------------------- @@ -799,7 +798,7 @@ typedef struct SortGroupBy { NodeTag type; char *useOp; /* operator to use */ - Node *node; /* Expression */ + Node *node; /* Expression */ } SortGroupBy; /* @@ -811,7 +810,7 @@ typedef struct JoinUsing int resno; /* target number */ char *range; char *name; /* name of column to sort on */ -} JoinUsing; +} JoinUsing; /* * RangeVar - range variable, used in from clauses @@ -832,7 +831,7 @@ typedef struct IndexElem char *name; /* name of index */ List *args; /* if not NULL, function index */ char *class; - TypeName *typename; /* type of index's keys (optional) */ + TypeName *typename; /* type of index's keys (optional) */ } IndexElem; /* @@ -912,4 +911,4 @@ typedef struct GroupClause Oid grpOpoid; /* the sort operator to use */ } GroupClause; -#endif /* PARSENODES_H */ +#endif /* PARSENODES_H */ diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index e3e3574193d..96e721bbf4a 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_list.h,v 1.8 1997/09/08 21:52:51 momjian Exp $ + * $Id: pg_list.h,v 1.9 1998/09/01 04:36:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -117,4 +117,4 @@ extern bool same(List *foo, List *bar); /* in copyfuncs.c */ extern List *listCopy(List *); -#endif /* PG_LIST_H */ +#endif /* PG_LIST_H */ diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 5de80471b3d..1731b1a2f58 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: plannodes.h,v 1.17 1998/08/04 16:44:24 momjian Exp $ + * $Id: plannodes.h,v 1.18 1998/09/01 04:36:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -139,14 +139,10 @@ typedef struct Append { Plan plan; List *appendplans; - List *unionrtables; /* - * List of range tables, one for each - * union query. - */ - Index inheritrelid; /* - * The range table has to be changed for - * inheritance. - */ + List *unionrtables; /* List of range tables, one for each + * union query. */ + Index inheritrelid; /* The range table has to be changed for + * inheritance. */ List *inheritrtable; AppendState *appendstate; } Append; @@ -382,4 +378,4 @@ typedef struct SubPlan bool shutdown; /* shutdown plan if TRUE */ } SubPlan; -#endif /* PLANNODES_H */ +#endif /* PLANNODES_H */ diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index 1a62b388790..32701e075e9 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: primnodes.h,v 1.22 1998/07/12 21:29:33 momjian Exp $ + * $Id: primnodes.h,v 1.23 1998/09/01 04:36:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -351,4 +351,4 @@ typedef struct ArrayRef Node *refassgnexpr; } ArrayRef; -#endif /* PRIMNODES_H */ +#endif /* PRIMNODES_H */ diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h index 308c2d9363f..0df89e2e157 100644 --- a/src/include/nodes/print.h +++ b/src/include/nodes/print.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: print.h,v 1.7 1998/02/26 04:42:03 momjian Exp $ + * $Id: print.h,v 1.8 1998/09/01 04:36:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,9 +26,8 @@ extern void print_expr(Node *expr, List *rtable); extern void print_keys(List *keys, List *rtable); extern void print_tl(List *tlist, List *rtable); extern void print_slot(TupleTableSlot *slot); -extern void -print_plan_recursive(Plan *p, Query *parsetree, +extern void print_plan_recursive(Plan *p, Query *parsetree, int indentLevel, char *label); extern void print_plan(Plan *p, Query *parsetree); -#endif /* PRINT_H */ +#endif /* PRINT_H */ diff --git a/src/include/nodes/readfuncs.h b/src/include/nodes/readfuncs.h index f2b24e18ed3..abb1b57eb2b 100644 --- a/src/include/nodes/readfuncs.h +++ b/src/include/nodes/readfuncs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: readfuncs.h,v 1.5 1997/11/26 01:13:09 momjian Exp $ + * $Id: readfuncs.h,v 1.6 1998/09/01 04:36:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,4 +26,4 @@ extern void *nodeRead(bool read_car_only); */ extern Node *parsePlanString(void); -#endif /* READFUNCS_H */ +#endif /* READFUNCS_H */ diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 69fb9119211..0f350e0f116 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: relation.h,v 1.10 1998/09/01 03:28:16 momjian Exp $ + * $Id: relation.h,v 1.11 1998/09/01 04:36:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -106,7 +106,7 @@ typedef struct RelOptInfo List *joininfo; /* join clauses */ List *innerjoin; List *superrels; -} RelOptInfo; +} RelOptInfo; extern Var *get_expr(TargetEntry *foo); @@ -139,7 +139,7 @@ typedef struct Path { NodeTag type; - RelOptInfo *parent; + RelOptInfo *parent; Cost path_cost; NodeTag pathtype; @@ -221,7 +221,7 @@ typedef struct ClauseInfo /* hashjoin only */ Oid hashjoinoperator; Relid cinfojoinid; -} ClauseInfo; +} ClauseInfo; typedef struct JoinMethod { @@ -250,7 +250,7 @@ typedef struct JoinInfo bool mergejoinable; bool hashjoinable; bool inactive; -} JoinInfo; +} JoinInfo; typedef struct Iter { @@ -285,7 +285,7 @@ typedef struct Stream { NodeTag type; Path *pathptr; - ClauseInfo *cinfo; + ClauseInfo *cinfo; int *clausetype; struct Stream *upstream; struct Stream *downstream; @@ -294,4 +294,4 @@ typedef struct Stream Cost groupsel; } Stream; -#endif /* RELATION_H */ +#endif /* RELATION_H */ diff --git a/src/include/optimizer/clauseinfo.h b/src/include/optimizer/clauseinfo.h index 0fa10b2e490..24a3ec51070 100644 --- a/src/include/optimizer/clauseinfo.h +++ b/src/include/optimizer/clauseinfo.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: clauseinfo.h,v 1.8 1998/09/01 03:28:17 momjian Exp $ + * $Id: clauseinfo.h,v 1.9 1998/09/01 04:36:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,14 +16,12 @@ #include "nodes/pg_list.h" #include "nodes/relation.h" -extern bool valid_or_clause(ClauseInfo *clauseinfo); +extern bool valid_or_clause(ClauseInfo * clauseinfo); extern List *get_actual_clauses(List *clauseinfo_list); -extern void -get_relattvals(List *clauseinfo_list, List **attnos, +extern void get_relattvals(List *clauseinfo_list, List **attnos, List **values, List **flags); -extern void -get_joinvars(Oid relid, List *clauseinfo_list, +extern void get_joinvars(Oid relid, List *clauseinfo_list, List **attnos, List **values, List **flags); extern List *get_opnos(List *clauseinfo_list); -#endif /* CLAUSEINFO_H */ +#endif /* CLAUSEINFO_H */ diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index 28ac0c003bc..08f4a84f10b 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: clauses.h,v 1.12 1998/08/10 02:26:39 momjian Exp $ + * $Id: clauses.h,v 1.13 1998/09/01 04:36:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,11 +42,9 @@ extern bool is_joinable(Node *clause); extern bool qual_clause_p(Node *clause); extern void fix_opid(Node *clause); extern List *fix_opids(List *clauses); -extern void -get_relattval(Node *clause, int *relid, +extern void get_relattval(Node *clause, int *relid, AttrNumber *attno, Datum *constval, int *flag); -extern void -get_rels_atts(Node *clause, int *relid1, +extern void get_rels_atts(Node *clause, int *relid1, AttrNumber *attno1, int *relid2, AttrNumber *attno2); extern void CommuteClause(Node *clause); @@ -54,4 +52,4 @@ extern void CommuteClause(Node *clause); nodeTag((Node*) clause) == T_Expr && \ ((Expr *) clause)->opType == SUBPLAN_EXPR) -#endif /* CLAUSES_H */ +#endif /* CLAUSES_H */ diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index f0f716c012a..4342149e9b6 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: cost.h,v 1.10 1998/08/04 16:44:27 momjian Exp $ + * $Id: cost.h,v 1.11 1998/09/01 04:36:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,24 +31,20 @@ extern bool _enable_mergejoin_; extern bool _enable_hashjoin_; extern Cost cost_seqscan(int relid, int relpages, int reltuples); -extern Cost -cost_index(Oid indexid, int expected_indexpages, Cost selec, +extern Cost cost_index(Oid indexid, int expected_indexpages, Cost selec, int relpages, int reltuples, int indexpages, int indextuples, bool is_injoin); extern Cost cost_sort(List *keys, int tuples, int width, bool noread); -extern Cost -cost_nestloop(Cost outercost, Cost innercost, int outertuples, +extern Cost cost_nestloop(Cost outercost, Cost innercost, int outertuples, int innertuples, int outerpages, bool is_indexjoin); -extern Cost -cost_mergejoin(Cost outercost, Cost innercost, +extern Cost cost_mergejoin(Cost outercost, Cost innercost, List *outersortkeys, List *innersortkeys, int outersize, int innersize, int outerwidth, int innerwidth); -extern Cost -cost_hashjoin(Cost outercost, Cost innercost, List *outerkeys, +extern Cost cost_hashjoin(Cost outercost, Cost innercost, List *outerkeys, List *innerkeys, int outersize, int innersize, int outerwidth, int innerwidth); -extern int compute_rel_size(RelOptInfo *rel); -extern int compute_rel_width(RelOptInfo *rel); +extern int compute_rel_size(RelOptInfo * rel); +extern int compute_rel_width(RelOptInfo * rel); extern int compute_joinrel_size(JoinPath *joinpath); extern int page_size(int tuples, int width); @@ -60,8 +56,7 @@ extern void set_clause_selectivities(List *clauseinfo_list, Cost new_selectivity extern Cost product_selec(List *clauseinfo_list); extern void set_rest_relselec(Query *root, List *rel_list); extern void set_rest_selec(Query *root, List *clauseinfo_list); -extern Cost -compute_clause_selec(Query *root, +extern Cost compute_clause_selec(Query *root, Node *clause, List *or_selectivities); -#endif /* COST_H */ +#endif /* COST_H */ diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h index 2a1018ed283..150cfc751f3 100644 --- a/src/include/optimizer/geqo.h +++ b/src/include/optimizer/geqo.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo.h,v 1.8 1998/07/18 04:22:50 momjian Exp $ + * $Id: geqo.h,v 1.9 1998/09/01 04:36:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,7 +76,7 @@ extern void geqo_params(int string_length); extern Cost geqo_eval(Query *root, Gene *tour, int num_gene); double geqo_log(double x, double b); -extern RelOptInfo *gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo *outer_rel); +extern RelOptInfo *gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo * outer_rel); -#endif /* GEQO_H */ +#endif /* GEQO_H */ diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h index 26730d0bc8b..bdf521215e6 100644 --- a/src/include/optimizer/geqo_copy.h +++ b/src/include/optimizer/geqo_copy.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_copy.h,v 1.5 1997/11/26 01:13:25 momjian Exp $ + * $Id: geqo_copy.h,v 1.6 1998/09/01 04:36:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,4 +25,4 @@ extern void geqo_copy(Chromosome *chromo1, Chromosome *chromo2, int string_length); -#endif /* GEQO_COPY_H */ +#endif /* GEQO_COPY_H */ diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h index d1f99cced85..a5f03055696 100644 --- a/src/include/optimizer/geqo_gene.h +++ b/src/include/optimizer/geqo_gene.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_gene.h,v 1.5 1997/11/26 01:13:27 momjian Exp $ + * $Id: geqo_gene.h,v 1.6 1998/09/01 04:36:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,4 +43,4 @@ typedef struct Pool int string_length; } Pool; -#endif /* GEQO_GENE_H */ +#endif /* GEQO_GENE_H */ diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index 2dcc6351c5b..1de8a9b2c7d 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_misc.h,v 1.6 1998/07/18 04:22:50 momjian Exp $ + * $Id: geqo_misc.h,v 1.7 1998/09/01 04:36:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,8 +31,8 @@ extern void print_pool(FILE *fp, Pool *pool, int start, int stop); extern void print_gen(FILE *fp, Pool *pool, int generation); extern void print_edge_table(FILE *fp, Edge *edge_table, int num_gene); -extern void geqo_print_rel(Query *root, RelOptInfo *rel); +extern void geqo_print_rel(Query *root, RelOptInfo * rel); extern void geqo_print_path(Query *root, Path *path, int indent); extern void geqo_print_joinclauses(Query *root, List *clauses); -#endif /* GEQO_MISC_H */ +#endif /* GEQO_MISC_H */ diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h index 94549a31649..5a6b636efdf 100644 --- a/src/include/optimizer/geqo_mutation.h +++ b/src/include/optimizer/geqo_mutation.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_mutation.h,v 1.5 1997/11/26 01:13:29 momjian Exp $ + * $Id: geqo_mutation.h,v 1.6 1998/09/01 04:37:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,4 +25,4 @@ extern void geqo_mutation(Gene *tour, int num_gene); -#endif /* GEQO_MUTATION_H */ +#endif /* GEQO_MUTATION_H */ diff --git a/src/include/optimizer/geqo_paths.h b/src/include/optimizer/geqo_paths.h index c222cb1fae1..7cda77c1c2d 100644 --- a/src/include/optimizer/geqo_paths.h +++ b/src/include/optimizer/geqo_paths.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_paths.h,v 1.5 1998/07/18 04:22:50 momjian Exp $ + * $Id: geqo_paths.h,v 1.6 1998/09/01 04:37:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,6 @@ extern List *geqo_prune_rels(List *rel_list); -extern void geqo_rel_paths(RelOptInfo *rel); +extern void geqo_rel_paths(RelOptInfo * rel); -#endif /* GEQO_PATHS_H */ +#endif /* GEQO_PATHS_H */ diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h index ebc8a3914b0..d7916cdecce 100644 --- a/src/include/optimizer/geqo_pool.h +++ b/src/include/optimizer/geqo_pool.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_pool.h,v 1.5 1997/11/26 01:13:30 momjian Exp $ + * $Id: geqo_pool.h,v 1.6 1998/09/01 04:37:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,4 +35,4 @@ extern void spread_chromo(Chromosome *chromo, Pool *pool); extern void sort_pool(Pool *pool); -#endif /* GEQO_POOL_H */ +#endif /* GEQO_POOL_H */ diff --git a/src/include/optimizer/geqo_random.h b/src/include/optimizer/geqo_random.h index 73a9d37e53b..3d574b74da5 100644 --- a/src/include/optimizer/geqo_random.h +++ b/src/include/optimizer/geqo_random.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_random.h,v 1.2 1997/09/07 04:59:03 momjian Exp $ + * $Id: geqo_random.h,v 1.3 1998/09/01 04:37:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,4 +34,4 @@ #define geqo_randint(upper,lower) ( (int) floor( geqo_rand()*((upper-lower)+0.999999) ) + lower ) -#endif /* GEQO_RANDOM_H */ +#endif /* GEQO_RANDOM_H */ diff --git a/src/include/optimizer/geqo_recombination.h b/src/include/optimizer/geqo_recombination.h index 615316f1978..a49a9550c74 100644 --- a/src/include/optimizer/geqo_recombination.h +++ b/src/include/optimizer/geqo_recombination.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_recombination.h,v 1.5 1997/11/26 01:13:32 momjian Exp $ + * $Id: geqo_recombination.h,v 1.6 1998/09/01 04:37:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -77,4 +77,4 @@ extern void ox1(Gene *mom, Gene *dad, Gene *offspring, int num_gene, City *city_ extern void ox2(Gene *mom, Gene *dad, Gene *offspring, int num_gene, City *city_table); -#endif /* GEQO_RECOMBINATION_H */ +#endif /* GEQO_RECOMBINATION_H */ diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h index 6a8e0cccffa..262a1a9cf75 100644 --- a/src/include/optimizer/geqo_selection.h +++ b/src/include/optimizer/geqo_selection.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_selection.h,v 1.5 1997/11/26 01:13:36 momjian Exp $ + * $Id: geqo_selection.h,v 1.6 1998/09/01 04:37:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,4 +26,4 @@ extern void geqo_selection(Chromosome *momma, Chromosome *daddy, Pool *pool, double bias); -#endif /* GEQO_SELECTION_H */ +#endif /* GEQO_SELECTION_H */ diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h index f4b80793167..0ebcffc78a4 100644 --- a/src/include/optimizer/internal.h +++ b/src/include/optimizer/internal.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: internal.h,v 1.10 1997/09/12 21:25:02 momjian Exp $ + * $Id: internal.h,v 1.11 1998/09/01 04:37:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -88,4 +88,4 @@ extern int BushyPlanFlag; /* GEQO switch according to number of relations in a query */ #define GEQO_RELS 8 -#endif /* INTERNAL_H */ +#endif /* INTERNAL_H */ diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h index cbb2893257e..c2573f19be2 100644 --- a/src/include/optimizer/joininfo.h +++ b/src/include/optimizer/joininfo.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: joininfo.h,v 1.7 1998/09/01 03:28:19 momjian Exp $ + * $Id: joininfo.h,v 1.8 1998/09/01 04:37:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ #include "nodes/primnodes.h" extern JoinInfo *joininfo_member(List *join_relids, List *joininfo_list); -extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids); +extern JoinInfo *find_joininfo_node(RelOptInfo * this_rel, List *join_relids); extern Var *other_join_clause_var(Var *var, Expr *clause); -#endif /* JOININFO_H */ +#endif /* JOININFO_H */ diff --git a/src/include/optimizer/keys.h b/src/include/optimizer/keys.h index 3ae613629d0..4fe166d549f 100644 --- a/src/include/optimizer/keys.h +++ b/src/include/optimizer/keys.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: keys.h,v 1.7 1998/07/18 04:22:51 momjian Exp $ + * $Id: keys.h,v 1.8 1998/09/01 04:37:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,9 +16,9 @@ #include "nodes/nodes.h" #include "nodes/relation.h" -extern bool match_indexkey_operand(int indexkey, Var *operand, RelOptInfo *rel); +extern bool match_indexkey_operand(int indexkey, Var *operand, RelOptInfo * rel); extern Var *extract_subkey(JoinKey *jk, int which_subkey); extern bool samekeys(List *keys1, List *keys2); extern List *collect_index_pathkeys(int *index_keys, List *tlist); -#endif /* KEYS_H */ +#endif /* KEYS_H */ diff --git a/src/include/optimizer/ordering.h b/src/include/optimizer/ordering.h index f06487b4470..fb3365c1efc 100644 --- a/src/include/optimizer/ordering.h +++ b/src/include/optimizer/ordering.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: ordering.h,v 1.8 1998/02/26 04:42:15 momjian Exp $ + * $Id: ordering.h,v 1.9 1998/09/01 04:37:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,14 +15,11 @@ #include <nodes/relation.h> -extern bool -equal_path_path_ordering(PathOrder *path_ordering1, +extern bool equal_path_path_ordering(PathOrder *path_ordering1, PathOrder *path_ordering2); -extern bool -equal_path_merge_ordering(Oid *path_ordering, +extern bool equal_path_merge_ordering(Oid *path_ordering, MergeOrder *merge_ordering); -extern bool -equal_merge_merge_ordering(MergeOrder *merge_ordering1, +extern bool equal_merge_merge_ordering(MergeOrder *merge_ordering1, MergeOrder *merge_ordering2); -#endif /* ORDERING_H */ +#endif /* ORDERING_H */ diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index a24acd89cb7..4c8501de952 100644 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pathnode.h,v 1.9 1998/08/04 16:44:29 momjian Exp $ + * $Id: pathnode.h,v 1.10 1998/09/01 04:37:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,25 +21,20 @@ * prototypes for pathnode.c */ extern bool path_is_cheaper(Path *path1, Path *path2); -extern Path *set_cheapest(RelOptInfo *parent_rel, List *pathlist); -extern List * -add_pathlist(RelOptInfo *parent_rel, List *unique_paths, +extern Path *set_cheapest(RelOptInfo * parent_rel, List *pathlist); +extern List *add_pathlist(RelOptInfo * parent_rel, List *unique_paths, List *new_paths); -extern Path *create_seqscan_path(RelOptInfo *rel); -extern IndexPath * -create_index_path(Query *root, RelOptInfo *rel, RelOptInfo *index, +extern Path *create_seqscan_path(RelOptInfo * rel); +extern IndexPath *create_index_path(Query *root, RelOptInfo * rel, RelOptInfo * index, List *restriction_clauses, bool is_join_scan); -extern JoinPath * -create_nestloop_path(RelOptInfo *joinrel, RelOptInfo *outer_rel, +extern JoinPath *create_nestloop_path(RelOptInfo * joinrel, RelOptInfo * outer_rel, Path *outer_path, Path *inner_path, List *keys); -extern MergePath * -create_mergejoin_path(RelOptInfo *joinrel, int outersize, +extern MergePath *create_mergejoin_path(RelOptInfo * joinrel, int outersize, int innersize, int outerwidth, int innerwidth, Path *outer_path, Path *inner_path, List *keys, MergeOrder *order, List *mergeclauses, List *outersortkeys, List *innersortkeys); -extern HashPath * -create_hashjoin_path(RelOptInfo *joinrel, int outersize, +extern HashPath *create_hashjoin_path(RelOptInfo * joinrel, int outersize, int innersize, int outerwidth, int innerwidth, Path *outer_path, Path *inner_path, List *keys, Oid operator, List *hashclauses, List *outerkeys, List *innerkeys); @@ -54,6 +49,6 @@ extern RelOptInfo *get_join_rel(Query *root, List *relid); /* * prototypes for indexnode.h */ -extern List *find_relation_indices(Query *root, RelOptInfo *rel); +extern List *find_relation_indices(Query *root, RelOptInfo * rel); -#endif /* PATHNODE_H */ +#endif /* PATHNODE_H */ diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index 1a2e3db83f7..a570d17db57 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: paths.h,v 1.9 1998/07/18 04:22:51 momjian Exp $ + * $Id: paths.h,v 1.10 1998/09/01 04:37:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,8 +27,7 @@ extern List *find_paths(Query *root, List *rels); * indxpath.h * routines to generate index paths */ -extern List * -find_index_paths(Query *root, RelOptInfo *rel, List *indices, +extern List *find_index_paths(Query *root, RelOptInfo * rel, List *indices, List *clauseinfo_list, List *joininfo_list); @@ -42,43 +41,36 @@ extern void find_all_join_paths(Query *root, List *joinrels); /* * orindxpath.h */ -extern List *create_or_index_paths(Query *root, RelOptInfo *rel, List *clauses); +extern List *create_or_index_paths(Query *root, RelOptInfo * rel, List *clauses); /* * hashutils.h * routines to deal with hash keys and clauses */ -extern List * -group_clauses_by_hashop(List *clauseinfo_list, +extern List *group_clauses_by_hashop(List *clauseinfo_list, int inner_relid); /* * joinutils.h * generic join method key/clause routines */ -extern List * -match_pathkeys_joinkeys(List *pathkeys, +extern List *match_pathkeys_joinkeys(List *pathkeys, List *joinkeys, List *joinclauses, int which_subkey, List **matchedJoinClausesPtr); -extern List * -extract_path_keys(List *joinkeys, List *tlist, +extern List *extract_path_keys(List *joinkeys, List *tlist, int which_subkey); -extern Path * -match_paths_joinkeys(List *joinkeys, PathOrder *ordering, +extern Path *match_paths_joinkeys(List *joinkeys, PathOrder *ordering, List *paths, int which_subkey); -extern List * -new_join_pathkeys(List *outer_pathkeys, +extern List *new_join_pathkeys(List *outer_pathkeys, List *join_rel_tlist, List *joinclauses); /* * mergeutils.h * routines to deal with merge keys and clauses */ -extern List * -group_clauses_by_order(List *clauseinfo_list, +extern List *group_clauses_by_order(List *clauseinfo_list, int inner_relid); -extern MInfo * -match_order_mergeinfo(PathOrder *ordering, +extern MInfo *match_order_mergeinfo(PathOrder *ordering, List *mergeinfo_list); /* @@ -94,8 +86,8 @@ extern List *final_join_rels(List *join_rel_list); */ extern void prune_joinrels(List *rel_list); extern void prune_rel_paths(List *rel_list); -extern Path *prune_rel_path(RelOptInfo *rel, Path *unorderedpath); +extern Path *prune_rel_path(RelOptInfo * rel, Path *unorderedpath); extern List *merge_joinrels(List *rel_list1, List *rel_list2); extern List *prune_oldrels(List *old_rels); -#endif /* PATHS_H */ +#endif /* PATHS_H */ diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index 5eab2c653da..8b4ec888941 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: plancat.h,v 1.8 1998/02/26 04:42:18 momjian Exp $ + * $Id: plancat.h,v 1.9 1998/09/01 04:37:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,35 +34,30 @@ typedef struct IdxInfoRetval } IdxInfoRetval; -extern void -relation_info(Query *root, +extern void relation_info(Query *root, Oid relid, bool *hashindex, int *pages, int *tuples); -extern bool -index_info(Query *root, +extern bool index_info(Query *root, bool first, int relid, IdxInfoRetval *info); -extern Cost -restriction_selectivity(Oid functionObjectId, +extern Cost restriction_selectivity(Oid functionObjectId, Oid operatorObjectId, Oid relationObjectId, AttrNumber attributeNumber, char *constValue, int32 constFlag); -extern void -index_selectivity(Oid indid, Oid *classes, List *opnos, +extern void index_selectivity(Oid indid, Oid *classes, List *opnos, Oid relid, List *attnos, List *values, List *flags, int32 nkeys, float *idxPages, float *idxSelec); -extern Cost -join_selectivity(Oid functionObjectId, Oid operatorObjectId, +extern Cost join_selectivity(Oid functionObjectId, Oid operatorObjectId, Oid relationObjectId1, AttrNumber attributeNumber1, Oid relationObjectId2, AttrNumber attributeNumber2); extern List *find_inheritance_children(Oid inhparent); extern List *VersionGetParents(Oid verrelid); -#endif /* PLANCAT_H */ +#endif /* PLANCAT_H */ diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 306860031db..b0d74cd5f70 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: planmain.h,v 1.14 1998/08/10 02:26:40 momjian Exp $ + * $Id: planmain.h,v 1.15 1998/09/01 04:37:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,8 +21,7 @@ /* * prototypes for plan/planmain.c */ -extern Plan * -query_planner(Query *root, +extern Plan *query_planner(Query *root, int command_type, List *tlist, List *qual); @@ -30,15 +29,12 @@ query_planner(Query *root, * prototypes for plan/createplan.c */ extern Plan *create_plan(Path *best_path); -extern SeqScan * -make_seqscan(List *qptlist, List *qpqual, Index scanrelid, +extern SeqScan *make_seqscan(List *qptlist, List *qpqual, Index scanrelid, Plan *lefttree); -extern Sort * -make_sort(List *tlist, Oid tempid, Plan *lefttree, +extern Sort *make_sort(List *tlist, Oid tempid, Plan *lefttree, int keycount); extern Agg *make_agg(List *tlist, Plan *lefttree); -extern Group * -make_group(List *tlist, bool tuplePerGroup, int ngrp, +extern Group *make_group(List *tlist, bool tuplePerGroup, int ngrp, AttrNumber *grpColIdx, Sort *lefttree); extern Unique *make_unique(List *tlist, Plan *lefttree, char *uniqueAttr); @@ -54,18 +50,16 @@ extern void add_missing_vars_to_tlist(Query *root, List *tlist); * prototypes for plan/setrefs.c */ extern void set_tlist_references(Plan *plan); -extern List * -join_references(List *clauses, List *outer_tlist, +extern List *join_references(List *clauses, List *outer_tlist, List *inner_tlist); -extern List * -index_outerjoin_references(List *inner_indxqual, +extern List *index_outerjoin_references(List *inner_indxqual, List *outer_tlist, Index inner_relid); extern void set_result_tlist_references(Result *resultNode); extern List *set_agg_tlist_references(Agg *aggNode); extern void set_agg_agglist_references(Agg *aggNode); extern void del_agg_tlist_references(List *tlist); -extern List *check_having_qual_for_aggs(Node *clause, - List *subplanTargetList, List *groupClause); +extern List *check_having_qual_for_aggs(Node *clause, + List *subplanTargetList, List *groupClause); extern List *check_having_qual_for_vars(Node *clause, List *targetlist_so_far); -#endif /* PLANMAIN_H */ +#endif /* PLANMAIN_H */ diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h index 38782d3a2c2..e620f3a2300 100644 --- a/src/include/optimizer/planner.h +++ b/src/include/optimizer/planner.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: planner.h,v 1.8 1998/02/13 03:46:56 vadim Exp $ + * $Id: planner.h,v 1.9 1998/09/01 04:37:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,4 +24,4 @@ extern Plan *planner(Query *parse); extern Plan *union_planner(Query *parse); extern void pg_checkretval(Oid rettype, QueryTreeList *querytree_list); -#endif /* PLANNER_H */ +#endif /* PLANNER_H */ diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index 7776e5be1e4..b972d0952c6 100644 --- a/src/include/optimizer/prep.h +++ b/src/include/optimizer/prep.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: prep.h,v 1.12 1998/02/26 04:42:23 momjian Exp $ + * $Id: prep.h,v 1.13 1998/09/01 04:37:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,15 +24,13 @@ extern List *cnfify(Expr *qual, bool removeAndFlag); /* * prototypes for preptlist.h */ -extern List * -preprocess_targetlist(List *tlist, int command_type, +extern List *preprocess_targetlist(List *tlist, int command_type, Index result_relation, List *range_table); -extern List * -find_all_inheritors(List *unexamined_relids, +extern List *find_all_inheritors(List *unexamined_relids, List *examined_relids); extern int first_inherit_rt_entry(List *rangetable); extern Append *plan_union_queries(Query *parse); extern Append *plan_inherit_queries(Query *parse, Index rt_index); -#endif /* PREP_H */ +#endif /* PREP_H */ diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h index 833750c960f..66ad302b8b1 100644 --- a/src/include/optimizer/subselect.h +++ b/src/include/optimizer/subselect.h @@ -17,4 +17,4 @@ extern List *SS_finalize_plan(Plan *plan); extern Node *SS_replace_correlation_vars(Node *expr); extern Node *SS_process_sublinks(Node *expr); -#endif /* SUBSELECT_H */ +#endif /* SUBSELECT_H */ diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index 30580bf4d82..5c9cbe45c83 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tlist.h,v 1.12 1998/07/20 21:18:35 momjian Exp $ + * $Id: tlist.h,v 1.13 1998/09/01 04:37:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ extern TargetEntry *tlistentry_member(Var *var, List *targetlist); extern Expr *matching_tlvar(Var *var, List *targetlist); -extern void add_tl_element(RelOptInfo *rel, Var *var); +extern void add_tl_element(RelOptInfo * rel, Var *var); extern TargetEntry *create_tl_element(Var *var, int resdomno); extern List *get_actual_tlist(List *tlist); extern Resdom *tlist_member(Var *var, List *tlist); @@ -32,4 +32,4 @@ extern List *flatten_tlist(List *tlist); extern List *flatten_tlist_vars(List *full_tlist, List *flat_tlist); -#endif /* TLIST_H */ +#endif /* TLIST_H */ diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h index 2437b6de1af..23bc30258d7 100644 --- a/src/include/optimizer/var.h +++ b/src/include/optimizer/var.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: var.h,v 1.5 1997/11/26 01:13:52 momjian Exp $ + * $Id: var.h,v 1.6 1998/09/01 04:37:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,4 @@ extern bool contain_var_clause(Node *clause); extern List *pull_var_clause(Node *clause); extern bool var_equal(Var *var1, Var *var2); -#endif /* VAR_H */ +#endif /* VAR_H */ diff --git a/src/include/optimizer/xfunc.h b/src/include/optimizer/xfunc.h index 77146a326d4..8a10ab80a54 100644 --- a/src/include/optimizer/xfunc.h +++ b/src/include/optimizer/xfunc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: xfunc.h,v 1.9 1998/09/01 03:28:20 momjian Exp $ + * $Id: xfunc.h,v 1.10 1998/09/01 04:37:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,12 +49,10 @@ extern int XfuncMode; /* defined in tcop/postgres.c */ #define is_join(pathnode) (length(get_relids(get_parent(pathnode))) > 1 ? 1 : 0) /* function prototypes from planner/path/xfunc.c */ -extern void xfunc_trypullup(RelOptInfo *rel); -extern int -xfunc_shouldpull(Path *childpath, JoinPath *parentpath, - int whichchild, ClauseInfo *maxcinfopt); -extern ClauseInfo * -xfunc_pullup(Path *childpath, JoinPath *parentpath, ClauseInfo *cinfo, +extern void xfunc_trypullup(RelOptInfo * rel); +extern int xfunc_shouldpull(Path *childpath, JoinPath *parentpath, + int whichchild, ClauseInfo * maxcinfopt); +extern ClauseInfo *xfunc_pullup(Path *childpath, JoinPath *parentpath, ClauseInfo * cinfo, int whichchild, int clausetype); extern Cost xfunc_rank(Expr *clause); extern Cost xfunc_expense(Query *queryInfo, Expr *clause); @@ -71,7 +69,7 @@ extern List *xfunc_primary_join(JoinPath *pathnode); extern Cost xfunc_get_path_cost(Path *pathnode); extern Cost xfunc_total_path_cost(JoinPath *pathnode); extern Cost xfunc_expense_per_tuple(JoinPath *joinnode, int whichchild); -extern void xfunc_fixvars(Expr *clause, RelOptInfo *rel, int varno); +extern void xfunc_fixvars(Expr *clause, RelOptInfo * rel, int varno); extern int xfunc_cinfo_compare(void *arg1, void *arg2); extern int xfunc_clause_compare(void *arg1, void *arg2); extern void xfunc_disjunct_sort(List *clause_list); @@ -80,11 +78,11 @@ extern int xfunc_func_width(RegProcedure funcid, List *args); extern int xfunc_tuple_width(Relation rd); extern int xfunc_num_join_clauses(JoinPath *path); extern List *xfunc_LispRemove(List *foo, List *bar); -extern bool xfunc_copyrel(RelOptInfo *from, RelOptInfo **to); +extern bool xfunc_copyrel(RelOptInfo * from, RelOptInfo ** to); /* * function prototypes for path/predmig.c */ extern bool xfunc_do_predmig(Path root); -#endif /* XFUNC_H */ +#endif /* XFUNC_H */ diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index 85191a60c1b..0c4f838d135 100644 --- a/src/include/parser/analyze.h +++ b/src/include/parser/analyze.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: analyze.h,v 1.3 1998/01/19 05:06:39 momjian Exp $ + * $Id: analyze.h,v 1.4 1998/09/01 04:37:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,4 +16,4 @@ extern QueryTreeList *parse_analyze(List *pl, ParseState *parentParseState); -#endif /* ANALYZE_H */ +#endif /* ANALYZE_H */ diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h index bb650d3f27c..cdf11cc1742 100644 --- a/src/include/parser/gramparse.h +++ b/src/include/parser/gramparse.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: gramparse.h,v 1.7 1998/02/26 04:42:36 momjian Exp $ + * $Id: gramparse.h,v 1.8 1998/09/01 04:37:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern Oid param_type(int t); extern void parser_init(Oid *typev, int nargs); extern int yyparse(void); -#endif /* GRAMPARSE_H */ +#endif /* GRAMPARSE_H */ diff --git a/src/include/parser/keywords.h b/src/include/parser/keywords.h index 7feda88a089..437cf694895 100644 --- a/src/include/parser/keywords.h +++ b/src/include/parser/keywords.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: keywords.h,v 1.4 1997/09/08 21:53:38 momjian Exp $ + * $Id: keywords.h,v 1.5 1998/09/01 04:37:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ typedef struct ScanKeyword extern ScanKeyword *ScanKeywordLookup(char *text); extern char *AtomValueGetString(int atomval); -#endif /* KEYWORDS_H */ +#endif /* KEYWORDS_H */ diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index 5f6987253b8..d7f2e08c4f1 100644 --- a/src/include/parser/parse_agg.h +++ b/src/include/parser/parse_agg.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_agg.h,v 1.6 1998/02/26 04:42:39 momjian Exp $ + * $Id: parse_agg.h,v 1.7 1998/09/01 04:37:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,9 +20,8 @@ extern void AddAggToParseState(ParseState *pstate, Aggreg *aggreg); extern void parseCheckAggregates(ParseState *pstate, Query *qry); -extern Aggreg * -ParseAgg(ParseState *pstate, char *aggname, Oid basetype, +extern Aggreg *ParseAgg(ParseState *pstate, char *aggname, Oid basetype, List *target, int precedence); extern void agg_error(char *caller, char *aggname, Oid basetypeID); -#endif /* PARSE_AGG_H */ +#endif /* PARSE_AGG_H */ diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h index 0a232fecd06..3306330c136 100644 --- a/src/include/parser/parse_clause.h +++ b/src/include/parser/parse_clause.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_clause.h,v 1.6 1998/02/26 04:42:40 momjian Exp $ + * $Id: parse_clause.h,v 1.7 1998/09/01 04:37:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,13 +21,11 @@ extern void makeRangeTable(ParseState *pstate, char *relname, List *frmList); extern Node *transformWhereClause(ParseState *pstate, Node *a_expr); -extern List * -transformGroupClause(ParseState *pstate, List *grouplist, +extern List *transformGroupClause(ParseState *pstate, List *grouplist, List *targetlist); -extern List * -transformSortClause(ParseState *pstate, +extern List *transformSortClause(ParseState *pstate, List *orderlist, List *sortClause, List *targetlist, char *uniqueFlag); extern List *transformUnionClause(List *unionClause, List *targetlist); -#endif /* PARSE_CLAUSE_H */ +#endif /* PARSE_CLAUSE_H */ diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index cf701a4c95f..7531e5c7542 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -6,14 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_coerce.h,v 1.4 1998/08/14 16:07:00 thomas Exp $ + * $Id: parse_coerce.h,v 1.5 1998/09/01 04:37:32 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PARSE_COERCE_H #define PARSE_COERCE_H -typedef enum CATEGORY { +typedef enum CATEGORY +{ INVALID_TYPE, UNKNOWN_TYPE, BOOLEAN_TYPE, @@ -24,13 +25,13 @@ typedef enum CATEGORY { GEOMETRIC_TYPE, USER_TYPE, MIXED_TYPE -} CATEGORY; +} CATEGORY; /* IS_BUILTIN_TYPE() * Check for types which are in the core distribution. * The built-in types can have more explicit support for type coersion, etc, - * since we know apriori how they should behave. + * since we know apriori how they should behave. * - thomas 1998-05-13 */ #define IS_BUILTIN_TYPE(t) \ @@ -61,7 +62,7 @@ typedef enum CATEGORY { /* IS_BINARY_COMPATIBLE() * Check for types with the same underlying binary representation. * This allows us to cheat and directly exchange values without - * going through the trouble of calling a conversion function. + * going through the trouble of calling a conversion function. */ #define IS_BINARY_COMPATIBLE(a,b) \ (((a) == BPCHAROID && (b) == TEXTOID) \ @@ -97,7 +98,7 @@ typedef enum CATEGORY { /* IS_HIGHEST_TYPE() * These types are the most general in each of the type categories. * Since timespan and datetime overload so many functions, let's - * give datetime the preference. + * give datetime the preference. * Since text is a generic string type let's leave it out too. */ #define IS_HIGHEST_TYPE(t) \ @@ -107,10 +108,10 @@ typedef enum CATEGORY { extern bool IsPreferredType(CATEGORY category, Oid type); -extern Oid PreferredType(CATEGORY category, Oid type); +extern Oid PreferredType(CATEGORY category, Oid type); extern CATEGORY TypeCategory(Oid type); extern bool can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids); extern Node *coerce_type(ParseState *pstate, Node *node, Oid inputTypeId, Oid targetTypeId); -#endif /* PARSE_COERCE_H */ +#endif /* PARSE_COERCE_H */ diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h index 9e02458c8e2..1d4b594f320 100644 --- a/src/include/parser/parse_expr.h +++ b/src/include/parser/parse_expr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_expr.h,v 1.9 1998/07/12 21:29:34 momjian Exp $ + * $Id: parse_expr.h,v 1.10 1998/09/01 04:37:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,4 +23,4 @@ extern Node *transformIdent(ParseState *pstate, Node *expr, int precedence); extern Oid exprType(Node *expr); extern Node *parser_typecast2(Node *expr, Oid exprType, Type tp, int32 attypmod); -#endif /* PARSE_EXPR_H */ +#endif /* PARSE_EXPR_H */ diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index 655a979dd1e..eab4b06aded 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_func.h,v 1.10 1998/05/29 14:03:08 thomas Exp $ + * $Id: parse_func.h,v 1.11 1998/09/01 04:37:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,17 +42,15 @@ typedef struct _CandidateList struct _CandidateList *next; } *CandidateList; -extern Node * -ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, +extern Node *ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, int *curr_resno, int precedence); -extern Node * -ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, +extern Node *ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, int *curr_resno, int precedence); extern Oid * -func_select_candidate(int nargs, Oid *input_typeids, CandidateList candidates); + func_select_candidate(int nargs, Oid *input_typeids, CandidateList candidates); extern void -func_error(char *caller, char *funcname, int nargs, Oid *argtypes, char *msg); + func_error(char *caller, char *funcname, int nargs, Oid *argtypes, char *msg); -#endif /* PARSE_FUNC_H */ +#endif /* PARSE_FUNC_H */ diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index e77b3789b0e..23040b57239 100644 --- a/src/include/parser/parse_node.h +++ b/src/include/parser/parse_node.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_node.h,v 1.10 1998/02/26 04:42:46 momjian Exp $ + * $Id: parse_node.h,v 1.11 1998/09/01 04:37:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,17 +44,14 @@ typedef struct ParseState extern ParseState *make_parsestate(ParseState *parentParseState); extern Expr *make_op(char *opname, Node *ltree, Node *rtree); -extern Var * -make_var(ParseState *pstate, Oid relid, char *refname, +extern Var *make_var(ParseState *pstate, Oid relid, char *refname, char *attrname); -extern ArrayRef * -make_array_ref(Node *expr, +extern ArrayRef *make_array_ref(Node *expr, List *indirection); -extern ArrayRef * -make_array_set(Expr *target_expr, +extern ArrayRef *make_array_set(Expr *target_expr, List *upperIndexpr, List *lowerIndexpr, Expr *expr); extern Const *make_const(Value *value); -#endif /* PARSE_NODE_H */ +#endif /* PARSE_NODE_H */ diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h index 7a0c9cd97f4..56d43b8b11e 100644 --- a/src/include/parser/parse_oper.h +++ b/src/include/parser/parse_oper.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_oper.h,v 1.5 1998/05/29 14:07:50 thomas Exp $ + * $Id: parse_oper.h,v 1.6 1998/09/01 04:37:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,4 +27,4 @@ extern Operator left_oper(char *op, Oid arg); extern Operator oper_exact(char *op, Oid arg1, Oid arg2, Node **ltree, Node **rtree, bool noWarnings); extern Operator oper_inexact(char *op, Oid arg1, Oid arg2, Node **ltree, Node **rtree, bool noWarnings); -#endif /* PARSE_OPER_H */ +#endif /* PARSE_OPER_H */ diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 5fc882e75d7..dc227ba5d8b 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_relation.h,v 1.7 1998/02/26 04:42:47 momjian Exp $ + * $Id: parse_relation.h,v 1.8 1998/09/01 04:37:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,25 +21,21 @@ #include <utils/rel.h> extern RangeTblEntry *refnameRangeTableEntry(ParseState *pstate, char *refname); -extern int -refnameRangeTablePosn(ParseState *pstate, +extern int refnameRangeTablePosn(ParseState *pstate, char *refname, int *sublevels_up); extern RangeTblEntry *colnameRangeTableEntry(ParseState *pstate, char *colname); -extern RangeTblEntry * -addRangeTableEntry(ParseState *pstate, +extern RangeTblEntry *addRangeTableEntry(ParseState *pstate, char *relname, char *refname, bool inh, bool inFromCl); -extern List * -expandAll(ParseState *pstate, char *relname, char *refname, +extern List *expandAll(ParseState *pstate, char *relname, char *refname, int *this_resno); extern int attnameAttNum(Relation rd, char *a); extern bool attnameIsSet(Relation rd, char *name); extern int attnumAttNelems(Relation rd, int attid); extern Oid attnumTypeId(Relation rd, int attid); -extern void -handleTargetColname(ParseState *pstate, char **resname, +extern void handleTargetColname(ParseState *pstate, char **resname, char *refname, char *colname); -#endif /* PARSE_RANGE_H */ +#endif /* PARSE_RANGE_H */ diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h index 884fb299c47..263ed8a5043 100644 --- a/src/include/parser/parse_target.h +++ b/src/include/parser/parse_target.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_target.h,v 1.10 1998/08/25 03:17:29 momjian Exp $ + * $Id: parse_target.h,v 1.11 1998/09/01 04:37:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,20 +24,18 @@ extern List *transformTargetList(ParseState *pstate, List *targetlist); extern List *makeTargetNames(ParseState *pstate, List *cols); -extern TargetEntry * -MakeTargetEntryIdent(ParseState *pstate, +extern TargetEntry *MakeTargetEntryIdent(ParseState *pstate, Node *node, char **resname, char *refname, char *colname, int16 resjunk); -extern Node * -CoerceTargetExpr(ParseState *pstate, Node *expr, +extern Node *CoerceTargetExpr(ParseState *pstate, Node *expr, Oid type_id, Oid attrtype); -TargetEntry * MakeTargetEntryExpr(ParseState *pstate, - char *colname, - Node *expr, - List *arrayRef, - int16 resjunk); +TargetEntry *MakeTargetEntryExpr(ParseState *pstate, + char *colname, + Node *expr, + List *arrayRef, + int16 resjunk); -#endif /* PARSE_TARGET_H */ +#endif /* PARSE_TARGET_H */ diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h index 7ea8e383297..3a01dd292ef 100644 --- a/src/include/parser/parse_type.h +++ b/src/include/parser/parse_type.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_type.h,v 1.7 1998/07/12 21:29:35 momjian Exp $ + * $Id: parse_type.h,v 1.8 1998/09/01 04:37:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,4 +34,4 @@ extern Oid typeidTypElem(Oid type_id); extern Oid GetArrayElementType(Oid typearray); extern Oid typeidInfunc(Oid type_id); -#endif /* PARSE_TYPE_H */ +#endif /* PARSE_TYPE_H */ diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h index 17867623e08..8d13e028809 100644 --- a/src/include/parser/parser.h +++ b/src/include/parser/parser.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parser.h,v 1.3 1998/02/26 04:42:51 momjian Exp $ + * $Id: parser.h,v 1.4 1998/09/01 04:37:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,4 @@ extern QueryTreeList *parser(char *str, Oid *typev, int nargs); -#endif /* PARSER_H */ +#endif /* PARSER_H */ diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h index 0d2f83bbb2a..b82fe31e70f 100644 --- a/src/include/parser/parsetree.h +++ b/src/include/parser/parsetree.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parsetree.h,v 1.4 1997/11/21 19:12:28 momjian Exp $ + * $Id: parsetree.h,v 1.5 1998/09/01 04:37:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,4 +65,4 @@ #define getrelname(rangeindex, rangetable) \ rt_relname((RangeTblEntry*)nth((rangeindex)-1, rangetable)) -#endif /* PARSETREE_H */ +#endif /* PARSETREE_H */ diff --git a/src/include/parser/scansup.h b/src/include/parser/scansup.h index 9a30962cce2..3bc0ba46db3 100644 --- a/src/include/parser/scansup.h +++ b/src/include/parser/scansup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: scansup.h,v 1.4 1997/11/26 01:14:18 momjian Exp $ + * $Id: scansup.h,v 1.5 1998/09/01 04:37:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,4 +16,4 @@ extern char *scanstr(char *s); -#endif /* SCANSUP_H */ +#endif /* SCANSUP_H */ diff --git a/src/include/port/linux.h b/src/include/port/linux.h index 4ac6684ee79..8d550c0e08a 100644 --- a/src/include/port/linux.h +++ b/src/include/port/linux.h @@ -15,7 +15,7 @@ typedef unsigned int slock_t; #elif defined(__alpha) typedef long int slock_t; -#else /* i386 probably */ +#else /* i386 probably */ typedef unsigned char slock_t; #endif @@ -35,4 +35,3 @@ typedef unsigned char slock_t; #if defined(PPC) #undef HAVE_INT_TIMEZONE #endif - diff --git a/src/include/port/solaris_i386.h b/src/include/port/solaris_i386.h index b2df1ba5e2c..4530e4205a6 100755 --- a/src/include/port/solaris_i386.h +++ b/src/include/port/solaris_i386.h @@ -24,7 +24,7 @@ typedef unsigned char slock_t; #ifndef __nan_bytes #define __nan_bytes { 0, 0, 0, 0, 0, 0, 0xf8, 0x7f } -#endif /* __nan_bytes */ +#endif /* __nan_bytes */ #ifdef __GNUC__ #define NAN \ @@ -34,8 +34,8 @@ typedef unsigned char slock_t; #else /* Not GCC. */ #define NAN (*(__const double *) __nan) -#endif /* GCC. */ -#endif /* NAN */ +#endif /* GCC. */ +#endif /* NAN */ #ifndef index #define index strchr diff --git a/src/include/port/univel.h b/src/include/port/univel.h index ae706eda5e0..3e95acd6048 100644 --- a/src/include/port/univel.h +++ b/src/include/port/univel.h @@ -17,7 +17,7 @@ typedef unsigned char slock_t; /*************************************************************** * strcasecmp() is in c89.a. The following include will get the - * needed prototype. + * needed prototype. ***************************************************************/ #include <strings.h> diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h index c52b9b0948d..cbdd4ff4d96 100644 --- a/src/include/port/unixware.h +++ b/src/include/port/unixware.h @@ -17,8 +17,8 @@ typedef unsigned char slock_t; #define DISABLE_COMPLEX_MACRO /*************************************************************** - * The following include will get the needed prototype for the - * strcasecmp() function. + * The following include will get the needed prototype for the + * strcasecmp() function. ***************************************************************/ #include <strings.h> diff --git a/src/include/postgres.h b/src/include/postgres.h index 6b659347fa0..ff81c2b8bc4 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -6,7 +6,7 @@ * * Copyright (c) 1995, Regents of the University of California * - * $Id: postgres.h,v 1.18 1998/08/19 02:03:32 momjian Exp $ + * $Id: postgres.h,v 1.19 1998/09/01 04:34:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -164,6 +164,6 @@ typedef uint32 CommandId; #ifdef CYR_RECODE void SetCharSet(); -#endif /* CYR_RECODE */ +#endif /* CYR_RECODE */ -#endif /* POSTGRES_H */ +#endif /* POSTGRES_H */ diff --git a/src/include/regex/cdefs.h b/src/include/regex/cdefs.h index 8493c2563c7..69f9128f45a 100644 --- a/src/include/regex/cdefs.h +++ b/src/include/regex/cdefs.h @@ -55,7 +55,7 @@ /* * @(#)cdefs.h 8.1 (Berkeley) 6/2/93 - * $Id: cdefs.h,v 1.3 1997/09/07 05:00:14 momjian Exp $ + * $Id: cdefs.h,v 1.4 1998/09/01 04:37:51 momjian Exp $ */ #ifndef _CDEFS_H_ @@ -96,8 +96,8 @@ #else #ifndef __GNUC__ #define __inline /* delete GCC keyword */ -#endif /* !__GNUC__ */ -#endif /* !__cplusplus */ +#endif /* !__GNUC__ */ +#endif /* !__cplusplus */ #else /* !(__STDC__ || __cplusplus) */ #define __P(protos) () /* traditional C preprocessor */ @@ -123,8 +123,8 @@ #define signed #define volatile #endif -#endif /* !__GNUC__ */ -#endif /* !(__STDC__ || __cplusplus) */ +#endif /* !__GNUC__ */ +#endif /* !(__STDC__ || __cplusplus) */ /* * GCC1 and some versions of GCC2 declare dead (non-returning) and @@ -148,4 +148,4 @@ #define __pure #endif -#endif /* !_CDEFS_H_ */ +#endif /* !_CDEFS_H_ */ diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h index c4a306e4c23..55c11733eac 100644 --- a/src/include/regex/regex.h +++ b/src/include/regex/regex.h @@ -50,10 +50,10 @@ typedef struct { int re_magic; size_t re_nsub; /* number of parenthesized subexpressions */ - const pg_wchar *re_endp; /* end pointer for REG_PEND */ + const pg_wchar *re_endp; /* end pointer for REG_PEND */ struct re_guts *re_g; /* none of your business :-) */ #ifdef MULTIBYTE - pg_wchar *patsave; /* mee too :-) */ + pg_wchar *patsave; /* mee too :-) */ #endif } regex_t; @@ -104,9 +104,8 @@ typedef struct int pg95_regcomp(regex_t *, const char *, int); size_t pg95_regerror(int, const regex_t *, char *, size_t); -int -pg95_regexec(const regex_t *, +int pg95_regexec(const regex_t *, const char *, size_t, regmatch_t[], int); void pg95_regfree(regex_t *); -#endif /* !_REGEX_H_ */ +#endif /* !_REGEX_H_ */ diff --git a/src/include/regex/regex2.h b/src/include/regex/regex2.h index e17491164a0..aab9195dc55 100644 --- a/src/include/regex/regex2.h +++ b/src/include/regex/regex2.h @@ -129,9 +129,9 @@ typedef struct uch mask; /* bit within array */ #ifdef MULTIBYTE pg_wchar hash; /* hash code */ - unsigned int lc; /* leading character (character-set) */ + unsigned int lc; /* leading character (character-set) */ #else - uch hash; /* hash code */ + uch hash; /* hash code */ #endif size_t smultis; char *multis; /* -> char[smulti] ab\0cd\0ef\0\0 */ @@ -139,11 +139,11 @@ typedef struct /* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */ #ifdef MULTIBYTE -#define CHlc(c) (((unsigned)(c)&0xff0000)>>16) +#define CHlc(c) (((unsigned)(c)&0xff0000)>>16) #define CHadd(cs, c) ((cs)->ptr[(unsigned)(c)&0xffff] |= (cs)->mask, (cs)->hash += (unsigned)(c)&0xffff,\ (cs)->lc = CHlc(c)) #define CHsub(cs, c) ((cs)->ptr[(unsigned)(c)&0xffff] &= ~(cs)->mask, (cs)->hash -= (unsigned)(c)&0xffff) -#define CHIN(cs, c) ((cs)->ptr[(unsigned)(c)&0xffff] & (cs)->mask && \ +#define CHIN(cs, c) ((cs)->ptr[(unsigned)(c)&0xffff] & (cs)->mask && \ ((cs)->lc == CHlc(c))) #define MCadd(p, cs, cp) mcadd(p, cs, cp) /* regcomp() internal * fns */ @@ -186,7 +186,7 @@ struct re_guts int neol; /* number of $ used */ int ncategories; /* how many character categories */ cat_t *categories; /* ->catspace[-CHAR_MIN] */ - pg_wchar *must; /* match must contain this string */ + pg_wchar *must; /* match must contain this string */ int mlen; /* length of must */ size_t nsub; /* copy of re_nsub */ int backrefs; /* does it use back references? */ @@ -197,9 +197,9 @@ struct re_guts /* misc utilities */ #ifdef MULTIBYTE -# define OUT (16777216+1) /* 16777216 == 2^24 == 3 bytes */ +#define OUT (16777216+1) /* 16777216 == 2^24 == 3 bytes */ #else -# define OUT (CHAR_MAX+1) /* a non-character value */ +#define OUT (CHAR_MAX+1) /* a non-character value */ #endif #ifdef MULTIBYTE diff --git a/src/include/regex/regexp.h b/src/include/regex/regexp.h index d8008190708..9efa403eb94 100644 --- a/src/include/regex/regexp.h +++ b/src/include/regex/regexp.h @@ -68,4 +68,4 @@ void pg95_regerror __P((const char *)); __END_DECLS -#endif /* !_REGEXP_H_ */ +#endif /* !_REGEXP_H_ */ diff --git a/src/include/rewrite/locks.h b/src/include/rewrite/locks.h index 88ff5921397..b51b02463ed 100644 --- a/src/include/rewrite/locks.h +++ b/src/include/rewrite/locks.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: locks.h,v 1.8 1998/02/26 04:43:03 momjian Exp $ + * $Id: locks.h,v 1.9 1998/09/01 04:37:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,8 +17,7 @@ #include "nodes/parsenodes.h" #include "rewrite/prs2lock.h" -extern List * -matchLocks(CmdType event, RuleLock *rulelocks, int varno, +extern List *matchLocks(CmdType event, RuleLock *rulelocks, int varno, Query *parsetree); -#endif /* LOCKS_H */ +#endif /* LOCKS_H */ diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h index 183abf51309..cbf5705c15b 100644 --- a/src/include/rewrite/prs2lock.h +++ b/src/include/rewrite/prs2lock.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: prs2lock.h,v 1.7 1997/09/08 21:54:03 momjian Exp $ + * $Id: prs2lock.h,v 1.8 1998/09/01 04:37:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,4 +42,4 @@ typedef struct RuleLock RewriteRule **rules; } RuleLock; -#endif /* REWRITE_H */ +#endif /* REWRITE_H */ diff --git a/src/include/rewrite/rewriteDefine.h b/src/include/rewrite/rewriteDefine.h index c002dd58f06..3dd43c01252 100644 --- a/src/include/rewrite/rewriteDefine.h +++ b/src/include/rewrite/rewriteDefine.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteDefine.h,v 1.5 1997/11/26 01:14:22 momjian Exp $ + * $Id: rewriteDefine.h,v 1.6 1998/09/01 04:38:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,4 @@ extern void DefineQueryRewrite(RuleStmt *args); -#endif /* REWRITEDEFINE_H */ +#endif /* REWRITEDEFINE_H */ diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h index e55e2086bcb..ecec766aece 100644 --- a/src/include/rewrite/rewriteHandler.h +++ b/src/include/rewrite/rewriteHandler.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteHandler.h,v 1.5 1997/11/26 01:14:23 momjian Exp $ + * $Id: rewriteHandler.h,v 1.6 1998/09/01 04:38:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,4 +35,4 @@ typedef struct _rewrite_meta_knowledge RewriteInfo; extern List *QueryRewrite(Query *parsetree); -#endif /* REWRITEHANDLER_H */ +#endif /* REWRITEHANDLER_H */ diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h index f5934a89626..dd3ba1ff159 100644 --- a/src/include/rewrite/rewriteManip.h +++ b/src/include/rewrite/rewriteManip.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteManip.h,v 1.8 1998/07/19 05:49:26 momjian Exp $ + * $Id: rewriteManip.h,v 1.9 1998/09/01 04:38:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,22 +19,19 @@ /* RewriteManip.c */ void OffsetVarNodes(Node *node, int offset); -void -ChangeVarNodes(Node *node, int old_varno, int new_varno, +void ChangeVarNodes(Node *node, int old_varno, int new_varno, int sublevels_up); void AddQual(Query *parsetree, Node *qual); -void AddHavingQual(Query *parsetree, Node *havingQual); +void AddHavingQual(Query *parsetree, Node *havingQual); void AddNotQual(Query *parsetree, Node *qual); void FixResdomTypes(List *user_tlist); void FixNew(RewriteInfo *info, Query *parsetree); -void -HandleRIRAttributeRule(Query *parsetree, List *rtable, List *targetlist, +void HandleRIRAttributeRule(Query *parsetree, List *rtable, List *targetlist, int rt_index, int attr_num, int *modified, int *badpostquel); -void -HandleViewRule(Query *parsetree, List *rtable, List *targetlist, +void HandleViewRule(Query *parsetree, List *rtable, List *targetlist, int rt_index, int *modified); -#endif /* REWRITEMANIP_H */ +#endif /* REWRITEMANIP_H */ diff --git a/src/include/rewrite/rewriteRemove.h b/src/include/rewrite/rewriteRemove.h index ad69e7af03c..82875f06d03 100644 --- a/src/include/rewrite/rewriteRemove.h +++ b/src/include/rewrite/rewriteRemove.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteRemove.h,v 1.3 1997/09/08 02:38:51 momjian Exp $ + * $Id: rewriteRemove.h,v 1.4 1998/09/01 04:38:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,4 @@ extern char *RewriteGetRuleEventRel(char *rulename); extern void RemoveRewriteRule(char *ruleName); extern void RelationRemoveRules(Oid relid); -#endif /* REWRITEREMOVE_H */ +#endif /* REWRITEREMOVE_H */ diff --git a/src/include/rewrite/rewriteSupport.h b/src/include/rewrite/rewriteSupport.h index 098443144d2..49ee00e3cbd 100644 --- a/src/include/rewrite/rewriteSupport.h +++ b/src/include/rewrite/rewriteSupport.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteSupport.h,v 1.8 1998/02/26 04:43:13 momjian Exp $ + * $Id: rewriteSupport.h,v 1.9 1998/09/01 04:38:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,11 +18,10 @@ extern int IsDefinedRewriteRule(char *ruleName); -extern void -prs2_addToRelation(Oid relid, Oid ruleId, CmdType event_type, +extern void prs2_addToRelation(Oid relid, Oid ruleId, CmdType event_type, AttrNumber attno, bool isInstead, Node *qual, List *actions); extern void prs2_deleteFromRelation(Oid relid, Oid ruleId); -#endif /* REWRITESUPPORT_H */ +#endif /* REWRITESUPPORT_H */ diff --git a/src/include/rusagestub.h b/src/include/rusagestub.h index 794d5bed666..083e6643714 100644 --- a/src/include/rusagestub.h +++ b/src/include/rusagestub.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rusagestub.h,v 1.2 1998/02/26 04:39:50 momjian Exp $ + * $Id: rusagestub.h,v 1.3 1998/09/01 04:34:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,4 @@ struct rusage extern int getrusage(int who, struct rusage * rusage); -#endif /* RUSAGESTUB_H */ +#endif /* RUSAGESTUB_H */ diff --git a/src/include/storage/backendid.h b/src/include/storage/backendid.h index 25be9a4fdcf..35a41307827 100644 --- a/src/include/storage/backendid.h +++ b/src/include/storage/backendid.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: backendid.h,v 1.4 1997/09/08 02:38:53 momjian Exp $ + * $Id: backendid.h,v 1.5 1998/09/01 04:38:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,4 +29,4 @@ typedef int32 BackendTag; /* unique backend identifier */ extern BackendId MyBackendId; /* backend id of this backend */ extern BackendTag MyBackendTag; /* backend tag of this backend */ -#endif /* BACKENDID_H */ +#endif /* BACKENDID_H */ diff --git a/src/include/storage/block.h b/src/include/storage/block.h index 17b93786882..1f31fadfee1 100644 --- a/src/include/storage/block.h +++ b/src/include/storage/block.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: block.h,v 1.6 1998/06/15 18:40:00 momjian Exp $ + * $Id: block.h,v 1.7 1998/09/01 04:38:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -115,4 +115,4 @@ typedef BlockIdData *BlockId; /* block identifier */ (BlockNumber) (((blockId)->bi_hi << 16) | ((uint16) (blockId)->bi_lo)) \ ) -#endif /* BLOCK_H */ +#endif /* BLOCK_H */ diff --git a/src/include/storage/buf.h b/src/include/storage/buf.h index 86288cb3459..9b19fa279b3 100644 --- a/src/include/storage/buf.h +++ b/src/include/storage/buf.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: buf.h,v 1.3 1997/09/08 02:38:56 momjian Exp $ + * $Id: buf.h,v 1.4 1998/09/01 04:38:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,4 +44,4 @@ typedef long Buffer; */ #undef NO_BUFFERISVALID -#endif /* BUF_H */ +#endif /* BUF_H */ diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h index 03d249195d6..61f567b6d3b 100644 --- a/src/include/storage/buf_internals.h +++ b/src/include/storage/buf_internals.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: buf_internals.h,v 1.25 1998/08/01 15:26:34 vadim Exp $ + * $Id: buf_internals.h,v 1.26 1998/09/01 04:38:10 momjian Exp $ * * NOTE * If BUFFERPAGE0 is defined, then 0 will be used as a @@ -51,7 +51,7 @@ typedef long **BufferBlock; struct buftag { - LockRelId relId; + LockRelId relId; BlockNumber blockNum; /* blknum relative to begin of reln */ }; @@ -101,7 +101,7 @@ struct sbufdesc_unpadded unsigned refcount; #ifdef HAS_TEST_AND_SET slock_t io_in_progress_lock; -#endif /* HAS_TEST_AND_SET */ +#endif /* HAS_TEST_AND_SET */ char sb_dbname[NAMEDATALEN]; /* NOTE NO PADDING OF THE MEMBER HERE */ @@ -125,7 +125,7 @@ struct sbufdesc #ifdef HAS_TEST_AND_SET /* can afford a dedicated lock if test-and-set locks are available */ slock_t io_in_progress_lock; -#endif /* HAS_TEST_AND_SET */ +#endif /* HAS_TEST_AND_SET */ char sb_dbname[NAMEDATALEN]; /* name of db in which buf belongs */ @@ -173,7 +173,7 @@ typedef struct _bmtrace } bmtrace; -#endif /* BMTRACE */ +#endif /* BMTRACE */ /* @@ -209,8 +209,7 @@ extern long *LocalRefCount; extern BufferDesc *LocalBufferDescriptors; extern int NLocBuffer; -extern BufferDesc * -LocalBufferAlloc(Relation reln, BlockNumber blockNum, +extern BufferDesc *LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool *foundPtr); extern int WriteLocalBuffer(Buffer buffer, bool release); extern int FlushLocalBuffer(Buffer buffer, bool release); @@ -218,4 +217,4 @@ extern void InitLocalBuffer(void); extern void LocalBufferSync(void); extern void ResetLocalBufferPool(void); -#endif /* BUFMGR_INTERNALS_H */ +#endif /* BUFMGR_INTERNALS_H */ diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 60acb866348..cfd4a73bc53 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: bufmgr.h,v 1.21 1998/08/19 02:03:57 momjian Exp $ + * $Id: bufmgr.h,v 1.22 1998/09/01 04:38:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -128,14 +128,12 @@ extern int ShowPinTrace; /* * prototypes for functions in bufmgr.c */ -extern Buffer -RelationGetBufferWithBuffer(Relation relation, +extern Buffer RelationGetBufferWithBuffer(Relation relation, BlockNumber blockNumber, Buffer buffer); extern Buffer ReadBuffer(Relation reln, BlockNumber blockNum); extern int WriteBuffer(Buffer buffer); extern int WriteNoReleaseBuffer(Buffer buffer); -extern Buffer -ReleaseAndReadBuffer(Buffer buffer, Relation relation, +extern Buffer ReleaseAndReadBuffer(Buffer buffer, Relation relation, BlockNumber blockNum); extern void InitBufferPool(IPCKey key); @@ -159,4 +157,4 @@ extern void BufferRefCountRestore(int *refcountsave); extern int SetBufferWriteMode(int mode); extern void SetBufferCommitInfoNeedsSave(Buffer buffer); -#endif /* !defined(BufMgrIncluded) */ +#endif /* !defined(BufMgrIncluded) */ diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h index 123192f914f..a6c8b8e920f 100644 --- a/src/include/storage/bufpage.h +++ b/src/include/storage/bufpage.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: bufpage.h,v 1.19 1998/06/15 18:40:02 momjian Exp $ + * $Id: bufpage.h,v 1.20 1998/09/01 04:38:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -310,8 +310,7 @@ typedef enum */ extern void PageInit(Page page, Size pageSize, Size specialSize); -extern OffsetNumber -PageAddItem(Page page, Item item, Size size, +extern OffsetNumber PageAddItem(Page page, Item item, Size size, OffsetNumber offsetNumber, ItemIdFlags flags); extern Page PageGetTempPage(Page page, Size specialSize); extern void PageRestoreTempPage(Page tempPage, Page oldPage); @@ -321,4 +320,4 @@ extern void PageManagerModeSet(PageManagerMode mode); extern void PageIndexTupleDelete(Page page, OffsetNumber offset); -#endif /* BUFPAGE_H */ +#endif /* BUFPAGE_H */ diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index e5404154a64..8e5cc0a4ac2 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: fd.h,v 1.10 1997/09/08 02:39:00 momjian Exp $ + * $Id: fd.h,v 1.11 1998/09/01 04:38:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -77,4 +77,4 @@ extern void FreeFile(FILE *); extern void closeAllVfds(void); extern int pg_fsync(int fd); -#endif /* FD_H */ +#endif /* FD_H */ diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h index 3691eac6757..4733b34bbc8 100644 --- a/src/include/storage/ipc.h +++ b/src/include/storage/ipc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: ipc.h,v 1.29 1998/06/27 15:47:47 momjian Exp $ + * $Id: ipc.h,v 1.30 1998/09/01 04:38:16 momjian Exp $ * * NOTES * This file is very architecture-specific. This stuff should actually @@ -73,12 +73,11 @@ typedef int IpcMemoryId; /* ipc.c */ extern void proc_exit(int code); extern void shmem_exit(int code); -extern int on_shmem_exit(void (*function) (), caddr_t arg); -extern int on_proc_exit(void (*function) (), caddr_t arg); +extern int on_shmem_exit(void (*function) (), caddr_t arg); +extern int on_proc_exit(void (*function) (), caddr_t arg); extern void on_exit_reset(void); -extern IpcSemaphoreId -IpcSemaphoreCreate(IpcSemaphoreKey semKey, +extern IpcSemaphoreId IpcSemaphoreCreate(IpcSemaphoreKey semKey, int semNum, int permission, int semStartValue, int removeOnExit, int *status); extern void IpcSemaphoreKill(IpcSemaphoreKey key); @@ -86,8 +85,7 @@ extern void IpcSemaphoreLock(IpcSemaphoreId semId, int sem, int lock); extern void IpcSemaphoreUnlock(IpcSemaphoreId semId, int sem, int lock); extern int IpcSemaphoreGetCount(IpcSemaphoreId semId, int sem); extern int IpcSemaphoreGetValue(IpcSemaphoreId semId, int sem); -extern IpcMemoryId -IpcMemoryCreate(IpcMemoryKey memKey, uint32 size, +extern IpcMemoryId IpcMemoryCreate(IpcMemoryKey memKey, uint32 size, int permission); extern IpcMemoryId IpcMemoryIdGet(IpcMemoryKey memKey, uint32 size); extern char *IpcMemoryAttach(IpcMemoryId memId); @@ -155,7 +153,7 @@ typedef enum _LockId_ #define MAX_SPINS FIRSTFREELOCKID -#endif /* HAS_TEST_AND_SET */ +#endif /* HAS_TEST_AND_SET */ /* * the following are originally in ipci.h but the prototypes have circular @@ -204,4 +202,4 @@ extern IPCKey SystemPortAddressCreateIPCKey(SystemPortAddress address); extern void CreateSharedMemoryAndSemaphores(IPCKey key); extern void AttachSharedMemoryAndSemaphores(IPCKey key); -#endif /* IPC_H */ +#endif /* IPC_H */ diff --git a/src/include/storage/item.h b/src/include/storage/item.h index 6541a717f9f..d3cf7bfdff5 100644 --- a/src/include/storage/item.h +++ b/src/include/storage/item.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: item.h,v 1.3 1997/09/07 05:01:16 momjian Exp $ + * $Id: item.h,v 1.4 1998/09/01 04:38:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,4 +15,4 @@ typedef Pointer Item; -#endif /* ITEM_H */ +#endif /* ITEM_H */ diff --git a/src/include/storage/itemid.h b/src/include/storage/itemid.h index 5a3953c32e5..1c37713f155 100644 --- a/src/include/storage/itemid.h +++ b/src/include/storage/itemid.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: itemid.h,v 1.6 1998/06/15 18:40:03 momjian Exp $ + * $Id: itemid.h,v 1.7 1998/09/01 04:38:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,4 +75,4 @@ typedef struct ItemIdData *ItemId; (bool) (((itemId)->lp_flags & LP_USED) != 0) \ ) -#endif /* ITEMID_H */ +#endif /* ITEMID_H */ diff --git a/src/include/storage/itempos.h b/src/include/storage/itempos.h index 332636ce95f..6f022e1822e 100644 --- a/src/include/storage/itempos.h +++ b/src/include/storage/itempos.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: itempos.h,v 1.5 1997/09/08 02:39:02 momjian Exp $ + * $Id: itempos.h,v 1.6 1998/09/01 04:38:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,4 +41,4 @@ typedef ItemSubpositionData *ItemSubposition; #define PSKIP(OBJP, LEN)\ { (OBJP)->op_cp += (LEN); (OBJP)->op_len -= (LEN); } -#endif /* ITEMPOS_H */ +#endif /* ITEMPOS_H */ diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h index c6922a093f5..253d9f21514 100644 --- a/src/include/storage/itemptr.h +++ b/src/include/storage/itemptr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: itemptr.h,v 1.8 1998/06/15 18:40:03 momjian Exp $ + * $Id: itemptr.h,v 1.9 1998/09/01 04:38:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -123,4 +123,4 @@ typedef ItemPointerData *ItemPointer; extern bool ItemPointerEquals(ItemPointer pointer1, ItemPointer pointer2); -#endif /* ITEMPTR_H */ +#endif /* ITEMPTR_H */ diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h index 3d35dba907a..0918ab03df0 100644 --- a/src/include/storage/large_object.h +++ b/src/include/storage/large_object.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: large_object.h,v 1.8 1998/07/21 04:17:30 momjian Exp $ + * $Id: large_object.h,v 1.9 1998/09/01 04:38:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,4 +57,4 @@ extern int inv_write(LargeObjectDesc *obj_desc, char *buf, int nbytes); /* added for buffer leak prevention [ PA ] */ extern void inv_cleanindex(LargeObjectDesc *obj_desc); -#endif /* LARGE_OBJECT_H */ +#endif /* LARGE_OBJECT_H */ diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h index 0ee53344725..4082811bcc8 100644 --- a/src/include/storage/lmgr.h +++ b/src/include/storage/lmgr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lmgr.h,v 1.14 1998/08/01 15:26:36 vadim Exp $ + * $Id: lmgr.h,v 1.15 1998/09/01 04:38:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,19 +25,21 @@ typedef struct LockRelId { Oid relId; /* a relation identifier */ Oid dbId; /* a database identifier */ -} LockRelId; +} LockRelId; #ifdef LowLevelLocking typedef struct LockInfoData { LockRelId lockRelId; - bool lockHeld[MAX_LOCKMODES]; /* on table level */ + bool lockHeld[MAX_LOCKMODES]; /* on table level */ } LockInfoData; + #else typedef struct LockInfoData { LockRelId lockRelId; } LockInfoData; + #endif typedef LockInfoData *LockInfo; @@ -52,22 +54,17 @@ extern void RelationSetLockForWrite(Relation relation); extern void RelationUnsetLockForWrite(Relation relation); /* used in vaccum.c */ -extern void -RelationSetLockForWritePage(Relation relation, +extern void RelationSetLockForWritePage(Relation relation, ItemPointer itemPointer); /* used in nbtpage.c, hashpage.c */ -extern void -RelationSetSingleWLockPage(Relation relation, +extern void RelationSetSingleWLockPage(Relation relation, ItemPointer itemPointer); -extern void -RelationUnsetSingleWLockPage(Relation relation, +extern void RelationUnsetSingleWLockPage(Relation relation, ItemPointer itemPointer); -extern void -RelationSetSingleRLockPage(Relation relation, +extern void RelationSetSingleRLockPage(Relation relation, ItemPointer itemPointer); -extern void -RelationUnsetSingleRLockPage(Relation relation, +extern void RelationUnsetSingleRLockPage(Relation relation, ItemPointer itemPointer); extern void RelationSetRIntentLock(Relation relation); extern void RelationUnsetRIntentLock(Relation relation); @@ -76,11 +73,10 @@ extern void RelationUnsetWIntentLock(Relation relation); /* single.c */ extern bool SingleLockReln(LockInfo lockinfo, LOCKMODE lockmode, int action); -extern bool -SingleLockPage(LockInfo lockinfo, ItemPointer tidPtr, +extern bool SingleLockPage(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode, int action); /* proc.c */ extern void InitProcGlobal(IPCKey key); -#endif /* LMGR_H */ +#endif /* LMGR_H */ diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index e989e57b440..09292c4f743 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lock.h,v 1.17 1998/08/25 21:20:31 scrappy Exp $ + * $Id: lock.h,v 1.18 1998/09/01 04:38:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,7 +53,7 @@ typedef int LOCKMETHOD; * CreateSpinLocks() or the number of shared memory locations allocated * for lock table spin locks in the case of machines with TAS instructions. */ -#define MAX_LOCK_METHODS 3 +#define MAX_LOCK_METHODS 3 #define INVALID_TABLEID 0 @@ -70,7 +70,7 @@ typedef struct LTAG Oid relId; Oid dbId; ItemPointerData tupleId; - uint16 lockmethod; /* needed by user locks */ + uint16 lockmethod; /* needed by user locks */ } LOCKTAG; #define TAGSIZE (sizeof(LOCKTAG)) @@ -98,12 +98,12 @@ typedef struct LTAG */ typedef struct LOCKMETHODCTL { - LOCKMETHOD lockmethod; + LOCKMETHOD lockmethod; int numLockModes; int conflictTab[MAX_LOCKMODES]; int prio[MAX_LOCKMODES]; SPINLOCK masterLock; -} LOCKMETHODCTL; +} LOCKMETHODCTL; /* * lockHash -- hash table on lock Ids, @@ -115,8 +115,8 @@ typedef struct LOCKMETHODTABLE { HTAB *lockHash; HTAB *xidHash; - LOCKMETHODCTL *ctl; -} LOCKMETHODTABLE; + LOCKMETHODCTL *ctl; +} LOCKMETHODTABLE; /* ----------------------- * A transaction never conflicts with its own locks. Hence, if @@ -153,7 +153,7 @@ typedef struct XIDTAG int pid; TransactionId xid; #ifdef USE_XIDTAG_LOCKMETHOD - uint16 lockmethod; /* for debug or consistency checking */ + uint16 lockmethod; /* for debug or consistency checking */ #endif } XIDTAG; @@ -232,26 +232,27 @@ extern SPINLOCK LockMgrLock; extern void InitLocks(void); extern void LockDisable(int status); extern LOCKMETHOD LockMethodTableInit(char *tabName, MASK *conflictsP, - int *prioP, int numModes); + int *prioP, int numModes); extern LOCKMETHOD LockMethodTableRename(LOCKMETHOD lockmethod); extern bool LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag, - LOCKMODE lockmode); + LOCKMODE lockmode); extern int LockResolveConflicts(LOCKMETHOD lockmethod, LOCK *lock, - LOCKMODE lockmode, TransactionId xid, - XIDLookupEnt *xidentP); + LOCKMODE lockmode, TransactionId xid, + XIDLookupEnt *xidentP); extern bool LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, - LOCKMODE lockmode); + LOCKMODE lockmode); extern void GrantLock(LOCK *lock, LOCKMODE lockmode); extern bool LockReleaseAll(LOCKMETHOD lockmethod, SHM_QUEUE *lockQueue); extern int LockShmemSize(void); extern bool LockingDisabled(void); extern bool DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, - bool skip_check); -ArrayType* LockOwners(LOCKMETHOD lockmethod, LOCKTAG *locktag); + bool skip_check); +ArrayType *LockOwners(LOCKMETHOD lockmethod, LOCKTAG *locktag); #ifdef DEADLOCK_DEBUG extern void DumpLocks(void); extern void DumpAllLocks(void); + #endif -#endif /* LOCK_H */ +#endif /* LOCK_H */ diff --git a/src/include/storage/multilev.h b/src/include/storage/multilev.h index 7d3a3c983ad..a09a6077bd5 100644 --- a/src/include/storage/multilev.h +++ b/src/include/storage/multilev.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: multilev.h,v 1.12 1998/08/01 15:26:38 vadim Exp $ + * $Id: multilev.h,v 1.13 1998/09/01 04:38:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,18 +19,18 @@ #ifdef LowLevelLocking /* DML locks */ -#define RowShareLock 1 /* SELECT FOR UPDATE */ -#define RowExclusiveLock 2 /* INSERT, UPDATE, DELETE */ -#define ShareLock 3 -#define ShareRowExclusiveLock 4 -#define ExclusiveLock 5 +#define RowShareLock 1 /* SELECT FOR UPDATE */ +#define RowExclusiveLock 2 /* INSERT, UPDATE, DELETE */ +#define ShareLock 3 +#define ShareRowExclusiveLock 4 +#define ExclusiveLock 5 /* DDL locks */ -#define ObjShareLock 6 -#define ObjExclusiveLock 7 +#define ObjShareLock 6 +#define ObjExclusiveLock 7 /* Special locks */ -#define ExtendLock 8 +#define ExtendLock 8 #else @@ -49,7 +49,7 @@ #define EXTEND_LOCK 5 -#endif /* !LowLevelLocking */ +#endif /* !LowLevelLocking */ #define SHORT_TERM 1 #define LONG_TERM 2 @@ -64,8 +64,10 @@ typedef int PG_LOCK_LEVEL; /* multi.c */ extern LOCKMETHOD MultiTableId; + #ifdef NOT_USED extern LOCKMETHOD ShortTermTableId; + #endif /* @@ -77,4 +79,4 @@ extern bool MultiLockTuple(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockm extern bool MultiLockPage(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode); extern bool MultiReleaseReln(LockInfo lockinfo, LOCKMODE lockmode); -#endif /* MULTILEV_H */ +#endif /* MULTILEV_H */ diff --git a/src/include/storage/off.h b/src/include/storage/off.h index 3dc72d6701a..e073839fd49 100644 --- a/src/include/storage/off.h +++ b/src/include/storage/off.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: off.h,v 1.4 1997/09/08 02:39:06 momjian Exp $ + * $Id: off.h,v 1.5 1998/09/01 04:38:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,4 +53,4 @@ typedef uint16 OffsetNumber; #define OffsetNumberPrev(offsetNumber) \ ((OffsetNumber) (-1 + (offsetNumber))) -#endif /* OFF_H */ +#endif /* OFF_H */ diff --git a/src/include/storage/page.h b/src/include/storage/page.h index 17d29746c9c..3e03c7c14e0 100644 --- a/src/include/storage/page.h +++ b/src/include/storage/page.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: page.h,v 1.3 1997/09/07 05:01:30 momjian Exp $ + * $Id: page.h,v 1.4 1998/09/01 04:38:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,4 +21,4 @@ typedef Pointer Page; */ #define PageIsValid(page) PointerIsValid(page) -#endif /* PAGE_H */ +#endif /* PAGE_H */ diff --git a/src/include/storage/pagenum.h b/src/include/storage/pagenum.h index 95e2b4beb4d..bd36d07dc20 100644 --- a/src/include/storage/pagenum.h +++ b/src/include/storage/pagenum.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pagenum.h,v 1.5 1997/09/08 02:39:06 momjian Exp $ + * $Id: pagenum.h,v 1.6 1998/09/01 04:38:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,4 +28,4 @@ typedef uint32 LogicalPageNumber; ((bool)((pageNumber) != InvalidLogicalPageNumber)) -#endif /* PAGENUM_H */ +#endif /* PAGENUM_H */ diff --git a/src/include/storage/pos.h b/src/include/storage/pos.h index 46965b9fbdc..4e67fc29cf4 100644 --- a/src/include/storage/pos.h +++ b/src/include/storage/pos.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pos.h,v 1.4 1997/09/08 02:39:07 momjian Exp $ + * $Id: pos.h,v 1.5 1998/09/01 04:38:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -59,4 +59,4 @@ typedef PositionIdData *PositionId; #define PositionIdGetOffsetNumber(positionId) \ ((OffsetNumber) *(positionId)) -#endif /* POS_H */ +#endif /* POS_H */ diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 50f7b03ef63..4a62fac18ab 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: proc.h,v 1.14 1998/08/25 21:20:32 scrappy Exp $ + * $Id: proc.h,v 1.15 1998/09/01 04:38:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,11 +45,9 @@ typedef struct proc * this proc */ #ifdef LowLevelLocking - TransactionId xmin; /* minimal running XID as it was when - * we were starting our xact: vacuum - * must not remove tuples deleted by - * xid >= xmin ! - */ + TransactionId xmin; /* minimal running XID as it was when we + * were starting our xact: vacuum must not + * remove tuples deleted by xid >= xmin ! */ #endif LOCK *waitLock; /* Lock we're sleeping on */ @@ -106,11 +104,11 @@ extern bool ProcRemove(int pid); extern void ProcQueueInit(PROC_QUEUE *queue); extern int ProcSleep(PROC_QUEUE *queue, SPINLOCK spinlock, int token, - int prio, LOCK *lock, TransactionId xid); -extern int ProcLockWakeup(PROC_QUEUE *queue, LOCKMETHOD lockmethod, - LOCK *lock); + int prio, LOCK *lock, TransactionId xid); +extern int ProcLockWakeup(PROC_QUEUE *queue, LOCKMETHOD lockmethod, + LOCK *lock); extern void ProcAddLock(SHM_QUEUE *elem); extern void ProcReleaseSpins(PROC *proc); extern void ProcFreeAllSemaphores(void); -#endif /* PROC_H */ +#endif /* PROC_H */ diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h index 37eb40a2bf7..a475d21274f 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.44 1998/08/22 04:24:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.45 1998/09/01 04:38:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -83,9 +83,9 @@ static __inline__ int tas(volatile slock_t *lock) { - register slock_t _res; + register slock_t _res; - __asm__(" ldq $0, %0 \n\ +__asm__(" ldq $0, %0 \n\ bne $0, already_set \n\ ldq_l $0, %0 \n\ bne $0, already_set \n\ @@ -97,11 +97,12 @@ tas(volatile slock_t *lock) jmp $31, end \n\ stqc_fail: or $31, 1, $0 \n\ already_set: bis $0, $0, %1 \n\ - end: nop " : "=m"(*lock), "=r"(_res) : : "0"); + end: nop ": "=m"(*lock), "=r"(_res): :"0"); return (int) _res; } -#endif /* __alpha */ + +#endif /* __alpha */ @@ -111,12 +112,13 @@ tas(volatile slock_t *lock) static __inline__ int tas(volatile slock_t *lock) { - register slock_t _res = 1; + register slock_t _res = 1; - __asm__("lock; xchgb %0,%1" : "=q"(_res), "=m"(*lock) : "0"(_res) ); +__asm__("lock; xchgb %0,%1": "=q"(_res), "=m"(*lock):"0"(_res)); return (int) _res; } -#endif /* i386 */ + +#endif /* i386 */ @@ -126,14 +128,15 @@ tas(volatile slock_t *lock) static __inline__ int tas(volatile slock_t *lock) { - register slock_t _res = 1; + register slock_t _res = 1; - __asm__("ldstub [%2], %0" \ - : "=r" (_res), "=m" (*lock) \ - : "r" (lock)); + __asm__("ldstub [%2], %0" \ +: "=r"(_res), "=m"(*lock) \ +: "r"(lock)); return (int) _res; } -#endif /* sparc */ + +#endif /* sparc */ @@ -151,21 +154,22 @@ tas(volatile slock_t *lock) { register _res; - __asm__(" movl $1, r0 - bbssi $0, (%1), 1f - clrl r0 - 1: movl r0, %0 " - : "=r"(_res) /* return value, in register */ - : "r"(lock) /* argument, 'lock pointer', in register */ - : "r0"); /* inline code uses this register */ + __asm__(" movl $1, r0 \ + bbssi $0, (%1), 1 f \ + clrl r0 \ +1: movl r0, %0 " +: "=r"(_res) /* return value, in register */ +: "r"(lock) /* argument, 'lock pointer', in register */ +: "r0"); /* inline code uses this register */ return (int) _res; } -#endif /* NEED_VAX_TAS_ASM */ + +#endif /* NEED_VAX_TAS_ASM */ -#else /* __GNUC__ */ +#else /* __GNUC__ */ /*************************************************************************** * All non gcc */ @@ -181,7 +185,7 @@ tas(volatile slock_t *lock) #define S_UNLOCK(lock) msem_unlock((lock), 0) #define S_INIT_LOCK(lock) msem_init((lock), MSEM_UNLOCKED) #define S_LOCK_FREE(lock) (!(lock)->msem_state) -#endif /* __alpha */ +#endif /* __alpha */ @@ -191,21 +195,21 @@ tas(volatile slock_t *lock) #if defined(USE_UNIVEL_CC) #define TAS(lock) tas(lock) -asm int +asm int tas(slock_t *s_lock) { -% mem s_lock - pushl %ebx - movl s_lock,%ebx - movl $255,%eax + %mem s_lock + pushl % ebx + movl s_lock, %ebx + movl $255, %eax lock - xchgb %al,(%ebx) - popl %ebx + xchgb % al, (%ebx) + popl % ebx } -#endif /* USE_UNIVEL_CC */ +#endif /* USE_UNIVEL_CC */ -#endif /* NEED_I386_TAS_ASM */ +#endif /* NEED_I386_TAS_ASM */ @@ -213,19 +217,19 @@ tas(slock_t *s_lock) #define S_LOCK(lock) \ { \ - slock_t res = 1; \ - while (res) { \ - __asm__("movqd 0, r0"); \ - __asm__("sbitd r0, %0" : "=m"(*lock)); \ - __asm__("sprb us, %0" : "=r" (res)); \ - res = ((res >> 5) & 1); \ - } \ + slock_t res = 1; \ + while (res) { \ + __asm__("movqd 0, r0"); \ + __asm__("sbitd r0, %0" : "=m"(*lock)); \ + __asm__("sprb us, %0" : "=r" (res)); \ + res = ((res >> 5) & 1); \ + } \ } -#endif /* NEED_NS32K_TAS_ASM */ +#endif /* NEED_NS32K_TAS_ASM */ -#endif /* defined(__GNUC__) */ +#endif /* defined(__GNUC__) */ @@ -248,7 +252,7 @@ static const slock_t clear_lock = #define S_UNLOCK(lock) (*(lock) = clear_lock) /* struct assignment */ #define S_LOCK_FREE(lock) ( *(int *) (((long) (lock) + 15) & ~15) != 0) -#endif /* __hpux */ +#endif /* __hpux */ #if defined(__sgi) @@ -265,7 +269,7 @@ static const slock_t clear_lock = #define S_UNLOCK(lock) release_lock(lock) #define S_INIT_LOCK(lock) init_lock(lock) #define S_LOCK_FREE(lock) (stat_lock(lock) == UNLOCKED) -#endif /* __sgi */ +#endif /* __sgi */ #if defined(_AIX) @@ -276,7 +280,7 @@ static const slock_t clear_lock = * (see storage/ipc.h). */ #define TAS(lock) cs((int *) (lock), 0, 1) -#endif /* _AIX */ +#endif /* _AIX */ #if defined (nextstep) @@ -290,7 +294,7 @@ static const slock_t clear_lock = #define S_INIT_LOCK(lock) mutex_init(lock) /* For Mach, we have to delve inside the entrails of `struct mutex'. Ick! */ #define S_LOCK_FREE(alock) ((alock)->lock == 0) -#endif /* nextstep */ +#endif /* nextstep */ @@ -301,29 +305,31 @@ static const slock_t clear_lock = #if !defined(S_LOCK) extern void s_lock(volatile slock_t *lock, const char *file, const int line); + #define S_LOCK(lock) \ - if (TAS((volatile slock_t *) lock)) {\ - s_lock((volatile slock_t *) lock, __FILE__, __LINE__); \ - } else -#endif /* S_LOCK */ + if (TAS((volatile slock_t *) lock)) {\ + s_lock((volatile slock_t *) lock, __FILE__, __LINE__); \ + } else +#endif /* S_LOCK */ #if !defined(S_LOCK_FREE) #define S_LOCK_FREE(lock) (*(lock) == 0) -#endif /* S_LOCK_FREE */ +#endif /* S_LOCK_FREE */ #if !defined(S_UNLOCK) #define S_UNLOCK(lock) (*(lock) = 0) -#endif /* S_UNLOCK */ +#endif /* S_UNLOCK */ #if !defined(S_INIT_LOCK) #define S_INIT_LOCK(lock) S_UNLOCK(lock) -#endif /* S_INIT_LOCK */ +#endif /* S_INIT_LOCK */ #if !defined(TAS) -int tas(volatile slock_t *lock); /* port/.../tas.s, or s_lock.c */ -#define TAS(lock) tas((volatile slock_t *) lock) -#endif /* TAS */ +int tas(volatile slock_t *lock); /* port/.../tas.s, or + * s_lock.c */ -#endif /* HAS_TEST_AND_SET */ -#endif /* S_LOCK_H */ +#define TAS(lock) tas((volatile slock_t *) lock) +#endif /* TAS */ +#endif /* HAS_TEST_AND_SET */ +#endif /* S_LOCK_H */ diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h index 809b87cdb1a..c8524eea5e1 100644 --- a/src/include/storage/shmem.h +++ b/src/include/storage/shmem.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: shmem.h,v 1.13 1998/06/27 15:47:48 momjian Exp $ + * $Id: shmem.h,v 1.14 1998/09/01 04:38:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,13 +64,11 @@ extern void ShmemCreate(unsigned int key, unsigned int size); extern int InitShmem(unsigned int key, unsigned int size); extern long *ShmemAlloc(unsigned long size); extern int ShmemIsValid(unsigned long addr); -extern HTAB * -ShmemInitHash(char *name, long init_size, long max_size, +extern HTAB *ShmemInitHash(char *name, long init_size, long max_size, HASHCTL *infoP, int hash_flags); extern bool ShmemPIDLookup(int pid, SHMEM_OFFSET *locationPtr); extern SHMEM_OFFSET ShmemPIDDestroy(int pid); -extern long * -ShmemInitStruct(char *name, unsigned long size, +extern long *ShmemInitStruct(char *name, unsigned long size, bool *foundPtr); extern bool TransactionIdIsInProgress(TransactionId xid); @@ -79,7 +77,7 @@ typedef int TableID; /* size constants for the shmem index table */ /* max size of data structure string name */ -#define SHMEM_INDEX_KEYSIZE (50) +#define SHMEM_INDEX_KEYSIZE (50) /* data in shmem index table hash bucket */ #define SHMEM_INDEX_DATASIZE (sizeof(ShmemIndexEnt) - SHMEM_INDEX_KEYSIZE) /* maximum size of the shmem index table */ @@ -88,10 +86,10 @@ typedef int TableID; /* this is a hash bucket in the shmem index table */ typedef struct { - char key[SHMEM_INDEX_KEYSIZE]; /* string name */ + char key[SHMEM_INDEX_KEYSIZE]; /* string name */ unsigned long location; /* location in shared mem */ unsigned long size; /* numbytes allocated for the structure */ -} ShmemIndexEnt; +} ShmemIndexEnt; /* * prototypes for functions in shmqueue.c @@ -100,9 +98,8 @@ extern void SHMQueueInit(SHM_QUEUE *queue); extern void SHMQueueElemInit(SHM_QUEUE *queue); extern void SHMQueueDelete(SHM_QUEUE *queue); extern void SHMQueueInsertTL(SHM_QUEUE *queue, SHM_QUEUE *elem); -extern void -SHMQueueFirst(SHM_QUEUE *queue, Pointer *nextPtrPtr, +extern void SHMQueueFirst(SHM_QUEUE *queue, Pointer *nextPtrPtr, SHM_QUEUE *nextQueue); extern bool SHMQueueEmpty(SHM_QUEUE *queue); -#endif /* SHMEM_H */ +#endif /* SHMEM_H */ diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h index 2b9939516f9..bb825da999d 100644 --- a/src/include/storage/sinval.h +++ b/src/include/storage/sinval.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: sinval.h,v 1.8 1998/02/26 04:43:34 momjian Exp $ + * $Id: sinval.h,v 1.9 1998/09/01 04:38:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,11 +21,10 @@ extern SPINLOCK SInvalLock; extern void CreateSharedInvalidationState(IPCKey key); extern void AttachSharedInvalidationState(IPCKey key); extern void InitSharedInvalidationState(void); -extern void -RegisterSharedInvalid(int cacheId, Index hashIndex, +extern void RegisterSharedInvalid(int cacheId, Index hashIndex, ItemPointer pointer); extern void InvalidateSharedInvalid(void (*invalFunction) (), void (*resetFunction) ()); -#endif /* SINVAL_H */ +#endif /* SINVAL_H */ diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index 93e861ebeec..ff3e1ef05ad 100644 --- a/src/include/storage/sinvaladt.h +++ b/src/include/storage/sinvaladt.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: sinvaladt.h,v 1.9 1998/08/25 21:31:20 scrappy Exp $ + * $Id: sinvaladt.h,v 1.10 1998/09/01 04:38:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -125,9 +125,8 @@ extern int SISegmentInit(bool killExistingSegment, IPCKey key); extern bool SISetDataEntry(SISeg *segP, SharedInvalidData *data); extern void SISetProcStateInvalid(SISeg *segP); extern bool SIDelDataEntry(SISeg *segP); -extern void -SIReadEntryData(SISeg *segP, int backendId, +extern void SIReadEntryData(SISeg *segP, int backendId, void (*invalFunction) (), void (*resetFunction) ()); extern void SIDelExpiredDataEntries(SISeg *segP); -#endif /* SINVALADT_H */ +#endif /* SINVALADT_H */ diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h index 0f7087d6466..a2852ad846f 100644 --- a/src/include/storage/smgr.h +++ b/src/include/storage/smgr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: smgr.h,v 1.11 1998/02/26 04:43:36 momjian Exp $ + * $Id: smgr.h,v 1.12 1998/09/01 04:38:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,17 +28,13 @@ extern int smgrunlink(int16 which, Relation reln); extern int smgrextend(int16 which, Relation reln, char *buffer); extern int smgropen(int16 which, Relation reln); extern int smgrclose(int16 which, Relation reln); -extern int -smgrread(int16 which, Relation reln, BlockNumber blocknum, +extern int smgrread(int16 which, Relation reln, BlockNumber blocknum, char *buffer); -extern int -smgrwrite(int16 which, Relation reln, BlockNumber blocknum, +extern int smgrwrite(int16 which, Relation reln, BlockNumber blocknum, char *buffer); -extern int -smgrflush(int16 which, Relation reln, BlockNumber blocknum, +extern int smgrflush(int16 which, Relation reln, BlockNumber blocknum, char *buffer); -extern int -smgrblindwrt(int16 which, char *dbname, char *relname, Oid dbid, +extern int smgrblindwrt(int16 which, char *dbname, char *relname, Oid dbid, Oid relid, BlockNumber blkno, char *buffer); extern int smgrnblocks(int16 which, Relation reln); extern int smgrtruncate(int16 which, Relation reln, int nblocks); @@ -59,8 +55,7 @@ extern int mdclose(Relation reln); extern int mdread(Relation reln, BlockNumber blocknum, char *buffer); extern int mdwrite(Relation reln, BlockNumber blocknum, char *buffer); extern int mdflush(Relation reln, BlockNumber blocknum, char *buffer); -extern int -mdblindwrt(char *dbstr, char *relstr, Oid dbid, Oid relid, +extern int mdblindwrt(char *dbstr, char *relstr, Oid dbid, Oid relid, BlockNumber blkno, char *buffer); extern int mdnblocks(Relation reln); extern int mdtruncate(Relation reln, int nblocks); @@ -80,8 +75,7 @@ extern int mmclose(Relation reln); extern int mmread(Relation reln, BlockNumber blocknum, char *buffer); extern int mmwrite(Relation reln, BlockNumber blocknum, char *buffer); extern int mmflush(Relation reln, BlockNumber blocknum, char *buffer); -extern int -mmblindwrt(char *dbstr, char *relstr, Oid dbid, Oid relid, +extern int mmblindwrt(char *dbstr, char *relstr, Oid dbid, Oid relid, BlockNumber blkno, char *buffer); extern int mmnblocks(Relation reln); extern int mmcommit(void); @@ -94,4 +88,4 @@ extern int2 smgrin(char *s); extern bool smgreq(int2 a, int2 b); extern bool smgrne(int2 a, int2 b); -#endif /* SMGR_H */ +#endif /* SMGR_H */ diff --git a/src/include/storage/spin.h b/src/include/storage/spin.h index c94a74255f7..f8d81709c3c 100644 --- a/src/include/storage/spin.h +++ b/src/include/storage/spin.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: spin.h,v 1.6 1997/09/18 14:21:02 momjian Exp $ + * $Id: spin.h,v 1.7 1998/09/01 04:38:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,4 +32,4 @@ extern bool InitSpinLocks(int init, IPCKey key); extern void SpinAcquire(SPINLOCK lockid); extern void SpinRelease(SPINLOCK lockid); -#endif /* SPIN_H */ +#endif /* SPIN_H */ diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h index 5974f765ca9..9a0322e7260 100644 --- a/src/include/tcop/dest.h +++ b/src/include/tcop/dest.h @@ -26,7 +26,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dest.h,v 1.15 1998/09/01 03:28:23 momjian Exp $ + * $Id: dest.h,v 1.16 1998/09/01 04:38:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,10 +67,9 @@ extern void SendCopyBegin(void); extern void ReceiveCopyBegin(void); extern void NullCommand(CommandDest dest); extern void ReadyForQuery(CommandDest dest); -extern void -BeginCommand(char *pname, int operation, TupleDesc attinfo, +extern void BeginCommand(char *pname, int operation, TupleDesc attinfo, bool isIntoRel, bool isIntoPortal, char *tag, CommandDest dest); extern void UpdateCommandInfo(int operation, Oid lastoid, uint32 tuples); -#endif /* DEST_H */ +#endif /* DEST_H */ diff --git a/src/include/tcop/fastpath.h b/src/include/tcop/fastpath.h index 68b6e724a3e..c94a11570da 100644 --- a/src/include/tcop/fastpath.h +++ b/src/include/tcop/fastpath.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: fastpath.h,v 1.3 1997/09/08 02:39:18 momjian Exp $ + * $Id: fastpath.h,v 1.4 1998/09/01 04:38:41 momjian Exp $ * * NOTES * This information pulled out of tcop/fastpath.c and put @@ -28,4 +28,4 @@ extern int HandleFunctionRequest(void); -#endif /* FASTPATH_H */ +#endif /* FASTPATH_H */ diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h index 303487b988d..4ac96b7495f 100644 --- a/src/include/tcop/pquery.h +++ b/src/include/tcop/pquery.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pquery.h,v 1.10 1998/06/04 17:26:49 momjian Exp $ + * $Id: pquery.h,v 1.11 1998/09/01 04:38:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,12 +23,11 @@ extern QueryDesc *CreateQueryDesc(Query *parsetree, Plan *plantree, extern EState *CreateExecutorState(void); -extern void -ProcessPortal(char *portalName, Query *parseTree, +extern void ProcessPortal(char *portalName, Query *parseTree, Plan *plan, EState *state, TupleDesc attinfo, CommandDest dest); extern void -ProcessQuery(Query *parsetree, Plan *plan, CommandDest dest); + ProcessQuery(Query *parsetree, Plan *plan, CommandDest dest); -#endif /* pqueryIncluded */ +#endif /* pqueryIncluded */ diff --git a/src/include/tcop/tcopdebug.h b/src/include/tcop/tcopdebug.h index a4512f6686c..c1c631b0d64 100644 --- a/src/include/tcop/tcopdebug.h +++ b/src/include/tcop/tcopdebug.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tcopdebug.h,v 1.2 1997/09/07 05:01:53 momjian Exp $ + * $Id: tcopdebug.h,v 1.3 1998/09/01 04:38:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,4 +40,4 @@ * ---------------------------------------------------------------- */ -#endif /* TCOPDEBUG_H */ +#endif /* TCOPDEBUG_H */ diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index feed580e692..b4356030bee 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tcopprot.h,v 1.15 1998/08/24 01:38:11 momjian Exp $ + * $Id: tcopprot.h,v 1.16 1998/09/01 04:38:45 momjian Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -22,16 +22,15 @@ #include <parser/parse_node.h> #ifndef BOOTSTRAP_INCLUDE -extern List * -pg_parse_and_plan(char *query_string, Oid *typev, int nargs, +extern List *pg_parse_and_plan(char *query_string, Oid *typev, int nargs, QueryTreeList **queryListP, CommandDest dest, bool aclOverride); extern void pg_exec_query(char *query_string); extern void pg_exec_query_acl_override(char *query_string); extern void -pg_exec_query_dest(char *query_string, CommandDest dest, bool aclOverride); + pg_exec_query_dest(char *query_string, CommandDest dest, bool aclOverride); -#endif /* BOOTSTRAP_HEADER */ +#endif /* BOOTSTRAP_HEADER */ extern void handle_warn(SIGNAL_ARGS); extern void quickdie(SIGNAL_ARGS); @@ -39,8 +38,8 @@ extern void die(SIGNAL_ARGS); extern void FloatExceptionHandler(SIGNAL_ARGS); extern void CancelQuery(void); extern int PostgresMain(int argc, char *argv[], - int real_argc, char *real_argv[]); + int real_argc, char *real_argv[]); extern void ResetUsage(void); extern void ShowUsage(void); -#endif /* tcopprotIncluded */ +#endif /* tcopprotIncluded */ diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h index 99b43229ffe..bd5556c46b4 100644 --- a/src/include/tcop/utility.h +++ b/src/include/tcop/utility.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: utility.h,v 1.5 1997/09/08 21:54:45 momjian Exp $ + * $Id: utility.h,v 1.6 1998/09/01 04:38:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,4 @@ extern void ProcessUtility(Node *parsetree, CommandDest dest); -#endif /* UTILITY_H */ +#endif /* UTILITY_H */ diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index 6ebd5baf718..93c896320a1 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: acl.h,v 1.17 1998/02/26 04:43:43 momjian Exp $ + * $Id: acl.h,v 1.18 1998/09/01 04:38:48 momjian Exp $ * * NOTES * For backward-compatability purposes we have to allow there @@ -141,8 +141,7 @@ extern Acl *aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg); extern char *aclmakepriv(char *old_privlist, char new_priv); extern char *aclmakeuser(char *user_type, char *user); -extern ChangeACLStmt * -makeAclStmt(char *privs, List *rel_list, char *grantee, +extern ChangeACLStmt *makeAclStmt(char *privs, List *rel_list, char *grantee, char grant_or_revoke); /* @@ -164,11 +163,9 @@ extern char *get_groname(AclId grosysid); extern int32 pg_aclcheck(char *relname, char *usename, AclMode mode); extern int32 pg_ownercheck(char *usename, char *value, int cacheid); -extern int32 -pg_func_ownercheck(char *usename, char *funcname, +extern int32 pg_func_ownercheck(char *usename, char *funcname, int nargs, Oid *arglist); -extern int32 -pg_aggr_ownercheck(char *usename, char *aggname, +extern int32 pg_aggr_ownercheck(char *usename, char *aggname, Oid basetypeID); -#endif /* ACL_H */ +#endif /* ACL_H */ diff --git a/src/include/utils/array.h b/src/include/utils/array.h index fb7beef36a7..6052a8cfcc4 100644 --- a/src/include/utils/array.h +++ b/src/include/utils/array.h @@ -10,7 +10,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: array.h,v 1.13 1998/09/01 03:28:26 momjian Exp $ + * $Id: array.h,v 1.14 1998/09/01 04:38:50 momjian Exp $ * * NOTES * XXX the data array should be LONGALIGN'd -- notice that the array @@ -117,22 +117,17 @@ typedef struct extern char *array_in(char *string, Oid element_type, int32 typmod); extern char *array_out(ArrayType *v, Oid element_type); extern char *array_dims(ArrayType *v, bool *isNull); -extern Datum -array_ref(ArrayType *array, int n, int *indx, int reftype, +extern Datum array_ref(ArrayType *array, int n, int *indx, int reftype, int elmlen, int arraylen, bool *isNull); -extern Datum -array_clip(ArrayType *array, int n, int *upperIndx, +extern Datum array_clip(ArrayType *array, int n, int *upperIndx, int *lowerIndx, int reftype, int len, bool *isNull); -extern char * -array_set(ArrayType *array, int n, int *indx, char *dataPtr, +extern char *array_set(ArrayType *array, int n, int *indx, char *dataPtr, int reftype, int elmlen, int arraylen, bool *isNull); -extern char * -array_assgn(ArrayType *array, int n, int *upperIndx, +extern char *array_assgn(ArrayType *array, int n, int *upperIndx, int *lowerIndx, ArrayType *newArr, int reftype, int len, bool *isNull); extern int array_eq(ArrayType *array1, ArrayType *array2); -extern int -_LOtransfer(char **destfd, int size, int nitems, char **srcfd, +extern int _LOtransfer(char **destfd, int size, int nitems, char **srcfd, int isSrcLO, int isDestLO); extern char *_array_newLO(int *fd, int flag); @@ -156,15 +151,12 @@ extern int next_tuple(int n, int *curr, int *span); /* * prototypes for functions defined in chunk.c */ -extern char * -_ChunkArray(int fd, FILE *afd, int ndim, int *dim, int baseSize, +extern char *_ChunkArray(int fd, FILE *afd, int ndim, int *dim, int baseSize, int *nbytes, char *chunkfile); -extern int -_ReadChunkArray(int *st, int *endp, int bsize, int fp, +extern int _ReadChunkArray(int *st, int *endp, int bsize, int fp, char *destfp, ArrayType *array, int isDestLO, bool *isNull); -extern struct varlena * -_ReadChunkArray1El(int *st, int bsize, int fp, +extern struct varlena *_ReadChunkArray1El(int *st, int bsize, int fp, ArrayType *array, bool *isNull); -#endif /* ARRAY_H */ +#endif /* ARRAY_H */ diff --git a/src/include/utils/bit.h b/src/include/utils/bit.h index e8235b5a3a3..ef060dbb115 100644 --- a/src/include/utils/bit.h +++ b/src/include/utils/bit.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: bit.h,v 1.3 1997/09/08 02:39:29 momjian Exp $ + * $Id: bit.h,v 1.4 1998/09/01 04:38:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,4 +36,4 @@ extern void BitArrayClearBit(BitArray bitArray, BitIndex bitIndex); */ extern bool BitArrayBitIsSet(BitArray bitArray, BitIndex bitIndex); -#endif /* BIT_H */ +#endif /* BIT_H */ diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 931e17f2bd7..f10914a6b7c 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -6,15 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.50 1998/09/01 03:28:28 momjian Exp $ + * $Id: builtins.h,v 1.51 1998/09/01 04:38:52 momjian Exp $ * * NOTES * This should normally only be included by fmgr.h. * Under no circumstances should it ever be included before * including fmgr.h! * fmgr.h does not seem to include this file, so don't know where this - * comment came from. Backend code must include this stuff explicitly - * as far as I can tell... + * comment came from. Backend code must include this stuff explicitly + * as far as I can tell... * - thomas 1998-06-08 * *------------------------------------------------------------------------- @@ -149,7 +149,7 @@ extern int namestrcmp(Name name, char *str); /* XXX hack. HP-UX has a ltoa (with different arguments) already. */ #ifdef __hpux #define ltoa pg_ltoa -#endif /* hpux */ +#endif /* hpux */ extern int32 pg_atoi(char *s, int size, int c); extern void itoa(int i, char *a); extern void ltoa(int32 l, char *a); @@ -438,8 +438,8 @@ extern char *textout(text *vlena); extern text *textcat(text *arg1, text *arg2); extern bool texteq(text *arg1, text *arg2); extern bool textne(text *arg1, text *arg2); -extern int varstr_cmp(char *arg1, int len1, char *arg2, int len2); -extern int text_cmp(text *arg1, text *arg2); +extern int varstr_cmp(char *arg1, int len1, char *arg2, int len2); +extern int text_cmp(text *arg1, text *arg2); extern bool text_lt(text *arg1, text *arg2); extern bool text_le(text *arg1, text *arg2); extern bool text_gt(text *arg1, text *arg2); @@ -511,4 +511,4 @@ extern text *translate(text *string, char from, char to); /* acl.c */ -#endif /* BUILTINS_H */ +#endif /* BUILTINS_H */ diff --git a/src/include/utils/cash.h b/src/include/utils/cash.h index d9d0d0e56a9..b5e45fc8daf 100644 --- a/src/include/utils/cash.h +++ b/src/include/utils/cash.h @@ -46,4 +46,4 @@ extern Cash *cashsmaller(Cash *c1, Cash *c2); extern const char *cash_words_out(Cash *value); -#endif /* CASH_H */ +#endif /* CASH_H */ diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index e955c29f3df..159f6387b05 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: catcache.h,v 1.12 1998/09/01 03:28:29 momjian Exp $ + * $Id: catcache.h,v 1.13 1998/09/01 04:38:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,19 +63,15 @@ typedef struct catcache extern struct catcache *Caches; extern GlobalMemory CacheCxt; -extern void -CatalogCacheIdInvalidate(int cacheId, Index hashIndex, +extern void CatalogCacheIdInvalidate(int cacheId, Index hashIndex, ItemPointer pointer); extern void ResetSystemCache(void); extern void SystemCacheRelationFlushed(Oid relId); -extern CatCache * -InitSysCache(char *relname, char *indname, int id, int nkeys, +extern CatCache *InitSysCache(char *relname, char *indname, int id, int nkeys, int *key, HeapTuple (*iScanfuncP) ()); -extern HeapTuple -SearchSysCache(struct catcache * cache, Datum v1, Datum v2, +extern HeapTuple SearchSysCache(struct catcache * cache, Datum v1, Datum v2, Datum v3, Datum v4); -extern void -RelationInvalidateCatalogCacheTuple(Relation relation, +extern void RelationInvalidateCatalogCacheTuple(Relation relation, HeapTuple tuple, void (*function) ()); -#endif /* CATCACHE_H */ +#endif /* CATCACHE_H */ diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h index 4c0cefce8fc..7248af64d5f 100644 --- a/src/include/utils/datetime.h +++ b/src/include/utils/datetime.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: datetime.h,v 1.5 1997/09/08 02:39:35 momjian Exp $ + * $Id: datetime.h,v 1.6 1998/09/01 04:38:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,4 @@ typedef int32 DateADT; typedef float8 TimeADT; -#endif /* DATETIME_H */ +#endif /* DATETIME_H */ diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h index ab394e7fcd6..bd5c6eac8d7 100644 --- a/src/include/utils/datum.h +++ b/src/include/utils/datum.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: datum.h,v 1.7 1998/02/26 04:43:57 momjian Exp $ + * $Id: datum.h,v 1.8 1998/09/01 04:38:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,8 +57,7 @@ extern void datumFree(Datum value, Oid type, bool byVal, Size len); * return true if thwo datums are equal, false otherwise. * XXX : See comments in the code for restrictions! */ -extern bool -datumIsEqual(Datum value1, Datum value2, Oid type, +extern bool datumIsEqual(Datum value1, Datum value2, Oid type, bool byVal, Size len); -#endif /* DATUM_H */ +#endif /* DATUM_H */ diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h index 0e947d63932..10c229beb6a 100644 --- a/src/include/utils/dt.h +++ b/src/include/utils/dt.h @@ -8,7 +8,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dt.h,v 1.31 1998/09/01 03:28:30 momjian Exp $ + * $Id: dt.h,v 1.32 1998/09/01 04:38:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -194,7 +194,7 @@ typedef struct char *token; #else char token[TOKMAXLEN]; -#endif /* _AIX */ +#endif /* _AIX */ char type; char value; /* this may be unsigned, alas */ } datetkn; @@ -323,19 +323,15 @@ extern int date2j(int year, int month, int day); extern double time2t(const int hour, const int min, const double sec); -extern int -ParseDateTime(char *timestr, char *lowstr, +extern int ParseDateTime(char *timestr, char *lowstr, char **field, int *ftype, int maxfields, int *numfields); -extern int -DecodeDateTime(char **field, int *ftype, +extern int DecodeDateTime(char **field, int *ftype, int nf, int *dtype, struct tm * tm, double *fsec, int *tzp); -extern int -DecodeTimeOnly(char **field, int *ftype, int nf, +extern int DecodeTimeOnly(char **field, int *ftype, int nf, int *dtype, struct tm * tm, double *fsec); -extern int -DecodeDateDelta(char **field, int *ftype, +extern int DecodeDateDelta(char **field, int *ftype, int nf, int *dtype, struct tm * tm, double *fsec); extern int EncodeDateOnly(struct tm * tm, int style, char *str); @@ -343,4 +339,4 @@ extern int EncodeTimeOnly(struct tm * tm, double fsec, int style, char *str); extern int EncodeDateTime(struct tm * tm, double fsec, int *tzp, char **tzn, int style, char *str); extern int EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str); -#endif /* DT_H */ +#endif /* DT_H */ diff --git a/src/include/utils/dynahash.h b/src/include/utils/dynahash.h index 6febd293cee..5b59110ccfc 100644 --- a/src/include/utils/dynahash.h +++ b/src/include/utils/dynahash.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dynahash.h,v 1.4 1997/09/08 02:39:38 momjian Exp $ + * $Id: dynahash.h,v 1.5 1998/09/01 04:39:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,4 +15,4 @@ extern int my_log2(long num); -#endif /* DYNAHASH_H */ +#endif /* DYNAHASH_H */ diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h index 13ed4174f36..8ee1639c43f 100644 --- a/src/include/utils/dynamic_loader.h +++ b/src/include/utils/dynamic_loader.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dynamic_loader.h,v 1.8 1997/09/08 21:54:56 momjian Exp $ + * $Id: dynamic_loader.h,v 1.9 1998/09/01 04:39:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ #ifdef MIN #undef MIN #undef MAX -#endif /* MIN */ +#endif /* MIN */ /* * List of dynamically loaded files. @@ -41,4 +41,4 @@ extern func_ptr pg_dlsym(void *handle, char *funcname); extern void pg_dlclose(void *handle); extern char *pg_dlerror(void); -#endif /* DYNAMIC_LOADER_H */ +#endif /* DYNAMIC_LOADER_H */ diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 1b1cb016840..7d74644c620 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: elog.h,v 1.7 1998/01/07 21:06:50 momjian Exp $ + * $Id: elog.h,v 1.8 1998/09/01 04:39:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,4 +42,4 @@ int DebugFileOpen(void); #endif -#endif /* ELOG_H */ +#endif /* ELOG_H */ diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h index 809361c639c..365c81278ef 100644 --- a/src/include/utils/exc.h +++ b/src/include/utils/exc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: exc.h,v 1.13 1998/06/15 18:40:05 momjian Exp $ + * $Id: exc.h,v 1.14 1998/09/01 04:39:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -83,8 +83,7 @@ typedef void ExcProc (Exception *, ExcDetail, ExcData, ExcMessage); * prototypes for functions in exc.c */ extern void EnableExceptionHandling(bool on); -extern void -ExcRaise(Exception *excP, +extern void ExcRaise(Exception *excP, ExcDetail detail, ExcData data, ExcMessage message); @@ -93,8 +92,7 @@ ExcRaise(Exception *excP, /* * prototypes for functions in excabort.c */ -extern void -ExcAbort(const Exception *excP, ExcDetail detail, ExcData data, +extern void ExcAbort(const Exception *excP, ExcDetail detail, ExcData data, ExcMessage message); -#endif /* EXC_H */ +#endif /* EXC_H */ diff --git a/src/include/utils/excid.h b/src/include/utils/excid.h index 69636540746..98549c03451 100644 --- a/src/include/utils/excid.h +++ b/src/include/utils/excid.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: excid.h,v 1.4 1997/09/07 05:02:29 momjian Exp $ + * $Id: excid.h,v 1.5 1998/09/01 04:39:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,4 +26,4 @@ extern Exception InternalError; /* XXX inconsistent naming style */ extern Exception SemanticError; /* XXX inconsistent naming style */ extern Exception SystemError; /* XXX inconsistent naming style */ -#endif /* EXCID_H */ +#endif /* EXCID_H */ diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h index 504ac8e2adb..cc6abbe41ff 100644 --- a/src/include/utils/fcache.h +++ b/src/include/utils/fcache.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: fcache.h,v 1.6 1998/01/15 19:46:36 pgsql Exp $ + * $Id: fcache.h,v 1.7 1998/09/01 04:39:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -54,4 +54,4 @@ typedef struct } FunctionCache, *FunctionCachePtr; -#endif /* FCACHE_H */ +#endif /* FCACHE_H */ diff --git a/src/include/utils/fcache2.h b/src/include/utils/fcache2.h index f980dd9df8b..c7781b689ab 100644 --- a/src/include/utils/fcache2.h +++ b/src/include/utils/fcache2.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: fcache2.h,v 1.6 1998/01/24 22:50:42 momjian Exp $ + * $Id: fcache2.h,v 1.7 1998/09/01 04:39:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,4 +17,4 @@ extern void setFcache(Node *node, Oid foid, List *argList, ExprContext *econtext); -#endif /* FCACHE2_H */ +#endif /* FCACHE2_H */ diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h index 953f1811375..30376415457 100644 --- a/src/include/utils/fmgrtab.h +++ b/src/include/utils/fmgrtab.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: fmgrtab.h,v 1.7 1997/09/08 21:55:04 momjian Exp $ + * $Id: fmgrtab.h,v 1.8 1998/09/01 04:39:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,4 +26,4 @@ extern FmgrCall *fmgr_isbuiltin(Oid id); extern func_ptr fmgr_lookupByName(char *name); extern void load_file(char *filename); -#endif /* FMGRTAB_H */ +#endif /* FMGRTAB_H */ diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h index 7cd7e880969..44b0d719c7e 100644 --- a/src/include/utils/geo_decls.h +++ b/src/include/utils/geo_decls.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geo_decls.h,v 1.20 1998/05/09 22:44:38 thomas Exp $ + * $Id: geo_decls.h,v 1.21 1998/09/01 04:39:11 momjian Exp $ * * NOTE * These routines do *not* use the float types from adt/. @@ -360,11 +360,9 @@ extern double *circle_area(CIRCLE *circle); extern double circle_dt(CIRCLE *circle1, CIRCLE *circle2); /* geo_selfuncs.c */ -extern float64 -areasel(Oid opid, Oid relid, AttrNumber attno, +extern float64 areasel(Oid opid, Oid relid, AttrNumber attno, char *value, int32 flag); -extern float64 -areajoinsel(Oid opid, Oid relid, AttrNumber attno, +extern float64 areajoinsel(Oid opid, Oid relid, AttrNumber attno, char *value, int32 flag); -#endif /* GEO_DECLS_H */ +#endif /* GEO_DECLS_H */ diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h index 977a843a13f..f0a80097765 100644 --- a/src/include/utils/hsearch.h +++ b/src/include/utils/hsearch.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hsearch.h,v 1.8 1998/02/26 04:44:01 momjian Exp $ + * $Id: hsearch.h,v 1.9 1998/09/01 04:39:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -133,8 +133,7 @@ typedef enum extern HTAB *hash_create(int nelem, HASHCTL *info, int flags); extern void hash_destroy(HTAB *hashp); extern void hash_stats(char *where, HTAB *hashp); -extern long * -hash_search(HTAB *hashp, char *keyPtr, HASHACTION action, +extern long *hash_search(HTAB *hashp, char *keyPtr, HASHACTION action, bool *foundPtr); extern long *hash_seq(HTAB *hashp); @@ -144,4 +143,4 @@ extern long *hash_seq(HTAB *hashp); extern long string_hash(char *key, int keysize); extern long tag_hash(int *key, int keysize); -#endif /* HSEARCH_H */ +#endif /* HSEARCH_H */ diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h index dff02b71206..65e8300ee44 100644 --- a/src/include/utils/int8.h +++ b/src/include/utils/int8.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: int8.h,v 1.2 1998/08/23 22:25:54 momjian Exp $ + * $Id: int8.h,v 1.3 1998/09/01 04:39:13 momjian Exp $ * * NOTES * These data types are supported on all 64-bit architectures, and may - * be supported through libraries on some 32-bit machines. If your machine - * is not currently supported, then please try to make it so, then post - * patches to the postgresql.org hackers mailing list. + * be supported through libraries on some 32-bit machines. If your machine + * is not currently supported, then please try to make it so, then post + * patches to the postgresql.org hackers mailing list. * * This code was written for and originally appeared in the contrib - * directory as a user-defined type. + * directory as a user-defined type. * - thomas 1998-06-08 * *------------------------------------------------------------------------- @@ -26,15 +26,18 @@ #ifdef HAVE_LONG_INT_64 /* Plain "long int" fits, use it */ typedef long int int64; + #define INT64_FORMAT "%ld" #else #ifdef HAVE_LONG_LONG_INT_64 /* We have working support for "long long int", use that */ typedef long long int int64; + #define INT64_FORMAT "%Ld" #else /* Won't actually work, but fall back to long int so that int8.c compiles */ typedef long int int64; + #define INT64_FORMAT "%ld" #define INT64_IS_BUSTED #endif @@ -88,9 +91,10 @@ extern int32 int84(int64 * val); #if FALSE extern int64 *int28 (int16 val); extern int16 int82(int64 * val); + #endif extern float64 i8tod(int64 * val); extern int64 *dtoi8(float64 val); -#endif /* INT8_H */ +#endif /* INT8_H */ diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h index a487e88a74b..bb2591552b3 100644 --- a/src/include/utils/inval.h +++ b/src/include/utils/inval.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: inval.h,v 1.8 1998/02/23 17:44:24 scrappy Exp $ + * $Id: inval.h,v 1.9 1998/09/01 04:39:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,4 +46,4 @@ typedef InvalidationEntry LocalInvalid; #define EmptyLocalInvalid NULL -#endif /* INVAL_H */ +#endif /* INVAL_H */ diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h index 40e8d2ba510..08fb6f3c4fc 100644 --- a/src/include/utils/lselect.h +++ b/src/include/utils/lselect.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lselect.h,v 1.10 1998/02/26 04:44:06 momjian Exp $ + * $Id: lselect.h,v 1.11 1998/09/01 04:39:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,14 +39,11 @@ typedef struct } LeftistContextData; typedef LeftistContextData *LeftistContext; -extern struct leftist * -lmerge(struct leftist * pt, struct leftist * qt, +extern struct leftist *lmerge(struct leftist * pt, struct leftist * qt, LeftistContext context); -extern HeapTuple -gettuple(struct leftist ** treep, short *devnum, +extern HeapTuple gettuple(struct leftist ** treep, short *devnum, LeftistContext context); -extern void -puttuple(struct leftist ** treep, HeapTuple newtuple, short devnum, +extern void puttuple(struct leftist ** treep, HeapTuple newtuple, short devnum, LeftistContext context); extern int tuplecmp(HeapTuple ltup, HeapTuple rtup, LeftistContext context); @@ -54,6 +51,6 @@ extern int tuplecmp(HeapTuple ltup, HeapTuple rtup, LeftistContext context); extern void checktree(struct leftist * tree, LeftistContext context); extern int checktreer(struct leftist * tree, int level, LeftistContext context); -#endif /* EBUG */ +#endif /* EBUG */ -#endif /* LSELECT_H */ +#endif /* LSELECT_H */ diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index 0d8816da4e4..0fd7ad7c796 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lsyscache.h,v 1.14 1998/08/11 14:32:03 momjian Exp $ + * $Id: lsyscache.h,v 1.15 1998/09/01 04:39:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,8 +24,7 @@ extern bool get_attisset(Oid relid, char *attname); extern int32 get_atttypmod(Oid relid, AttrNumber attnum); extern RegProcedure get_opcode(Oid opid); extern char *get_opname(Oid opid); -extern bool -op_mergejoinable(Oid opid, Oid ltype, Oid rtype, +extern bool op_mergejoinable(Oid opid, Oid ltype, Oid rtype, Oid *leftOp, Oid *rightOp); extern Oid op_hashjoinable(Oid opid, Oid ltype, Oid rtype); extern Oid get_commutator(Oid opid); @@ -42,4 +41,4 @@ extern int16 get_typlen(Oid typid); extern bool get_typbyval(Oid typid); extern struct varlena *get_typdefault(Oid typid); -#endif /* LSYSCACHE_H */ +#endif /* LSYSCACHE_H */ diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h index 44427d65b64..d4cc427422c 100644 --- a/src/include/utils/mcxt.h +++ b/src/include/utils/mcxt.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: mcxt.h,v 1.10 1998/02/26 04:44:07 momjian Exp $ + * $Id: mcxt.h,v 1.11 1998/09/01 04:39:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,8 +39,7 @@ extern MemoryContext TopMemoryContext; */ extern void EnableMemoryContext(bool on); extern Pointer MemoryContextAlloc(MemoryContext context, Size size); -extern Pointer -MemoryContextRealloc(MemoryContext context, +extern Pointer MemoryContextRealloc(MemoryContext context, Pointer pointer, Size size); extern void MemoryContextFree(MemoryContext context, Pointer pointer); @@ -49,4 +48,4 @@ extern GlobalMemory CreateGlobalMemory(char *name); extern void GlobalMemoryDestroy(GlobalMemory context); -#endif /* MCXT_H */ +#endif /* MCXT_H */ diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index 71a2581676c..cfe7cdd626e 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -15,7 +15,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: memutils.h,v 1.16 1998/04/27 14:46:17 scrappy Exp $ + * $Id: memutils.h,v 1.17 1998/09/01 04:39:20 momjian Exp $ * * NOTES * some of the information in this file will be moved to @@ -51,7 +51,7 @@ s...) #define DOUBLEALIGN(LEN) _ALIGN(double, (LEN)) #define MAXALIGN(LEN) _ALIGN(double, (LEN)) -#endif /* 0 */ +#endif /* 0 */ /* * SHORTALIGN(LEN) - length (or address) aligned for shorts @@ -233,8 +233,7 @@ extern void AllocSetReset(AllocSet set); extern bool AllocSetContains(AllocSet set, AllocPointer pointer); extern AllocPointer AllocSetAlloc(AllocSet set, Size size); extern void AllocSetFree(AllocSet set, AllocPointer pointer); -extern AllocPointer -AllocSetRealloc(AllocSet set, AllocPointer pointer, +extern AllocPointer AllocSetRealloc(AllocSet set, AllocPointer pointer, Size size); extern void AllocSetDump(AllocSet set); @@ -275,4 +274,4 @@ typedef uint32 AttributeSize; /* XXX should be defined elsewhere */ #define MaxIndexAttributeNumber 7 -#endif /* MEMUTILS_H */ +#endif /* MEMUTILS_H */ diff --git a/src/include/utils/module.h b/src/include/utils/module.h index 2b528fed8ff..39d42bc0732 100644 --- a/src/include/utils/module.h +++ b/src/include/utils/module.h @@ -10,7 +10,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: module.h,v 1.3 1997/09/08 02:39:51 momjian Exp $ + * $Id: module.h,v 1.4 1998/09/01 04:39:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ */ extern bool BypassEnable(int *enableCountInOutP, bool on); -#endif /* MODULE_H */ +#endif /* MODULE_H */ diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h index 16a0221493c..7c6828e84cf 100644 --- a/src/include/utils/nabstime.h +++ b/src/include/utils/nabstime.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nabstime.h,v 1.15 1998/02/13 17:12:08 scrappy Exp $ + * $Id: nabstime.h,v 1.16 1998/09/01 04:39:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,7 +63,7 @@ typedef TimeIntervalData *TimeInterval; #define NOSTART_ABSTIME ((AbsoluteTime) INT_MIN) #else #define NOSTART_ABSTIME ((AbsoluteTime) 0x80000001) /* -2147483647 == - 2^31 */ -#endif /* _AIX */ +#endif /* _AIX */ #define INVALID_RELTIME ((RelativeTime) 0x7FFFFFFE) /* 2147483647 == 2^31 - * 1 */ @@ -120,4 +120,4 @@ extern bool AbsoluteTimeIsAfter(AbsoluteTime time1, AbsoluteTime time2); extern void abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char *tzn); -#endif /* NABSTIME_H */ +#endif /* NABSTIME_H */ diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index b6f32c4f01b..2c969df174c 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: palloc.h,v 1.5 1997/09/08 02:39:53 momjian Exp $ + * $Id: palloc.h,v 1.6 1998/09/01 04:39:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,4 +22,4 @@ extern void *repalloc(void *pointer, Size size); /* like strdup except uses palloc */ extern char *pstrdup(char *pointer); -#endif /* PALLOC_H */ +#endif /* PALLOC_H */ diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 2a99e2381d6..2c739721214 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: portal.h,v 1.9 1998/02/26 04:44:09 momjian Exp $ + * $Id: portal.h,v 1.10 1998/09/01 04:39:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,8 +68,7 @@ extern void AtEOXact_portals(void); extern void EnablePortalManager(bool on); extern Portal GetPortalByName(char *name); extern Portal BlankPortalAssignName(char *name); -extern void -PortalSetQuery(Portal portal, QueryDesc *queryDesc, +extern void PortalSetQuery(Portal portal, QueryDesc *queryDesc, TupleDesc attinfo, EState *state, void (*cleanup) (Portal portal)); extern QueryDesc *PortalGetQueryDesc(Portal portal); @@ -87,4 +86,4 @@ extern PortalHeapMemory PortalGetHeapMemory(Portal portal); #define PORTALS_PER_USER 10 -#endif /* PORTAL_H */ +#endif /* PORTAL_H */ diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h index 4ede04c753b..11d64cdb4dc 100644 --- a/src/include/utils/ps_status.h +++ b/src/include/utils/ps_status.h @@ -24,7 +24,7 @@ char *ps_status_buffer = NULL; #define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) \ { \ - int i; \ + int i; \ for (i = 0; i < (argc); i++) { \ memset((argv)[i], 0, strlen((argv)[i])); \ } \ @@ -49,7 +49,7 @@ char *ps_status_buffer = NULL; #else /* !linux */ -extern const char **ps_status; +extern const char **ps_status; #define PS_DEFINE_BUFFER \ const char **ps_status = NULL; @@ -77,11 +77,11 @@ const char **ps_status = NULL; #endif #ifdef DONT_HAVE_PS_STATUS -#define PS_DEFINE_BUFFER +#define PS_DEFINE_BUFFER #define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) #define PS_CLEAR_STATUS() #define PS_SET_STATUS(status) { if ((status)); } #define PS_STATUS "" -#endif /* !linux */ +#endif /* !linux */ -#endif /* PS_STATUS_H */ +#endif /* PS_STATUS_H */ diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h index 435da97782f..94477e0eac6 100644 --- a/src/include/utils/psort.h +++ b/src/include/utils/psort.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: psort.h,v 1.15 1998/02/23 06:28:16 vadim Exp $ + * $Id: psort.h,v 1.16 1998/09/01 04:39:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -106,4 +106,4 @@ extern void psort_restorepos(Sort *node); extern void psort_end(Sort *node); extern void psort_rescan(Sort *node); -#endif /* PSORT_H */ +#endif /* PSORT_H */ diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index 206c011ba2c..456b92305c8 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rel.h,v 1.19 1998/09/01 03:28:32 momjian Exp $ + * $Id: rel.h,v 1.20 1998/09/01 04:39:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -177,8 +177,7 @@ typedef Relation *RelationPtr; extern IndexStrategy RelationGetIndexStrategy(Relation relation); -extern void -RelationSetIndexSupport(Relation relation, IndexStrategy strategy, +extern void RelationSetIndexSupport(Relation relation, IndexStrategy strategy, RegProcedure *support); -#endif /* REL_H */ +#endif /* REL_H */ diff --git a/src/include/utils/rel2.h b/src/include/utils/rel2.h index 4440e508e44..ef6b7bc4376 100644 --- a/src/include/utils/rel2.h +++ b/src/include/utils/rel2.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rel2.h,v 1.6 1998/02/26 04:44:10 momjian Exp $ + * $Id: rel2.h,v 1.7 1998/09/01 04:39:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,8 +17,7 @@ extern IndexStrategy RelationGetIndexStrategy(Relation relation); -extern void -RelationSetIndexSupport(Relation relation, IndexStrategy strategy, +extern void RelationSetIndexSupport(Relation relation, IndexStrategy strategy, RegProcedure *support); -#endif /* TMP_REL2_H */ +#endif /* TMP_REL2_H */ diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h index 19317bedfa9..ffe3ec75250 100644 --- a/src/include/utils/relcache.h +++ b/src/include/utils/relcache.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: relcache.h,v 1.9 1998/01/24 22:50:56 momjian Exp $ + * $Id: relcache.h,v 1.10 1998/09/01 04:39:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,4 +34,4 @@ extern void RelationRegisterRelation(Relation relation); extern void RelationPurgeLocalRelation(bool xactComitted); extern void RelationInitialize(void); -#endif /* RELCACHE_H */ +#endif /* RELCACHE_H */ diff --git a/src/include/utils/sets.h b/src/include/utils/sets.h index f928b4012b5..99ca816f43b 100644 --- a/src/include/utils/sets.h +++ b/src/include/utils/sets.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: sets.h,v 1.3 1997/09/08 02:39:58 momjian Exp $ + * $Id: sets.h,v 1.4 1998/09/01 04:39:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,4 +19,4 @@ extern Oid SetDefine(char *querystr, char *typename); extern int seteval(Oid funcoid); -#endif /* SETS_H */ +#endif /* SETS_H */ diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h index add859e5eae..3bb58383832 100644 --- a/src/include/utils/syscache.h +++ b/src/include/utils/syscache.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: syscache.h,v 1.11 1998/08/19 02:04:09 momjian Exp $ + * $Id: syscache.h,v 1.12 1998/09/01 04:39:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -69,7 +69,8 @@ */ struct cachedesc { - char *name; /* this is Name so that we can initialize it */ + char *name; /* this is Name so that we can initialize + * it */ int nkeys; int key[4]; int size; /* sizeof(appropriate struct) */ @@ -80,19 +81,15 @@ struct cachedesc extern void zerocaches(void); extern void InitCatalogCache(void); -extern HeapTuple -SearchSysCacheTupleCopy(int cacheId, +extern HeapTuple SearchSysCacheTupleCopy(int cacheId, + Datum key1, Datum key2, Datum key3, Datum key4); +extern HeapTuple SearchSysCacheTuple(int cacheId, Datum key1, Datum key2, Datum key3, Datum key4); -extern HeapTuple -SearchSysCacheTuple(int cacheId, - Datum key1, Datum key2, Datum key3, Datum key4); -extern int32 -SearchSysCacheStruct(int cacheId, char *returnStruct, +extern int32 SearchSysCacheStruct(int cacheId, char *returnStruct, Datum key1, Datum key2, Datum key3, Datum key4); -extern void * -SearchSysCacheGetAttribute(int cacheId, +extern void *SearchSysCacheGetAttribute(int cacheId, AttrNumber attributeNumber, - Datum key1, Datum key2, Datum key3, Datum key4); + Datum key1, Datum key2, Datum key3, Datum key4); extern void *TypeDefaultRetrieve(Oid typId); -#endif /* SYSCACHE_H */ +#endif /* SYSCACHE_H */ diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index 8775eaf9aac..39bc9e86551 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tqual.h,v 1.13 1998/07/27 19:38:40 vadim Exp $ + * $Id: tqual.h,v 1.14 1998/09/01 04:39:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,17 +18,17 @@ typedef struct SnapshotData { - TransactionId xmin; /* XID < xmin are visible to me */ - TransactionId xmax; /* XID > xmax are invisible to me */ - TransactionId *xip; /* array of xacts in progress */ -} SnapshotData; + TransactionId xmin; /* XID < xmin are visible to me */ + TransactionId xmax; /* XID > xmax are invisible to me */ + TransactionId *xip; /* array of xacts in progress */ +} SnapshotData; -typedef SnapshotData *Snapshot; +typedef SnapshotData *Snapshot; -#define IsSnapshotNow(snapshot) ((Snapshot) snapshot == (Snapshot) 0x0) -#define IsSnapshotSelf(snapshot) ((Snapshot) snapshot == (Snapshot) 0x1) -#define SnapshotNow ((Snapshot) 0x0) -#define SnapshotSelf ((Snapshot) 0x1) +#define IsSnapshotNow(snapshot) ((Snapshot) snapshot == (Snapshot) 0x0) +#define IsSnapshotSelf(snapshot) ((Snapshot) snapshot == (Snapshot) 0x1) +#define SnapshotNow ((Snapshot) 0x0) +#define SnapshotSelf ((Snapshot) 0x1) extern TransactionId HeapSpecialTransactionId; extern CommandId HeapSpecialCommandId; @@ -53,7 +53,7 @@ extern CommandId HeapSpecialCommandId; ) \ ) -#define heapisoverride() \ +#define heapisoverride() \ ( \ (!TransactionIdIsValid(HeapSpecialTransactionId)) ? \ false \ @@ -77,4 +77,4 @@ extern bool HeapTupleSatisfiesNow(HeapTuple tuple); extern void setheapoverride(bool on); -#endif /* TQUAL_H */ +#endif /* TQUAL_H */ diff --git a/src/include/utils/trace.h b/src/include/utils/trace.h index 7884e197fd2..4d71b20ea21 100644 --- a/src/include/utils/trace.h +++ b/src/include/utils/trace.h @@ -4,7 +4,7 @@ * * Conditional trace definitions. * - * Massimo Dal Zotto <dz@cs.unitn.it> + * Massimo Dal Zotto <dz@cs.unitn.it> * *------------------------------------------------------------------------- */ @@ -20,16 +20,17 @@ #include "postgres.h" #ifdef ELOG_TIMESTAMPS -char *tprintf_timestamp(void); +char *tprintf_timestamp(void); + #define TIMESTAMP_SIZE 28 #else #define TIMESTAMP_SIZE 0 #endif -extern int tprintf(int flag, const char *fmt, ...); -extern int eprintf(const char *fmt, ...); -extern int option_flag(int flag); -extern int set_option_flag(int flag, int value); +extern int tprintf(int flag, const char *fmt,...); +extern int eprintf(const char *fmt,...); +extern int option_flag(int flag); +extern int set_option_flag(int flag, int value); extern void write_syslog(int level, char *line); extern void parse_options(char *str); extern void read_pg_options(SIGNAL_ARGS); @@ -38,8 +39,10 @@ extern void read_pg_options(SIGNAL_ARGS); * Trace options, used as index into pg_options. * Must match the constants in pg_options[]. */ -enum pg_option_enum { - TRACE_ALL, /* 0=trace some, 1=trace all, -1=trace none */ +enum pg_option_enum +{ + TRACE_ALL, /* 0=trace some, 1=trace all, -1=trace + * none */ TRACE_VERBOSE, TRACE_QUERY, TRACE_PLAN, @@ -48,7 +51,7 @@ enum pg_option_enum { TRACE_PARSERSTATS, TRACE_PLANNERSTATS, TRACE_EXECUTORSTATS, - TRACE_SHORTLOCKS, /* currently unused but needed, see lock.c */ + TRACE_SHORTLOCKS, /* currently unused but needed, see lock.c */ TRACE_LOCKS, TRACE_USERLOCKS, TRACE_SPINLOCKS, @@ -57,29 +60,31 @@ enum pg_option_enum { TRACE_PALLOC, TRACE_LOCKOIDMIN, TRACE_LOCKRELATION, - OPT_LOCKREADPRIORITY, /* lock priority, see lock.c */ - OPT_DEADLOCKTIMEOUT, /* deadlock timeout, see proc.c */ - OPT_SYSLOG, /* use syslog for error messages */ - OPT_HOSTLOOKUP, /* enable hostname lookup in ps_status */ - OPT_SHOWPORTNUMBER, /* show port number in ps_status */ - OPT_NOTIFYUNLOCK, /* enable unlock of pg_listener after notify */ - OPT_NOTIFYHACK, /* enable notify hack to remove duplicate tuples */ + OPT_LOCKREADPRIORITY, /* lock priority, see lock.c */ + OPT_DEADLOCKTIMEOUT, /* deadlock timeout, see proc.c */ + OPT_SYSLOG, /* use syslog for error messages */ + OPT_HOSTLOOKUP, /* enable hostname lookup in ps_status */ + OPT_SHOWPORTNUMBER, /* show port number in ps_status */ + OPT_NOTIFYUNLOCK, /* enable unlock of pg_listener after + * notify */ + OPT_NOTIFYHACK, /* enable notify hack to remove duplicate + * tuples */ - NUM_PG_OPTIONS /* must be the last item of enum */ + NUM_PG_OPTIONS /* must be the last item of enum */ }; -extern int pg_options[NUM_PG_OPTIONS]; +extern int pg_options[NUM_PG_OPTIONS]; #define PRINTF(args...) tprintf(TRACE_ALL, args) -#define EPRINTF(args...) eprintf(args) +#define EPRINTF(args...) eprintf(args) #define TPRINTF(flag, args...) tprintf(flag, args) -#endif /* TRACE_H */ +#endif /* TRACE_H */ /* * Local variables: - * tab-width: 4 - * c-indent-level: 4 - * c-basic-offset: 4 + * tab-width: 4 + * c-indent-level: 4 + * c-basic-offset: 4 * End: */ |