diff options
Diffstat (limited to 'src/include')
164 files changed, 1416 insertions, 1415 deletions
diff --git a/src/include/access/funcindex.h b/src/include/access/funcindex.h index 9bd92e3a77..a996bb4738 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.4 1997/09/08 02:34:03 momjian Exp $ + * $Id: funcindex.h,v 1.5 1997/09/08 21:50:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ typedef struct Oid arglist[8]; Oid procOid; NameData funcName; -} FuncIndexInfo; +} FuncIndexInfo; typedef FuncIndexInfo *FuncIndexInfoPtr; diff --git a/src/include/access/genam.h b/src/include/access/genam.h index 0bdf32bdc8..6bf54c84df 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.9 1997/09/08 02:34:04 momjian Exp $ + * $Id: genam.h,v 1.10 1997/09/08 21:50:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,30 +25,30 @@ extern Relation index_open(Oid relationId); extern Relation index_openr(char *relationName); extern void index_close(Relation relation); -extern InsertIndexResult +extern InsertIndexResult index_insert(Relation relation, - Datum * datum, char *nulls, + Datum *datum, char *nulls, ItemPointer heap_t_ctid, Relation heapRel); extern void index_delete(Relation relation, ItemPointer indexItem); -extern IndexScanDesc +extern IndexScanDesc index_beginscan(Relation relation, bool scanFromEnd, uint16 numberOfKeys, ScanKey key); extern void index_rescan(IndexScanDesc scan, bool scanFromEnd, ScanKey key); extern void index_endscan(IndexScanDesc scan); -extern RetrieveIndexResult +extern RetrieveIndexResult index_getnext(IndexScanDesc scan, ScanDirection direction); -extern RegProcedure +extern RegProcedure index_getprocid(Relation irel, AttrNumber attnum, uint16 procnum); -extern Datum +extern Datum GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc, - int attOff, AttrNumber attrNums[], FuncIndexInfo * fInfo, - bool * attNull, Buffer buffer); + int attOff, AttrNumber attrNums[], FuncIndexInfo *fInfo, + bool *attNull, Buffer buffer); /* in genam.c */ -extern IndexScanDesc +extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd, uint16 numberOfKeys, ScanKey key); extern void IndexScanMarkPosition(IndexScanDesc scan); diff --git a/src/include/access/gist.h b/src/include/access/gist.h index 5c04951aa4..d6519cd132 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -52,7 +52,7 @@ typedef struct GISTPageOpaqueData { uint32 flags; -} GISTPageOpaqueData; +} GISTPageOpaqueData; typedef GISTPageOpaqueData *GISTPageOpaque; @@ -67,7 +67,7 @@ typedef struct GISTSTACK struct GISTSTACK *gs_parent; OffsetNumber gs_child; BlockNumber gs_blk; -} GISTSTACK; +} GISTSTACK; typedef struct GISTSTATE { @@ -80,7 +80,7 @@ typedef struct GISTSTATE func_ptr equalFn; bool haskeytype; bool keytypbyval; -} GISTSTATE; +} GISTSTATE; /* @@ -94,7 +94,7 @@ typedef struct GISTScanOpaqueData struct GISTSTACK *s_markstk; uint16 s_flags; struct GISTSTATE *giststate; -} GISTScanOpaqueData; +} GISTScanOpaqueData; typedef GISTScanOpaqueData *GISTScanOpaque; @@ -134,7 +134,7 @@ typedef struct GIST_SPLITVEC OffsetNumber *spl_right; /* array of entries that go right */ int spl_nright; /* size of the array */ char *spl_rdatum; /* Union of keys in spl_right */ -} GIST_SPLITVEC; +} GIST_SPLITVEC; /* ** An entry on a GiST node. Contains the key (pred), as well as @@ -150,7 +150,7 @@ typedef struct GISTENTRY OffsetNumber offset; int bytes; bool leafkey; -} GISTENTRY; +} GISTENTRY; /* ** macro to initialize a GISTENTRY @@ -172,7 +172,7 @@ typedef struct txtrange int32 vl_len; int32 flag; char bytes[2]; -} TXTRANGE; +} TXTRANGE; typedef struct intrange { @@ -184,23 +184,23 @@ typedef struct intrange * upper is positive infinity. 0 means that both are numbers. */ int flag; -} INTRANGE; +} INTRANGE; 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, + uint16 pint, Datum *params, + FuncIndexInfo *finfo, + PredInfo *predInfo); +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 gistfreestack(GISTSTACK *s); +extern void initGISTstate(GISTSTATE *giststate, Relation index); extern void -gistdentryinit(GISTSTATE * giststate, GISTENTRY * e, char *pr, +gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, Relation r, Page pg, OffsetNumber o, int b, bool l); extern StrategyNumber RelationGetGISTStrategy(Relation, AttrNumber, RegProcedure); diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h index a5a5f78219..071238bd17 100644 --- a/src/include/access/gistscan.h +++ b/src/include/access/gistscan.h @@ -16,7 +16,7 @@ #include <storage/block.h> #include <utils/rel.h> -extern IndexScanDesc +extern IndexScanDesc gistbeginscan(Relation r, bool fromEnd, uint16 nkeys, ScanKey key); extern void gistrescan(IndexScanDesc s, bool fromEnd, ScanKey key); diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h index 42bdf847ae..1007dd3ec2 100644 --- a/src/include/access/giststrat.h +++ b/src/include/access/giststrat.h @@ -15,7 +15,7 @@ #include <access/strat.h> #include <utils/rel.h> -extern StrategyNumber +extern StrategyNumber RelationGetGISTStrategy(Relation r, AttrNumber attnum, RegProcedure proc); diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 7d45a7e5b9..43d188245d 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.10 1997/09/08 20:58:02 momjian Exp $ + * $Id: hash.h,v 1.11 1997/09/08 21:50:44 momjian Exp $ * * NOTES * modeled after Margo Seltzer's hash implementation for unix. @@ -82,7 +82,7 @@ typedef struct HashPageOpaqueData OverflowPageAddress hasho_oaddr; /* ovfl address of this ovfl pg */ BlockNumber hasho_nextblkno;/* next ovfl blkno */ BlockNumber hasho_prevblkno;/* previous ovfl (or bucket) blkno */ -} HashPageOpaqueData; +} HashPageOpaqueData; typedef HashPageOpaqueData *HashPageOpaque; @@ -98,7 +98,7 @@ typedef struct HashScanOpaqueData { Buffer hashso_curbuf; Buffer hashso_mrkbuf; -} HashScanOpaqueData; +} HashScanOpaqueData; typedef HashScanOpaqueData *HashScanOpaque; @@ -160,7 +160,7 @@ typedef struct HashMetaPageData * splitpoints */ BlockNumber hashm_mapp[NCACHED]; /* blknumbers of ovfl page maps */ RegProcedure hashm_procid; /* hash procedure id from pg_proc */ -} HashMetaPageData; +} HashMetaPageData; typedef HashMetaPageData *HashMetaPage; @@ -180,7 +180,7 @@ extern bool BuildingHash; typedef struct HashItemData { IndexTupleData hash_itup; -} HashItemData; +} HashItemData; typedef HashItemData *HashItem; @@ -251,9 +251,9 @@ typedef HashItemData *HashItem; 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, + Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo); +extern InsertIndexResult +hashinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel); extern char *hashgettuple(IndexScanDesc scan, ScanDirection dir); extern char * @@ -277,7 +277,7 @@ extern uint32 hashchar4(uint32 intkey); extern uint32 hashchar8(char *key); extern uint32 hashchar16(char *key); extern uint32 hashtext(struct varlena * key); -extern uint32 hashname(NameData * n); +extern uint32 hashname(NameData *n); /* private routines */ @@ -288,7 +288,7 @@ 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 +extern int32 _hash_initbitmap(Relation rel, HashMetaPage metap, int32 pnum, int32 nbits, int32 ndx); extern void @@ -302,7 +302,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 +extern Page _hash_chgbufaccess(Relation rel, Buffer *bufp, int from_access, int to_access); extern void _hash_pageinit(Page page, Size size); @@ -322,13 +322,13 @@ _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 +extern bool _hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir, Buffer metabuf); /* hashutil.c */ -extern ScanKey +extern ScanKey _hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap); extern void _hash_freeskey(ScanKey skey); diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index d3e2ae5bbe..c30e4405bf 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.14 1997/09/08 20:58:03 momjian Exp $ + * $Id: heapam.h,v 1.15 1997/09/08 21:50:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,7 +72,7 @@ typedef struct HeapAccessStatisticsData int local_heapgettup; int local_RelationPutHeapTuple; int local_RelationPutLongHeapTuple; -} HeapAccessStatisticsData; +} HeapAccessStatisticsData; typedef HeapAccessStatisticsData *HeapAccessStatistics; @@ -117,13 +117,13 @@ 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 +extern HeapScanDesc heap_beginscan(Relation relation, int atend, TimeQual timeQual, unsigned nkeys, ScanKey key); extern void heap_rescan(HeapScanDesc sdesc, bool scanFromEnd, ScanKey key); extern void heap_endscan(HeapScanDesc sdesc); extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw, Buffer *b); -extern HeapTuple +extern HeapTuple heap_fetch(Relation relation, TimeQual timeQual, ItemPointer tid, Buffer *b); extern Oid heap_insert(Relation relation, HeapTuple tup); @@ -139,19 +139,19 @@ extern Size ComputeDataSize(TupleDesc tupleDesc, Datum value[], char nulls[]); extern void DataFill(char *data, TupleDesc tupleDesc, Datum value[], char nulls[], char *infomask, - bits8 * bit); + bits8 *bit); extern int heap_attisnull(HeapTuple tup, int attnum); extern int heap_sysattrlen(AttrNumber attno); extern bool heap_sysattrbyval(AttrNumber attno); extern char *heap_getsysattr(HeapTuple tup, Buffer b, int attnum); extern char * fastgetattr(HeapTuple tup, int attnum, - TupleDesc att, bool * isnull); + TupleDesc att, bool *isnull); extern HeapTuple heap_copytuple(HeapTuple tuple); -extern HeapTuple +extern HeapTuple heap_formtuple(TupleDesc tupleDescriptor, Datum value[], char nulls[]); -extern HeapTuple +extern HeapTuple heap_modifytuple(HeapTuple tuple, Buffer buffer, Relation relation, Datum replValue[], char replNull[], char repl[]); HeapTuple heap_addheader(uint32 natts, int structlen, char *structure); diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 3b6b32b98f..0b6653f386 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.5 1997/09/08 02:34:12 momjian Exp $ + * $Id: htup.h,v 1.6 1997/09/08 21:50:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,7 +58,7 @@ typedef struct HeapTupleData /* bit map of domains */ /* MORE DATA FOLLOWS AT END OF STRUCT */ -} HeapTupleData; +} HeapTupleData; typedef HeapTupleData *HeapTuple; diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h index 6b1bc08dce..5e96f79505 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.6 1997/09/08 02:34:13 momjian Exp $ + * $Id: ibit.h,v 1.7 1997/09/08 21:50:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ typedef struct IndexAttributeBitMapData { char bits[(MaxIndexAttributeNumber + MaxBitsPerByte - 1) / MaxBitsPerByte]; -} IndexAttributeBitMapData; +} IndexAttributeBitMapData; typedef IndexAttributeBitMapData *IndexAttributeBitMap; diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h index 20fc9ecee3..eb9a68193f 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.6 1997/09/08 02:34:14 momjian Exp $ + * $Id: iqual.h,v 1.7 1997/09/08 21:50:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ extern int NIndexTupleProcessed; -extern bool +extern bool index_keytest(IndexTuple tuple, TupleDesc tupdesc, int scanKeySize, ScanKey key); diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h index fa1ea6396f..55363a268d 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.7 1997/09/08 02:34:15 momjian Exp $ + * $Id: istrat.h,v 1.8 1997/09/08 21:50:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,24 +47,24 @@ */ #define IndexStrategyIsValid(s) PointerIsValid(s) -extern StrategyMap +extern StrategyMap IndexStrategyGetStrategyMap(IndexStrategy indexStrategy, StrategyNumber maxStrategyNum, AttrNumber attrNum); -extern Size +extern Size AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber, StrategyNumber maxStrategyNumber); -extern StrategyNumber +extern StrategyNumber RelationGetStrategy(Relation relation, AttrNumber attributeNumber, StrategyEvaluation evaluation, RegProcedure procedure); -extern bool +extern bool RelationInvokeStrategy(Relation relation, StrategyEvaluation evaluation, AttrNumber attributeNumber, StrategyNumber strategy, Datum left, Datum right); extern void IndexSupportInitialize(IndexStrategy indexStrategy, - RegProcedure * indexSupport, Oid indexObjectId, + RegProcedure *indexSupport, Oid indexObjectId, Oid accessMethodObjectId, StrategyNumber maxStrategyNumber, StrategyNumber maxSupportNumber, AttrNumber maxAttributeNumber); diff --git a/src/include/access/itup.h b/src/include/access/itup.h index 0924982251..a1581133bf 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.7 1997/09/08 02:34:16 momjian Exp $ + * $Id: itup.h,v 1.8 1997/09/08 21:50:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,7 +37,7 @@ typedef struct IndexTupleData * IndexInfoFindDataOffset() for the reason. */ -} IndexTupleData; /* MORE DATA FOLLOWS AT END OF STRUCT */ +} IndexTupleData; /* MORE DATA FOLLOWS AT END OF STRUCT */ typedef IndexTupleData *IndexTuple; @@ -45,7 +45,7 @@ typedef IndexTupleData *IndexTuple; typedef struct InsertIndexResultData { ItemPointerData pointerData; -} InsertIndexResultData; +} InsertIndexResultData; typedef InsertIndexResultData *InsertIndexResult; @@ -54,7 +54,7 @@ typedef struct RetrieveIndexResultData { ItemPointerData index_iptr; ItemPointerData heap_iptr; -} RetrieveIndexResultData; +} RetrieveIndexResultData; typedef RetrieveIndexResultData *RetrieveIndexResult; @@ -68,7 +68,7 @@ typedef struct PredInfo { Node *pred; Node *oldPred; -} PredInfo; +} PredInfo; /* ---------------- @@ -89,16 +89,16 @@ typedef struct PredInfo /* indextuple.h */ -extern IndexTuple +extern IndexTuple index_formtuple(TupleDesc tupleDescriptor, Datum value[], char null[]); -extern Datum +extern Datum index_getattr(IndexTuple tuple, AttrNumber attNum, - TupleDesc tupDesc, bool * isNullOutP); -extern RetrieveIndexResult + TupleDesc tupDesc, bool *isNullOutP); +extern RetrieveIndexResult FormRetrieveIndexResult(ItemPointer indexItemPointer, ItemPointer heapItemPointer); -extern void CopyIndexTuple(IndexTuple source, IndexTuple * target); +extern void CopyIndexTuple(IndexTuple source, IndexTuple *target); #endif /* ITUP_H */ diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index e902bbf228..8338881961 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.17 1997/09/08 20:58:09 momjian Exp $ + * $Id: nbtree.h,v 1.18 1997/09/08 21:50:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -213,12 +213,12 @@ typedef struct BTPageState /* * prototypes for functions in nbtinsert.c */ -extern InsertIndexResult +extern InsertIndexResult _bt_doinsert(Relation rel, BTItem btitem, bool index_is_unique, Relation heapRel); /* default is to allow duplicates */ -extern bool +extern bool _bt_itemcmp(Relation rel, Size keysz, BTItem item1, BTItem item2, StrategyNumber strat); @@ -244,9 +244,9 @@ extern bool BuildingBtree; /* in nbtree.c */ 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, + Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo); +extern InsertIndexResult +btinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel); extern char *btgettuple(IndexScanDesc scan, ScanDirection dir); extern char * @@ -276,10 +276,10 @@ _bt_search(Relation rel, int keysz, ScanKey scankey, extern Buffer _bt_moveright(Relation rel, Buffer buf, int keysz, ScanKey scankey, int access); -extern bool +extern bool _bt_skeycmp(Relation rel, Size keysz, ScanKey scankey, Page page, ItemId itemid, StrategyNumber strat); -extern OffsetNumber +extern OffsetNumber _bt_binsrch(Relation rel, Buffer buf, int keysz, ScanKey scankey, int srchtype); extern RetrieveIndexResult _bt_next(IndexScanDesc scan, ScanDirection dir); @@ -289,10 +289,10 @@ extern bool _bt_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir); /* * prototypes for functions in nbtstrat.c */ -extern StrategyNumber +extern StrategyNumber _bt_getstrat(Relation rel, AttrNumber attno, RegProcedure proc); -extern bool +extern bool _bt_invokestrat(Relation rel, AttrNumber attno, StrategyNumber strat, Datum left, Datum right); @@ -303,7 +303,7 @@ extern ScanKey _bt_mkscankey(Relation rel, IndexTuple itup); extern void _bt_freeskey(ScanKey skey); extern void _bt_freestack(BTStack stack); extern void _bt_orderkeys(Relation relation, BTScanOpaque so); -extern bool _bt_checkkeys(IndexScanDesc scan, IndexTuple tuple, Size * keysok); +extern bool _bt_checkkeys(IndexScanDesc scan, IndexTuple tuple, Size *keysok); extern BTItem _bt_formitem(IndexTuple itup); /* diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index c4270c433e..8b2eb5ed0d 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.7 1997/09/08 02:34:22 momjian Exp $ + * $Id: relscan.h,v 1.8 1997/09/08 21:50:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,7 +37,7 @@ typedef struct HeapScanDescData uint16 rs_cdelta; /* current delta in chain */ uint16 rs_nkeys; /* number of attributes in keys */ ScanKey rs_key; /* key descriptors */ -} HeapScanDescData; +} HeapScanDescData; typedef HeapScanDescData *HeapScanDesc; @@ -55,7 +55,7 @@ typedef struct IndexScanDescData bool scanFromEnd; /* restart scan at end? */ uint16 numberOfKeys; /* number of key attributes */ ScanKey keyData; /* key descriptor */ -} IndexScanDescData; +} IndexScanDescData; typedef IndexScanDescData *IndexScanDesc; diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h index 57ceffd03c..a6998aff4f 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.9 1997/09/08 20:58:11 momjian Exp $ + * $Id: rtree.h,v 1.10 1997/09/08 21:50:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,7 +43,7 @@ typedef struct RTreePageOpaqueData { uint32 flags; -} RTreePageOpaqueData; +} RTreePageOpaqueData; typedef RTreePageOpaqueData *RTreePageOpaque; @@ -56,7 +56,7 @@ typedef struct RTSTACK struct RTSTACK *rts_parent; OffsetNumber rts_child; BlockNumber rts_blk; -} RTSTACK; +} RTSTACK; /* * When we're doing a scan, we need to keep track of the parent stack @@ -75,7 +75,7 @@ typedef struct RTreeScanOpaqueData uint16 s_flags; uint16 s_internalNKey; ScanKey s_internalKey; -} RTreeScanOpaqueData; +} RTreeScanOpaqueData; typedef RTreeScanOpaqueData *RTreeScanOpaque; @@ -105,7 +105,7 @@ typedef RTreeScanOpaqueData *RTreeScanOpaque; #define RTOP_SPLIT 1 /* defined in rtree.c */ -extern void freestack(RTSTACK * s); +extern void freestack(RTSTACK *s); /* rget.c */ extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir); @@ -114,13 +114,13 @@ 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 +extern IndexScanDesc rtbeginscan(Relation r, bool fromEnd, uint16 nkeys, ScanKey key); @@ -131,7 +131,7 @@ extern void rtrescan(IndexScanDesc s, bool fromEnd, ScanKey key); extern void rtbuild(Relation heap, Relation index, int natts, AttrNumber *attnum, IndexStrategy istrat, uint16 pcount, - Datum * params, FuncIndexInfo * finfo, PredInfo * predInfo); + Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo); extern void _rtdump(Relation r); /* rtscan.c */ @@ -140,7 +140,7 @@ rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); /* rtstrat.h */ -extern RegProcedure +extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum, RegProcedure proc); diff --git a/src/include/access/rtstrat.h b/src/include/access/rtstrat.h index e03cc42acb..2036ffd6ec 100644 --- a/src/include/access/rtstrat.h +++ b/src/include/access/rtstrat.h @@ -6,13 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rtstrat.h,v 1.3 1997/09/08 02:34:25 momjian Exp $ + * $Id: rtstrat.h,v 1.4 1997/09/08 21:50:59 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef RTSTRAT_H -extern RegProcedure +extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum, RegProcedure proc); diff --git a/src/include/access/skey.h b/src/include/access/skey.h index 3de53f8996..f40efc1e5b 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.5 1997/09/08 02:34:26 momjian Exp $ + * $Id: skey.h,v 1.6 1997/09/08 21:51:01 momjian Exp $ * * * Note: @@ -26,7 +26,7 @@ typedef struct ScanKeyData func_ptr sk_func; int32 sk_nargs; Datum sk_argument; /* data to compare */ -} ScanKeyData; +} ScanKeyData; typedef ScanKeyData *ScanKey; diff --git a/src/include/access/strat.h b/src/include/access/strat.h index be8436790a..0ad737b36c 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.7 1997/09/08 20:58:12 momjian Exp $ + * $Id: strat.h,v 1.8 1997/09/08 21:51:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,11 +23,12 @@ typedef uint16 StrategyNumber; typedef struct StrategyTransformMapData { StrategyNumber strategy[1]; /* VARIABLE LENGTH ARRAY */ -} StrategyTransformMapData; /* VARIABLE LENGTH +} StrategyTransformMapData; /* VARIABLE LENGTH - * - * - * STRUCTURE */ + * + * + * + * STRUCTURE */ typedef StrategyTransformMapData *StrategyTransformMap; @@ -35,7 +36,7 @@ typedef struct StrategyOperatorData { StrategyNumber strategy; bits16 flags; /* scan qualification flags h/skey.h */ -} StrategyOperatorData; +} StrategyOperatorData; typedef StrategyOperatorData *StrategyOperator; @@ -43,14 +44,14 @@ typedef struct StrategyTermData { /* conjunctive term */ uint16 degree; StrategyOperatorData operatorData[1]; /* VARIABLE LENGTH */ -} StrategyTermData; /* VARIABLE LENGTH STRUCTURE */ +} StrategyTermData; /* VARIABLE LENGTH STRUCTURE */ typedef StrategyTermData *StrategyTerm; typedef struct StrategyExpressionData { /* disjunctive normal form */ StrategyTerm term[1]; /* VARIABLE LENGTH ARRAY */ -} StrategyExpressionData; /* VARIABLE LENGTH STRUCTURE */ +} StrategyExpressionData; /* VARIABLE LENGTH STRUCTURE */ typedef StrategyExpressionData *StrategyExpression; @@ -61,7 +62,7 @@ typedef struct StrategyEvaluationData StrategyTransformMap commuteTransform; StrategyTransformMap negateCommuteTransform; StrategyExpression expression[12]; /* XXX VARIABLE LENGTH */ -} StrategyEvaluationData; /* VARIABLE LENGTH STRUCTURE */ +} StrategyEvaluationData; /* VARIABLE LENGTH STRUCTURE */ typedef StrategyEvaluationData *StrategyEvaluation; @@ -81,14 +82,14 @@ typedef StrategyEvaluationData *StrategyEvaluation; typedef struct StrategyMapData { ScanKeyData entry[1]; /* VARIABLE LENGTH ARRAY */ -} StrategyMapData; /* VARIABLE LENGTH STRUCTURE */ +} StrategyMapData; /* VARIABLE LENGTH STRUCTURE */ typedef StrategyMapData *StrategyMap; typedef struct IndexStrategyData { StrategyMapData strategyMapData[1]; /* VARIABLE LENGTH ARRAY */ -} IndexStrategyData; /* VARIABLE LENGTH STRUCTURE */ +} IndexStrategyData; /* VARIABLE LENGTH STRUCTURE */ typedef IndexStrategyData *IndexStrategy; diff --git a/src/include/access/transam.h b/src/include/access/transam.h index db95804e16..efb6e824a7 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.10 1997/09/08 20:58:12 momjian Exp $ + * $Id: transam.h,v 1.11 1997/09/08 21:51:03 momjian Exp $ * * NOTES * Transaction System Version 101 now support proper oid @@ -86,7 +86,7 @@ typedef unsigned char XidStatus;/* (2 bits) */ typedef struct LogRelationContentsData { int TransSystemVersion; -} LogRelationContentsData; +} LogRelationContentsData; typedef LogRelationContentsData *LogRelationContents; @@ -105,7 +105,7 @@ typedef LogRelationContentsData *LogRelationContents; typedef struct TimeRelationContentsData { int TransSystemVersion; -} TimeRelationContentsData; +} TimeRelationContentsData; typedef TimeRelationContentsData *TimeRelationContents; @@ -131,7 +131,7 @@ typedef struct VariableRelationContentsData TransactionId nextXidData; TransactionId lastXidData; Oid nextOid; -} VariableRelationContentsData; +} VariableRelationContentsData; typedef VariableRelationContentsData *VariableRelationContents; @@ -155,26 +155,26 @@ extern void AmiTransactionOverride(bool flag); extern void TransComputeBlockNumber(Relation relation, TransactionId transactionId, BlockNumber *blockNumberOutP); -extern XidStatus +extern XidStatus TransBlockNumberGetXidStatus(Relation relation, - BlockNumber blockNumber, TransactionId xid, bool * failP); + BlockNumber blockNumber, TransactionId xid, bool *failP); extern void TransBlockNumberSetXidStatus(Relation relation, BlockNumber blockNumber, TransactionId xid, XidStatus xstatus, - bool * failP); + bool *failP); extern AbsoluteTime TransBlockNumberGetCommitTime(Relation relation, - BlockNumber blockNumber, TransactionId xid, bool * failP); + BlockNumber blockNumber, TransactionId xid, bool *failP); extern void TransBlockNumberSetCommitTime(Relation relation, BlockNumber blockNumber, TransactionId xid, AbsoluteTime xtime, - bool * failP); + bool *failP); /* in transam/varsup.c */ extern void VariableRelationPutNextXid(TransactionId xid); -extern void GetNewTransactionId(TransactionId * xid); +extern void GetNewTransactionId(TransactionId *xid); extern void UpdateLastCommittedXid(TransactionId xid); -extern void GetNewObjectId(Oid * oid_return); +extern void GetNewObjectId(Oid *oid_return); extern void CheckMaxObjectId(Oid assigned_oid); /* ---------------- diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index fe7939119c..3b13dcde91 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.11 1997/09/08 20:58:13 momjian Exp $ + * $Id: tupdesc.h,v 1.12 1997/09/08 21:51:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,7 @@ typedef struct constrCheck char *ccname; char *ccbin; char *ccsrc; -} ConstrCheck; +} ConstrCheck; /* This structure contains constraints of a tuple */ typedef struct tupleConstr @@ -40,7 +40,7 @@ typedef struct tupleConstr uint16 num_defval; uint16 num_check; bool has_not_null; -} TupleConstr; +} TupleConstr; /* * This structure contains all information (i.e. from Classes @@ -65,7 +65,7 @@ extern TupleDesc CreateTupleDescCopyConstr(TupleDesc tupdesc); extern void FreeTupleDesc(TupleDesc tupdesc); -extern bool +extern bool TupleDescInitEntry(TupleDesc desc, AttrNumber attributeNumber, char *attributeName, @@ -73,6 +73,6 @@ TupleDescInitEntry(TupleDesc desc, int attdim, bool attisset); -extern TupleDesc BuildDescForRelation(List * schema, char *relname); +extern TupleDesc BuildDescForRelation(List *schema, char *relname); #endif /* TUPDESC_H */ diff --git a/src/include/access/valid.h b/src/include/access/valid.h index 58d1eb5642..7b047d66d6 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.6 1997/09/08 02:34:32 momjian Exp $ + * $Id: valid.h,v 1.7 1997/09/08 21:51:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,11 +22,11 @@ * ---------------- */ -extern bool +extern bool heap_keytest(HeapTuple t, TupleDesc tupdesc, int nkeys, ScanKey keys); -extern HeapTuple +extern HeapTuple heap_tuple_satisfies(ItemId itemId, Relation relation, Buffer buffer, PageHeader disk_page, TimeQual qual, int nKeys, diff --git a/src/include/access/xact.h b/src/include/access/xact.h index 69aea57ff1..67f5942536 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.8 1997/09/08 02:34:33 momjian Exp $ + * $Id: xact.h,v 1.9 1997/09/08 21:51:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ typedef struct TransactionStateData AbsoluteTime startTime; int state; int blockState; -} TransactionStateData; +} TransactionStateData; /* ---------------- * transaction states @@ -89,12 +89,12 @@ extern TransactionId xidin(char *representation); extern char *xidout(TransactionId transactionId); extern bool xideq(TransactionId xid1, TransactionId xid2); extern bool TransactionIdIsValid(TransactionId transactionId); -extern void StoreInvalidTransactionId(TransactionId * destination); +extern void StoreInvalidTransactionId(TransactionId *destination); extern void TransactionIdStore(TransactionId transactionId, - TransactionId * destination); + TransactionId *destination); extern bool TransactionIdEquals(TransactionId id1, TransactionId id2); extern bool TransactionIdIsLessThan(TransactionId id1, TransactionId id2); -extern void TransactionIdAdd(TransactionId * xid, int value); +extern void TransactionIdAdd(TransactionId *xid, int value); #endif /* XACT_H */ diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index 463709ed22..f025c4db03 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.8 1997/09/08 20:58:15 momjian Exp $ + * $Id: bootstrap.h,v 1.9 1997/09/08 21:51:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,7 +23,7 @@ typedef struct hashnode { int strnum; /* Index into string table */ struct hashnode *next; -} hashnode; +} hashnode; #define EMITPROMPT printf("> ") @@ -39,9 +39,9 @@ index_register(char *heap, int natts, AttrNumber *attnos, uint16 nparams, - Datum * params, - FuncIndexInfo * finfo, - PredInfo * predInfo); + Datum *params, + FuncIndexInfo *finfo, + PredInfo *predInfo); extern void err_out(void); extern void InsertOneTuple(Oid objectid); diff --git a/src/include/c.h b/src/include/c.h index bb5ec57db3..05c3cc5e92 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.18 1997/09/08 02:33:49 momjian Exp $ + * $Id: c.h,v 1.19 1997/09/08 21:50:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -277,7 +277,7 @@ typedef unsigned int Index; typedef struct { int indx[MAXDIM]; -} IntArray; +} IntArray; /* * Offset -- @@ -568,7 +568,7 @@ typedef char *ExcMessage; typedef struct Exception { ExcMessage message; -} Exception; +} Exception; /* * NO_ASSERT_CHECKING, if defined, turns off all the assertions. @@ -704,7 +704,7 @@ extern Exception BadState; /* in utils/error/assert.c */ extern int ExceptionalCondition(char *conditionName, - Exception * exceptionP, char *details, + Exception *exceptionP, char *details, char *fileName, int lineNumber); diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h index c16ec918dd..d96a75a0e6 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.6 1997/09/08 02:34:50 momjian Exp $ + * $Id: heap.h,v 1.7 1997/09/08 21:51:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,7 @@ extern Relation heap_creatr(char *relname, unsigned smgr, TupleDesc att); -extern Oid +extern Oid heap_create(char relname[], char *typename, int arch, diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index d85e30535e..d176a72ded 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.7 1997/09/08 02:34:52 momjian Exp $ + * $Id: index.h,v 1.8 1997/09/08 21:51:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,11 +18,11 @@ #include <access/itup.h> #include <access/funcindex.h> -extern Form_pg_am +extern Form_pg_am AccessMethodObjectIdGetAccessMethodTupleForm(Oid accessMethodObjectId); extern void - UpdateIndexPredicate(Oid indexoid, Node * oldPred, Node * predicate); + UpdateIndexPredicate(Oid indexoid, Node *oldPred, Node *predicate); extern void InitIndexStrategy(int numatts, @@ -32,15 +32,15 @@ InitIndexStrategy(int numatts, extern void index_create(char *heapRelationName, char *indexRelationName, - FuncIndexInfo * funcInfo, - List * attributeList, + FuncIndexInfo *funcInfo, + List *attributeList, Oid accessMethodObjectId, int numatts, AttrNumber attNums[], Oid classObjectId[], uint16 parameterCount, - Datum * parameter, - Node * predicate, + Datum *parameter, + Node *predicate, bool islossy, bool unique); @@ -49,20 +49,20 @@ extern void index_destroy(Oid indexId); extern void FormIndexDatum(int numberOfAttributes, AttrNumber attributeNumber[], HeapTuple heapTuple, - TupleDesc heapDescriptor, Buffer buffer, Datum * datum, + TupleDesc heapDescriptor, Buffer buffer, Datum *datum, char *nullv, FuncIndexInfoPtr fInfo); extern void UpdateStats(Oid relid, long reltuples, bool hasindex); extern void -FillDummyExprContext(ExprContext * econtext, TupleTableSlot * slot, +FillDummyExprContext(ExprContext *econtext, TupleTableSlot *slot, TupleDesc tupdesc, Buffer buffer); extern void index_build(Relation heapRelation, Relation indexRelation, int numberOfAttributes, AttrNumber attributeNumber[], - uint16 parameterCount, Datum * parameter, FuncIndexInfo * funcInfo, - PredInfo * predInfo); + uint16 parameterCount, Datum *parameter, FuncIndexInfo *funcInfo, + PredInfo *predInfo); extern bool IndexIsUnique(Oid indexId); extern bool IndexIsUniqueNoCache(Oid indexId); diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h index 664249ccbc..7897d570e9 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.6 1997/09/08 02:34:53 momjian Exp $ + * $Id: indexing.h,v 1.7 1997/09/08 21:51:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,28 +62,28 @@ extern char *IndexedCatalogNames[]; * Functions for each index to perform the necessary scan on a cache miss. */ extern void CatalogOpenIndices(int nIndices, char *names[], Relation idescs[]); -extern void CatalogCloseIndices(int nIndices, Relation * idescs); +extern void CatalogCloseIndices(int nIndices, Relation *idescs); extern void -CatalogIndexInsert(Relation * idescs, +CatalogIndexInsert(Relation *idescs, int nIndices, Relation heapRelation, HeapTuple heapTuple); extern bool CatalogHasIndex(char *catName, Oid catId); -extern HeapTuple +extern HeapTuple AttributeNameIndexScan(Relation heapRelation, Oid relid, char *attname); -extern HeapTuple +extern HeapTuple AttributeNumIndexScan(Relation heapRelation, Oid relid, AttrNumber attnum); extern HeapTuple ProcedureOidIndexScan(Relation heapRelation, Oid procId); -extern HeapTuple +extern HeapTuple ProcedureNameIndexScan(Relation heapRelation, - char *procName, int nargs, Oid * argTypes); -extern HeapTuple ProcedureSrcIndexScan(Relation heapRelation, text * procSrc); + char *procName, int nargs, Oid *argTypes); +extern HeapTuple ProcedureSrcIndexScan(Relation heapRelation, text *procSrc); extern HeapTuple TypeOidIndexScan(Relation heapRelation, Oid typeId); extern HeapTuple TypeNameIndexScan(Relation heapRelation, char *typeName); extern HeapTuple ClassNameIndexScan(Relation heapRelation, char *relName); diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h index 60b8cc4230..c95e24663f 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.10 1997/09/08 02:34:54 momjian Exp $ + * $Id: pg_aggregate.h,v 1.11 1997/09/08 21:51:27 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -141,6 +141,6 @@ AggregateCreate(char *aggName, char *agginitval2); extern char * AggNameGetInitVal(char *aggName, Oid basetype, - int xfuncno, bool * isNull); + int xfuncno, bool *isNull); #endif /* PG_AGGREGATE_H */ diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 2d08131cf2..7cfe1d027e 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.29 1997/09/08 02:35:23 momjian Exp $ + * $Id: pg_proc.h,v 1.30 1997/09/08 21:51:29 momjian Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -1103,7 +1103,7 @@ DATA(insert OID = 1319 ( currval PGUID 11 f t f 1 f 23 "25" 100 0 0 100 fo /* * prototypes for functions pg_proc.c */ -extern Oid +extern Oid ProcedureCreate(char *procedureName, bool returnsSet, char *returnTypeName, @@ -1116,7 +1116,7 @@ ProcedureCreate(char *procedureName, int32 perbyte_cpu, int32 percall_cpu, int32 outin_ratio, - List * argList, + List *argList, CommandDest dest); diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index 650c1955fd..bbddb4da8a 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.18 1997/09/08 02:35:32 momjian Exp $ + * $Id: pg_type.h,v 1.19 1997/09/08 21:51:31 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -326,9 +326,9 @@ DATA(insert OID = 1296 ( timestamp PGUID 4 19 t b t \054 0 0 timestamp_in time /* * prototypes for functions in pg_type.c */ -extern Oid TypeGet(char *typeName, bool * defined); +extern Oid TypeGet(char *typeName, bool *defined); extern Oid TypeShellMake(char *typeName); -extern Oid +extern Oid TypeCreate(char *typeName, Oid relationOid, int16 internalSize, diff --git a/src/include/commands/command.h b/src/include/commands/command.h index 57b2ff6c78..09b9b8bd57 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.6 1997/09/08 02:35:42 momjian Exp $ + * $Id: command.h,v 1.7 1997/09/08 21:51:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,6 +44,6 @@ extern void PortalCleanup(Portal portal); */ extern void PerformAddAttribute(char *relationName, char *userName, - bool inh, ColumnDef * colDef); + bool inh, ColumnDef *colDef); #endif /* COMMAND_H */ diff --git a/src/include/commands/creatinh.h b/src/include/commands/creatinh.h index 11364a4862..7d57290019 100644 --- a/src/include/commands/creatinh.h +++ b/src/include/commands/creatinh.h @@ -6,14 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: creatinh.h,v 1.3 1997/09/08 02:35:44 momjian Exp $ + * $Id: creatinh.h,v 1.4 1997/09/08 21:51:35 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef CREATINH_H #define CREATINH_H -extern void DefineRelation(CreateStmt * stmt); +extern void DefineRelation(CreateStmt *stmt); extern void RemoveRelation(char *name); extern char *MakeArchiveName(Oid relid); diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h index 88003629d1..1f6242444b 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.9 1997/09/08 02:35:47 momjian Exp $ + * $Id: defrem.h,v 1.10 1997/09/08 21:51:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,30 +23,30 @@ extern void DefineIndex(char *heapRelationName, char *indexRelationName, char *accessMethodName, - List * attributeList, - List * parameterList, + List *attributeList, + List *parameterList, bool unique, - Expr * predicate, - List * rangetable); + Expr *predicate, + List *rangetable); extern void ExtendIndex(char *indexRelationName, - Expr * predicate, - List * rangetable); + Expr *predicate, + List *rangetable); extern void RemoveIndex(char *name); /* * prototypes in define.c */ -extern void CreateFunction(ProcedureStmt * stmt, CommandDest dest); -extern void DefineOperator(char *name, List * parameters); -extern void DefineAggregate(char *name, List * parameters); -extern void DefineType(char *name, List * parameters); -extern void CreateFunction(ProcedureStmt * stmt, CommandDest dest); +extern void CreateFunction(ProcedureStmt *stmt, CommandDest dest); +extern void DefineOperator(char *name, List *parameters); +extern void DefineAggregate(char *name, List *parameters); +extern void DefineType(char *name, List *parameters); +extern void CreateFunction(ProcedureStmt *stmt, CommandDest dest); /* * prototypes in remove.c */ -extern void RemoveFunction(char *functionName, int nargs, List * argNameList); +extern void RemoveFunction(char *functionName, int nargs, List *argNameList); extern void RemoveOperator(char *operatorName, char *typeName1, char *typeName2); diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h index 42aa7fd8d9..b2880868cd 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -5,13 +5,13 @@ * * Copyright (c) 1994-5, Regents of the University of California * - * $Id: explain.h,v 1.4 1997/09/08 02:35:52 momjian Exp $ + * $Id: explain.h,v 1.5 1997/09/08 21:51:38 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef EXPLAIN_H #define EXPLAIN_H -extern void ExplainQuery(Query * query, bool verbose, CommandDest dest); +extern void ExplainQuery(Query *query, bool verbose, CommandDest dest); #endif /* EXPLAIN_H */ diff --git a/src/include/commands/purge.h b/src/include/commands/purge.h index de3f9c62a4..aa63313c9e 100644 --- a/src/include/commands/purge.h +++ b/src/include/commands/purge.h @@ -6,14 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: purge.h,v 1.3 1997/09/08 02:35:53 momjian Exp $ + * $Id: purge.h,v 1.4 1997/09/08 21:51:39 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PURGE_H #define PURGE_H -extern int32 +extern int32 RelationPurge(char *relationName, char *absoluteTimeString, char *relativeTimeString); diff --git a/src/include/commands/recipe.h b/src/include/commands/recipe.h index 5e0d5286eb..246cf4eaca 100644 --- a/src/include/commands/recipe.h +++ b/src/include/commands/recipe.h @@ -5,13 +5,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: recipe.h,v 1.3 1997/09/08 02:35:56 momjian Exp $ + * $Id: recipe.h,v 1.4 1997/09/08 21:51:42 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef RECIPE_H #define RECIPE_H -extern void beginRecipe(RecipeStmt * stmt); +extern void beginRecipe(RecipeStmt *stmt); #endif /* RECIPE_H */ diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h index 54f0ecd6c2..92dbd14a8e 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -25,7 +25,7 @@ #define SEQ_COL_FIRSTCOL SEQ_COL_NAME #define SEQ_COL_LASTCOL SEQ_COL_CALLED -extern void DefineSequence(CreateSeqStmt * stmt); +extern void DefineSequence(CreateSeqStmt *stmt); extern int4 nextval(struct varlena * seqname); extern int4 currval(struct varlena * seqname); extern void CloseSequences(void); diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h index 6ba0394fdf..55340d36d4 100644 --- a/src/include/commands/trigger.h +++ b/src/include/commands/trigger.h @@ -22,7 +22,7 @@ typedef struct TriggerData HeapTuple tg_trigtuple; HeapTuple tg_newtuple; Trigger *tg_trigger; -} TriggerData; +} TriggerData; extern TriggerData *CurrentTriggerData; @@ -58,8 +58,8 @@ extern TriggerData *CurrentTriggerData; (!TRIGGER_FIRED_BEFORE (event)) -extern void CreateTrigger(CreateTrigStmt * stmt); -extern void DropTrigger(DropTrigStmt * stmt); +extern void CreateTrigger(CreateTrigStmt *stmt); +extern void DropTrigger(DropTrigStmt *stmt); extern void RelationRemoveTriggers(Relation rel); extern HeapTuple ExecBRInsertTriggers(Relation rel, HeapTuple tuple); diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index d2a4565688..9068751d7e 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.9 1997/09/08 02:36:05 momjian Exp $ + * $Id: vacuum.h,v 1.10 1997/09/08 21:51:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,7 @@ typedef struct VAttListData { int val_dummy; struct VAttListData *val_next; -} VAttListData; +} VAttListData; typedef VAttListData *VAttList; @@ -31,7 +31,7 @@ typedef struct VPageDescrData uint16 vpd_nusd; /* Number of OffNums used by vacuum */ uint16 vpd_noff; /* Number of OffNums free or to be free */ OffsetNumber vpd_voff[1]; /* Array of its OffNums */ -} VPageDescrData; +} VPageDescrData; typedef VPageDescrData *VPageDescr; @@ -40,7 +40,7 @@ typedef struct VPageListData int vpl_nemend; /* Number of "empty" end-pages */ int vpl_npages; /* Number of pages in vpl_pgdesc */ VPageDescr *vpl_pgdesc; /* Descriptions of pages */ -} VPageListData; +} VPageListData; typedef VPageListData *VPageList; @@ -50,7 +50,7 @@ typedef struct FuncIndexInfo *finfoP; IndexTupleForm tform; int natts; -} IndDesc; +} IndDesc; typedef struct { @@ -78,13 +78,13 @@ typedef struct f_cmpgt; regproc outfunc; bool initialized; -} VacAttrStats; +} VacAttrStats; typedef struct VRelListData { Oid vrl_relid; struct VRelListData *vrl_next; -} VRelListData; +} VRelListData; typedef VRelListData *VRelList; @@ -98,12 +98,12 @@ typedef struct VRelStats bool hasindex; int va_natts; /* number of attrs being analyzed */ VacAttrStats *vacattrstats; -} VRelStats; +} VRelStats; extern bool VacuumRunning; extern void vc_abort(void); -extern void vacuum(char *vacrel, bool verbose, bool analyze, List * va_spec); +extern void vacuum(char *vacrel, bool verbose, bool analyze, List *va_spec); #define ATTNVALS_SCALE 1000000000 /* XXX so it can act as a float4 */ diff --git a/src/include/commands/view.h b/src/include/commands/view.h index f4190c1f0b..2fc1bb3b8d 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.3 1997/09/08 02:36:05 momjian Exp $ + * $Id: view.h,v 1.4 1997/09/08 21:51:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,7 +14,7 @@ #define VIEW_H extern char *MakeRetrieveViewRuleName(char *view_name); -extern void DefineView(char *view_name, Query * view_parse); +extern void DefineView(char *view_name, Query *view_parse); extern void RemoveView(char *view_name); #endif /* VIEW_H */ diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h index 3682f6319b..8dc8236e22 100644 --- a/src/include/executor/execFlatten.h +++ b/src/include/executor/execFlatten.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execFlatten.h,v 1.4 1997/09/08 02:36:08 momjian Exp $ + * $Id: execFlatten.h,v 1.5 1997/09/08 21:51:49 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef EXECFLATTEN_H #define EXECFLATTEN_H -extern Datum ExecEvalIter(Iter * iterNode, ExprContext * econtext, bool * resultIsNull, bool * iterIsDone); +extern Datum ExecEvalIter(Iter *iterNode, ExprContext *econtext, bool *resultIsNull, bool *iterIsDone); -extern void ExecEvalFjoin(TargetEntry * tlist, ExprContext * econtext, bool * isNullVect, bool * fj_isDone); +extern void ExecEvalFjoin(TargetEntry *tlist, ExprContext *econtext, bool *isNullVect, bool *fj_isDone); #endif /* EXECFLATTEN_H */ diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index f97e196f4f..b0c55737b9 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.5 1997/09/08 02:36:16 momjian Exp $ + * $Id: execdesc.h,v 1.6 1997/09/08 21:51:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,11 +30,11 @@ typedef struct QueryDesc Query *parsetree; Plan *plantree; CommandDest dest; /* the destination output of the execution */ -} QueryDesc; +} QueryDesc; /* in pquery.c */ extern QueryDesc * -CreateQueryDesc(Query * parsetree, Plan * plantree, +CreateQueryDesc(Query *parsetree, Plan *plantree, CommandDest dest); #endif /* EXECDESC_H */ diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index efa8dc3f01..219984f17b 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.12 1997/09/08 02:36:17 momjian Exp $ + * $Id: executor.h,v 1.13 1997/09/08 21:51:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,41 +29,41 @@ extern void ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex, ScanDirection dir, TimeQual timeRange, - Relation * returnRelation, Pointer * returnScanDesc); -extern void ExecCloseR(Plan * node); -extern void ExecReScan(Plan * node, ExprContext * exprCtxt, Plan * parent); -extern HeapScanDesc + 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, ScanDirection direction, int nkeys, ScanKey skeys); -extern void ExecMarkPos(Plan * node); -extern void ExecRestrPos(Plan * node); +extern void ExecMarkPos(Plan *node); +extern void ExecRestrPos(Plan *node); 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, - char *attrName, Datum * value, bool * isNull); -extern HeapTuple ExecRemoveJunk(JunkFilter * junkfilter, TupleTableSlot * slot); +extern JunkFilter *ExecInitJunkFilter(List *targetList); +extern bool +ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot, + char *attrName, Datum *value, bool *isNull); +extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot); /* * prototypes from functions in execMain.c */ -extern TupleDesc ExecutorStart(QueryDesc * queryDesc, EState * estate); -extern TupleTableSlot *ExecutorRun(QueryDesc * queryDesc, EState * estate, int feature, int count); -extern void ExecutorEnd(QueryDesc * queryDesc, EState * estate); +extern TupleDesc ExecutorStart(QueryDesc *queryDesc, EState *estate); +extern TupleTableSlot *ExecutorRun(QueryDesc *queryDesc, EState *estate, int feature, int count); +extern void ExecutorEnd(QueryDesc *queryDesc, EState *estate); extern HeapTuple ExecConstraints(char *caller, Relation rel, HeapTuple tuple); /* * prototypes from functions in execProcnode.c */ -extern bool ExecInitNode(Plan * node, EState * estate, Plan * parent); -extern TupleTableSlot *ExecProcNode(Plan * node, Plan * parent); -extern int ExecCountSlotsNode(Plan * node); -extern void ExecEndNode(Plan * node, Plan * parent); +extern bool ExecInitNode(Plan *node, EState *estate, Plan *parent); +extern TupleTableSlot *ExecProcNode(Plan *node, Plan *parent); +extern int ExecCountSlotsNode(Plan *node); +extern void ExecEndNode(Plan *node, Plan *parent); /* * prototypes from functions in execQual.c @@ -71,28 +71,28 @@ extern void ExecEndNode(Plan * node, Plan * parent); extern bool execConstByVal; extern int execConstLen; -extern Datum -ExecExtractResult(TupleTableSlot * slot, AttrNumber attnum, - bool * isNull); -extern Datum -ExecEvalParam(Param * expression, ExprContext * econtext, - bool * isNull); +extern Datum +ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum, + bool *isNull); +extern Datum +ExecEvalParam(Param *expression, ExprContext *econtext, + bool *isNull); /* stop here */ extern char * -GetAttributeByName(TupleTableSlot * slot, char *attname, - 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); -extern TupleTableSlot *ExecProject(ProjectionInfo * projInfo, bool * isDone); +GetAttributeByName(TupleTableSlot *slot, char *attname, + 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); +extern TupleTableSlot *ExecProject(ProjectionInfo *projInfo, bool *isDone); /* * prototypes from functions in execScan.c */ -extern TupleTableSlot *ExecScan(Scan * node, TupleTableSlot * (*accessMtd) ()); +extern TupleTableSlot *ExecScan(Scan *node, TupleTableSlot *(*accessMtd) ()); /* * prototypes from functions in execTuples.c @@ -102,65 +102,65 @@ extern void ExecDestroyTupleTable(TupleTable table, bool shouldFree); extern TupleTableSlot *ExecAllocTableSlot(TupleTable table); extern TupleTableSlot * ExecStoreTuple(HeapTuple tuple, - TupleTableSlot * slot, + TupleTableSlot *slot, Buffer buffer, bool shouldFree); -extern TupleTableSlot *ExecClearTuple(TupleTableSlot * slot); -extern bool ExecSetSlotPolicy(TupleTableSlot * slot, bool shouldFree); -extern TupleDesc -ExecSetSlotDescriptor(TupleTableSlot * slot, +extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot); +extern bool ExecSetSlotPolicy(TupleTableSlot *slot, bool shouldFree); +extern TupleDesc +ExecSetSlotDescriptor(TupleTableSlot *slot, TupleDesc tupdesc); -extern void ExecSetSlotDescriptorIsNew(TupleTableSlot * slot, bool isNew); -extern void ExecIncrSlotBufferRefcnt(TupleTableSlot * slot); -extern bool TupIsNull(TupleTableSlot * slot); -extern void ExecInitResultTupleSlot(EState * estate, CommonState * commonstate); +extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew); +extern void ExecIncrSlotBufferRefcnt(TupleTableSlot *slot); +extern bool TupIsNull(TupleTableSlot *slot); +extern void ExecInitResultTupleSlot(EState *estate, CommonState *commonstate); extern void -ExecInitScanTupleSlot(EState * estate, - CommonScanState * commonscanstate); -extern void ExecInitMarkedTupleSlot(EState * estate, MergeJoinState * mergestate); -extern void ExecInitOuterTupleSlot(EState * estate, HashJoinState * hashstate); +ExecInitScanTupleSlot(EState *estate, + CommonScanState *commonscanstate); +extern void ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate); +extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate); -extern TupleDesc ExecGetTupType(Plan * node); -extern TupleDesc ExecTypeFromTL(List * targetList); +extern TupleDesc ExecGetTupType(Plan *node); +extern TupleDesc ExecTypeFromTL(List *targetList); /* * prototypes from functions in execTuples.c */ extern void ResetTupleCount(void); extern void -ExecAssignNodeBaseInfo(EState * estate, CommonState * basenode, - Plan * parent); -extern void ExecAssignExprContext(EState * estate, CommonState * commonstate); +ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode, + Plan *parent); +extern void ExecAssignExprContext(EState *estate, CommonState *commonstate); extern void -ExecAssignResultType(CommonState * commonstate, +ExecAssignResultType(CommonState *commonstate, TupleDesc tupDesc); 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); +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, +ExecAssignScanType(CommonScanState *csstate, TupleDesc tupDesc); extern void -ExecAssignScanTypeFromOuterPlan(Plan * node, - CommonScanState * csstate); +ExecAssignScanTypeFromOuterPlan(Plan *node, + CommonScanState *csstate); extern AttributeTupleForm ExecGetTypeInfo(Relation relDesc); extern void ExecOpenIndices(Oid resultRelationOid, - RelationInfo * resultRelationInfo); -extern void ExecCloseIndices(RelationInfo * resultRelationInfo); + RelationInfo *resultRelationInfo); +extern void ExecCloseIndices(RelationInfo *resultRelationInfo); extern void -ExecInsertIndexTuples(TupleTableSlot * slot, ItemPointer tupleid, - EState * estate, bool is_update); +ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid, + EState *estate, bool is_update); extern void resetVarAttrLenForCreateTable(TupleDesc tupType); extern void setVarAttrLenForCreateTable(TupleDesc tupType, - List * targetList, List * rangeTable); + List *targetList, List *rangeTable); /* ---------------------------------------------------------------- diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h index 72b399663c..a1bed2a738 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.h @@ -6,19 +6,19 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: functions.h,v 1.3 1997/09/08 02:36:18 momjian Exp $ + * $Id: functions.h,v 1.4 1997/09/08 21:51:59 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef FUNCTIONS_H #define FUNCTIONS_H -extern Datum -ProjectAttribute(TupleDesc TD, TargetEntry * tlist, - HeapTuple tup, bool * isnullP); +extern Datum +ProjectAttribute(TupleDesc TD, TargetEntry *tlist, + HeapTuple tup, bool *isnullP); -extern Datum -postquel_function(Func * funcNode, char **args, - bool * isNull, bool * isDone); +extern Datum +postquel_function(Func *funcNode, char **args, + bool *isNull, bool *isDone); #endif /* FUNCTIONS_H */ diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index 6950bb25bd..e6f0766b72 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.5 1997/09/08 02:36:20 momjian Exp $ + * $Id: hashjoin.h,v 1.6 1997/09/08 21:52:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,7 +57,7 @@ typedef struct HashTableData int curbatch; int nprocess; int pcount; -} HashTableData; /* real hash table follows here */ +} HashTableData; /* real hash table follows here */ typedef HashTableData *HashJoinTable; @@ -65,7 +65,7 @@ typedef struct OverflowTupleData { RelativeAddr tuple; /* HeapTuple */ RelativeAddr next; /* struct OverflowTupleData * */ -} OverflowTupleData; /* real tuple follows here */ +} OverflowTupleData; /* real tuple follows here */ typedef OverflowTupleData *OverflowTuple; @@ -75,7 +75,7 @@ typedef struct HashBucketData RelativeAddr bottom; /* HeapTuple */ RelativeAddr firstotuple; /* OverflowTuple */ RelativeAddr lastotuple; /* OverflowTuple */ -} HashBucketData; /* real bucket follows here */ +} HashBucketData; /* real bucket follows here */ typedef HashBucketData *HashBucket; diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h index 35c7e7fb5c..c752c6ce17 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.4 1997/09/08 20:58:17 momjian Exp $ + * $Id: nodeAgg.h,v 1.5 1997/09/08 21:52:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,7 +14,7 @@ #define NODEAGG_H extern TupleTableSlot *ExecAgg(Agg *node); -extern bool ExecInitAgg(Agg *node, EState * estate, Plan * parent); +extern bool ExecInitAgg(Agg *node, EState *estate, Plan *parent); extern int ExecCountSlotsAgg(Agg *node); extern void ExecEndAgg(Agg *node); diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h index e546503910..c0aa2d1c75 100644 --- a/src/include/executor/nodeAppend.h +++ b/src/include/executor/nodeAppend.h @@ -6,14 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeAppend.h,v 1.5 1997/09/08 20:58:19 momjian Exp $ + * $Id: nodeAppend.h,v 1.6 1997/09/08 21:52:02 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEAPPEND_H #define NODEAPPEND_H -extern bool ExecInitAppend(Append *node, EState * estate, Plan * parent); +extern bool ExecInitAppend(Append *node, EState *estate, Plan *parent); extern int ExecCountSlotsAppend(Append *node); extern TupleTableSlot *ExecProcAppend(Append *node); extern void ExecEndAppend(Append *node); diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h index 26d398d8bb..294f59103b 100644 --- a/src/include/executor/nodeGroup.h +++ b/src/include/executor/nodeGroup.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeGroup.h,v 1.3 1997/09/08 02:36:23 momjian Exp $ + * $Id: nodeGroup.h,v 1.4 1997/09/08 21:52:02 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEGROUP_H #define NODEGROUP_H -extern TupleTableSlot *ExecGroup(Group * node); -extern bool ExecInitGroup(Group * node, EState * estate, Plan * parent); -extern int ExecCountSlotsGroup(Group * node); -extern void ExecEndGroup(Group * node); +extern TupleTableSlot *ExecGroup(Group *node); +extern bool ExecInitGroup(Group *node, EState *estate, Plan *parent); +extern int ExecCountSlotsGroup(Group *node); +extern void ExecEndGroup(Group *node); #endif /* NODEGROUP_H */ diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index c18403b030..2348e99d97 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -6,29 +6,29 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHash.h,v 1.4 1997/09/08 02:36:23 momjian Exp $ + * $Id: nodeHash.h,v 1.5 1997/09/08 21:52:04 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEHASH_H #define NODEHASH_H -extern TupleTableSlot *ExecHash(Hash * node); -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 TupleTableSlot *ExecHash(Hash *node); +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, - Var * hashkey, File * batches); +ExecHashTableInsert(HashJoinTable hashtable, ExprContext *econtext, + Var *hashkey, File *batches); extern void ExecHashTableDestroy(HashJoinTable hashtable); extern int -ExecHashGetBucket(HashJoinTable hashtable, ExprContext * econtext, - Var * hashkey); -extern HeapTuple -ExecScanHashBucket(HashJoinState * hjstate, HashBucket bucket, - HeapTuple curtuple, List * hjclauses, - ExprContext * econtext); +ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext, + Var *hashkey); +extern HeapTuple +ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket, + HeapTuple curtuple, List *hjclauses, + ExprContext *econtext); extern void ExecHashTableReset(HashJoinTable hashtable, int ntuples); #endif /* NODEHASH_H */ diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index e26f92c65f..96ed987718 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -6,20 +6,20 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHashjoin.h,v 1.4 1997/09/08 02:36:25 momjian Exp $ + * $Id: nodeHashjoin.h,v 1.5 1997/09/08 21:52:05 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEHASHJOIN_H #define NODEHASHJOIN_H -extern TupleTableSlot *ExecHashJoin(HashJoin * node); +extern TupleTableSlot *ExecHashJoin(HashJoin *node); -extern bool ExecInitHashJoin(HashJoin * node, EState * estate, Plan * parent); +extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent); -extern int ExecCountSlotsHashJoin(HashJoin * node); +extern int ExecCountSlotsHashJoin(HashJoin *node); -extern void ExecEndHashJoin(HashJoin * node); +extern void ExecEndHashJoin(HashJoin *node); extern char * ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer, diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h index 4137ec90f7..5b149d8aed 100644 --- a/src/include/executor/nodeIndexscan.h +++ b/src/include/executor/nodeIndexscan.h @@ -6,29 +6,29 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeIndexscan.h,v 1.4 1997/09/08 02:36:25 momjian Exp $ + * $Id: nodeIndexscan.h,v 1.5 1997/09/08 21:52:06 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEINDEXSCAN_H #define NODEINDEXSCAN_H -extern TupleTableSlot *ExecIndexScan(IndexScan * node); +extern TupleTableSlot *ExecIndexScan(IndexScan *node); -extern void ExecIndexReScan(IndexScan * node, ExprContext * exprCtxt, Plan * parent); +extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent); -extern void ExecEndIndexScan(IndexScan * node); +extern void ExecEndIndexScan(IndexScan *node); -extern void ExecIndexMarkPos(IndexScan * node); +extern void ExecIndexMarkPos(IndexScan *node); -extern void ExecIndexRestrPos(IndexScan * node); +extern void ExecIndexRestrPos(IndexScan *node); -extern void ExecUpdateIndexScanKeys(IndexScan * node, ExprContext * econtext); +extern void ExecUpdateIndexScanKeys(IndexScan *node, ExprContext *econtext); -extern bool ExecInitIndexScan(IndexScan * node, EState * estate, Plan * parent); +extern bool ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent); -extern int ExecCountSlotsIndexScan(IndexScan * node); +extern int ExecCountSlotsIndexScan(IndexScan *node); -extern void ExecIndexReScan(IndexScan * node, ExprContext * exprCtxt, Plan * parent); +extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent); #endif /* NODEINDEXSCAN_H */ diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h index cd97d6b3c9..98daa35f31 100644 --- a/src/include/executor/nodeMaterial.h +++ b/src/include/executor/nodeMaterial.h @@ -6,18 +6,18 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMaterial.h,v 1.3 1997/09/08 02:36:26 momjian Exp $ + * $Id: nodeMaterial.h,v 1.4 1997/09/08 21:52:07 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEMATERIAL_H #define NODEMATERIAL_H -extern TupleTableSlot *ExecMaterial(Material * node); -extern bool ExecInitMaterial(Material * node, EState * estate, Plan * parent); -extern int ExecCountSlotsMaterial(Material * node); -extern void ExecEndMaterial(Material * node); -extern List ExecMaterialMarkPos(Material * node); -extern void ExecMaterialRestrPos(Material * node); +extern TupleTableSlot *ExecMaterial(Material *node); +extern bool ExecInitMaterial(Material *node, EState *estate, Plan *parent); +extern int ExecCountSlotsMaterial(Material *node); +extern void ExecEndMaterial(Material *node); +extern List ExecMaterialMarkPos(Material *node); +extern void ExecMaterialRestrPos(Material *node); #endif /* NODEMATERIAL_H */ diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h index 5bd870fabd..96a74e0fc9 100644 --- a/src/include/executor/nodeMergejoin.h +++ b/src/include/executor/nodeMergejoin.h @@ -6,19 +6,19 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMergejoin.h,v 1.5 1997/09/08 02:36:29 momjian Exp $ + * $Id: nodeMergejoin.h,v 1.6 1997/09/08 21:52:09 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEMERGEJOIN_H #define NODEMERGEJOIN_H -extern TupleTableSlot *ExecMergeJoin(MergeJoin * node); +extern TupleTableSlot *ExecMergeJoin(MergeJoin *node); -extern bool ExecInitMergeJoin(MergeJoin * node, EState * estate, Plan * parent); +extern bool ExecInitMergeJoin(MergeJoin *node, EState *estate, Plan *parent); -extern int ExecCountSlotsMergeJoin(MergeJoin * node); +extern int ExecCountSlotsMergeJoin(MergeJoin *node); -extern void ExecEndMergeJoin(MergeJoin * node); +extern void ExecEndMergeJoin(MergeJoin *node); #endif /* NODEMERGEJOIN_H; */ diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h index f68539e292..2c4fa13fe1 100644 --- a/src/include/executor/nodeNestloop.h +++ b/src/include/executor/nodeNestloop.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeNestloop.h,v 1.3 1997/09/08 02:36:34 momjian Exp $ + * $Id: nodeNestloop.h,v 1.4 1997/09/08 21:52:10 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODENESTLOOP_H #define NODENESTLOOP_H -extern TupleTableSlot *ExecNestLoop(NestLoop * node, Plan * parent); -extern bool ExecInitNestLoop(NestLoop * node, EState * estate, Plan * parent); -extern int ExecCountSlotsNestLoop(NestLoop * node); -extern void ExecEndNestLoop(NestLoop * node); +extern TupleTableSlot *ExecNestLoop(NestLoop *node, Plan *parent); +extern bool ExecInitNestLoop(NestLoop *node, EState *estate, Plan *parent); +extern int ExecCountSlotsNestLoop(NestLoop *node); +extern void ExecEndNestLoop(NestLoop *node); #endif /* NODENESTLOOP_H */ diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h index 2dcb411db9..c66e069f46 100644 --- a/src/include/executor/nodeResult.h +++ b/src/include/executor/nodeResult.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeResult.h,v 1.3 1997/09/08 02:36:38 momjian Exp $ + * $Id: nodeResult.h,v 1.4 1997/09/08 21:52:11 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODERESULT_H #define NODERESULT_H -extern TupleTableSlot *ExecResult(Result * node); -extern bool ExecInitResult(Result * node, EState * estate, Plan * parent); -extern int ExecCountSlotsResult(Result * node); -extern void ExecEndResult(Result * node); +extern TupleTableSlot *ExecResult(Result *node); +extern bool ExecInitResult(Result *node, EState *estate, Plan *parent); +extern int ExecCountSlotsResult(Result *node); +extern void ExecEndResult(Result *node); #endif /* NODERESULT_H */ diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h index 22154ea1f2..d6afe03ac9 100644 --- a/src/include/executor/nodeSeqscan.h +++ b/src/include/executor/nodeSeqscan.h @@ -6,19 +6,19 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSeqscan.h,v 1.4 1997/09/08 02:36:39 momjian Exp $ + * $Id: nodeSeqscan.h,v 1.5 1997/09/08 21:52:12 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODESEQSCAN_H #define NODESEQSCAN_H -extern TupleTableSlot *ExecSeqScan(SeqScan * node); -extern bool ExecInitSeqScan(SeqScan * node, EState * estate, Plan * parent); -extern int ExecCountSlotsSeqScan(SeqScan * node); -extern void ExecEndSeqScan(SeqScan * node); -extern void ExecSeqReScan(SeqScan * node, ExprContext * exprCtxt, Plan * parent); -extern void ExecSeqMarkPos(SeqScan * node); -extern void ExecSeqRestrPos(SeqScan * node); +extern TupleTableSlot *ExecSeqScan(SeqScan *node); +extern bool ExecInitSeqScan(SeqScan *node, EState *estate, Plan *parent); +extern int ExecCountSlotsSeqScan(SeqScan *node); +extern void ExecEndSeqScan(SeqScan *node); +extern void ExecSeqReScan(SeqScan *node, ExprContext *exprCtxt, Plan *parent); +extern void ExecSeqMarkPos(SeqScan *node); +extern void ExecSeqRestrPos(SeqScan *node); #endif /* NODESEQSCAN_H */ diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h index a4c0a1b388..69b4dbe9a8 100644 --- a/src/include/executor/nodeSort.h +++ b/src/include/executor/nodeSort.h @@ -6,18 +6,18 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSort.h,v 1.3 1997/09/08 02:36:40 momjian Exp $ + * $Id: nodeSort.h,v 1.4 1997/09/08 21:52:12 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODESORT_H #define NODESORT_H -extern TupleTableSlot *ExecSort(Sort * node); -extern bool ExecInitSort(Sort * node, EState * estate, Plan * parent); -extern int ExecCountSlotsSort(Sort * node); -extern void ExecEndSort(Sort * node); -extern void ExecSortMarkPos(Sort * node); -extern void ExecSortRestrPos(Sort * node); +extern TupleTableSlot *ExecSort(Sort *node); +extern bool ExecInitSort(Sort *node, EState *estate, Plan *parent); +extern int ExecCountSlotsSort(Sort *node); +extern void ExecEndSort(Sort *node); +extern void ExecSortMarkPos(Sort *node); +extern void ExecSortRestrPos(Sort *node); #endif /* NODESORT_H */ diff --git a/src/include/executor/nodeTee.h b/src/include/executor/nodeTee.h index a0fb383142..c4a603aa3a 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.3 1997/09/08 02:36:41 momjian Exp $ + * $Id: nodeTee.h,v 1.4 1997/09/08 21:52:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -13,10 +13,10 @@ #ifndef NODETEE_H #define NODETEE_H -extern TupleTableSlot *ExecTee(Tee * node, Plan * parent); -extern bool ExecInitTee(Tee * node, EState * estate, Plan * parent); -extern void ExecTeeReScan(Tee * node, ExprContext * exprCtxt, Plan * parent); -extern void ExecEndTee(Tee * node, Plan * parent); -extern int ExecCountSlotsTee(Tee * node); +extern TupleTableSlot *ExecTee(Tee *node, Plan *parent); +extern bool ExecInitTee(Tee *node, EState *estate, Plan *parent); +extern void ExecTeeReScan(Tee *node, ExprContext *exprCtxt, Plan *parent); +extern void ExecEndTee(Tee *node, Plan *parent); +extern int ExecCountSlotsTee(Tee *node); #endif /* NODETEE_H */ diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h index 24042581f3..61ab85828c 100644 --- a/src/include/executor/nodeUnique.h +++ b/src/include/executor/nodeUnique.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeUnique.h,v 1.3 1997/09/08 02:36:42 momjian Exp $ + * $Id: nodeUnique.h,v 1.4 1997/09/08 21:52:14 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEUNIQUE_H #define NODEUNIQUE_H -extern TupleTableSlot *ExecUnique(Unique * node); -extern bool ExecInitUnique(Unique * node, EState * estate, Plan * parent); -extern int ExecCountSlotsUnique(Unique * node); -extern void ExecEndUnique(Unique * node); +extern TupleTableSlot *ExecUnique(Unique *node); +extern bool ExecInitUnique(Unique *node, EState *estate, Plan *parent); +extern int ExecCountSlotsUnique(Unique *node); +extern void ExecEndUnique(Unique *node); #endif /* NODEUNIQUE_H */ diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index 34ffef800a..d5db0aa3d8 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -40,7 +40,7 @@ typedef struct uint32 free; /* # of free vals */ TupleDesc tupdesc; /* tuple descriptor */ HeapTuple *vals; /* tuples */ -} SPITupleTable; +} SPITupleTable; #define SPI_ERROR_CONNECT -1 #define SPI_ERROR_COPY -2 @@ -73,12 +73,12 @@ extern int SPI_connect(void); extern int SPI_finish(void); extern int SPI_exec(char *src, int tcount); extern int SPI_execp(void *plan, char **values, char *Nulls, int tcount); -extern void *SPI_prepare(char *src, int nargs, Oid * argtypes); +extern void *SPI_prepare(char *src, int nargs, Oid *argtypes); extern void *SPI_saveplan(void *plan); extern int SPI_fnumber(TupleDesc tupdesc, char *fname); extern char *SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber); -extern char *SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull); +extern char *SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool *isnull); extern char *SPI_gettype(TupleDesc tupdesc, int fnumber); extern Oid SPI_gettypeid(TupleDesc tupdesc, int fnumber); extern char *SPI_getrelname(Relation rel); diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index ae82418816..1df589265e 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.6 1997/09/08 02:36:45 momjian Exp $ + * $Id: tuptable.h,v 1.7 1997/09/08 21:52:16 momjian Exp $ * * NOTES * The tuple table interface is getting pretty ugly. @@ -53,7 +53,7 @@ typedef struct TupleTableSlot TupleDesc ttc_tupleDescriptor; Buffer ttc_buffer; int ttc_whichplan; -} TupleTableSlot; +} TupleTableSlot; /* ---------------- * tuple table data structure @@ -64,7 +64,7 @@ typedef struct TupleTableData int size; /* size of the table */ int next; /* next available slot number */ TupleTableSlot *array; /* array of TupleTableSlot's */ -} TupleTableData; +} TupleTableData; typedef TupleTableData *TupleTable; diff --git a/src/include/lib/dllist.h b/src/include/lib/dllist.h index af0c580cc9..238ac3b8ea 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.6 1997/09/08 02:36:47 momjian Exp $ + * $Id: dllist.h,v 1.7 1997/09/08 21:52:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,13 +44,13 @@ typedef struct Dlelem struct Dlelem *dle_prev; /* previous element */ void *dle_val; /* value of the element */ struct Dllist *dle_list; /* what list this element is in */ -} Dlelem; +} Dlelem; typedef struct Dllist { Dlelem *dll_head; Dlelem *dll_tail; -} Dllist; +} Dllist; extern Dllist *DLNewList(void); /* initialize a new list */ extern void DLFreeList(Dllist *); /* free up a list and all the @@ -59,14 +59,13 @@ extern Dlelem *DLNewElem(void *val); extern void DLFreeElem(Dlelem *); extern Dlelem *DLGetHead(Dllist *); extern Dlelem *DLGetTail(Dllist *); -extern Dlelem *DLRemTail(Dllist * l); +extern Dlelem *DLRemTail(Dllist *l); extern Dlelem *DLGetPred(Dlelem *); /* get predecessor */ extern Dlelem *DLGetSucc(Dlelem *); /* get successor */ extern void DLRemove(Dlelem *); /* removes node from list */ -extern void DLAddHead(Dllist * list, Dlelem * node); -extern void DLAddTail(Dllist * list, Dlelem * node); -extern Dlelem *DLRemHead(Dllist * list); /* remove and return the - * head */ +extern void DLAddHead(Dllist *list, Dlelem *node); +extern void DLAddTail(Dllist *list, Dlelem *node); +extern Dlelem *DLRemHead(Dllist *list); /* remove and return the head */ #define DLE_VAL(x) (x->dle_val) diff --git a/src/include/lib/fstack.h b/src/include/lib/fstack.h index f5236c67bb..2fbf62606c 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.4 1997/09/08 02:36:51 momjian Exp $ + * $Id: fstack.h,v 1.5 1997/09/08 21:52:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,7 +51,7 @@ typedef struct FixedStackData FixedItem top; /* Top item on the stack or NULL */ Offset offset; /* Offset from struct base to item */ /* this could be signed short int! */ -} FixedStackData; +} FixedStackData; typedef FixedStackData *FixedStack; diff --git a/src/include/lib/hasht.h b/src/include/lib/hasht.h index 4c036f8e25..f2261d3ecc 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.4 1997/09/08 02:36:54 momjian Exp $ + * $Id: hasht.h,v 1.5 1997/09/08 21:52:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,6 +18,6 @@ typedef void (*HashtFunc) (); -extern void HashTableWalk(HTAB * hashtable, HashtFunc function, int arg); +extern void HashTableWalk(HTAB *hashtable, HashtFunc function, int arg); #endif /* HASHT_H */ diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h index b2b71ef27d..74a6929883 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.4 1997/09/08 02:36:55 momjian Exp $ + * $Id: stringinfo.h,v 1.5 1997/09/08 21:52:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,7 @@ typedef struct StringInfoData char *data; int maxlen; int len; -} StringInfoData; +} StringInfoData; typedef StringInfoData *StringInfo; diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h index 11f57f1b9e..6a4160e65d 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.6 1997/09/08 02:36:58 momjian Exp $ + * $Id: auth.h,v 1.7 1997/09/08 21:52:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,11 +30,11 @@ #define DEFAULT_CLIENT_AUTHSVC "kerberos" #endif /* KRB4 || KRB5 */ -extern int fe_sendauth(MsgType msgtype, Port * port, char *hostname); +extern int fe_sendauth(MsgType msgtype, Port *port, char *hostname); extern void fe_setauthsvc(char *name); extern MsgType fe_getauthsvc(); extern char *fe_getauthname(void); -extern int be_recvauth(MsgType msgtype, Port * port, char *username, StartupInfo * sp); +extern int be_recvauth(MsgType msgtype, Port *port, char *username, StartupInfo *sp); extern void be_setauthsvc(char *name); /* the value that matches any dbName value when doing diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h index 2aef0e6a40..507f2a9367 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.4 1997/09/08 02:37:00 momjian Exp $ + * $Id: be-fsstubs.h,v 1.5 1997/09/08 21:52:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,8 +21,8 @@ #define LOread(f,l) loread(f,l) #define LOwrite(f,b) lowrite(f,b) -extern Oid lo_import(text * filename); -extern int4 lo_export(Oid lobjId, text * filename); +extern Oid lo_import(text *filename); +extern int4 lo_export(Oid lobjId, text *filename); extern Oid lo_creat(int mode); diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index c54b9938ce..8a430b94c7 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.4 1997/09/07 04:58:19 momjian Exp $ + * $Id: hba.h,v 1.5 1997/09/08 21:52:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,16 +38,17 @@ enum Userauth { - Trust, Ident, Password + Trust, Ident, + Password }; extern int -hba_recvauth(const Port * port, const char database[], const char user[], +hba_recvauth(const Port *port, const char database[], const char user[], const char DataDir[]); void find_hba_entry(const char DataDir[], const struct in_addr ip_addr, const char database[], - bool * host_ok_p, enum Userauth * userauth_p, + bool *host_ok_p, enum Userauth * userauth_p, char usermap_name[], bool find_password_entries); #endif diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index bddfa1888b..534adf12b6 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.6 1997/09/08 02:37:03 momjian Exp $ + * $Id: libpq-be.h,v 1.7 1997/09/08 21:52:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,12 +31,12 @@ /* in be-dumpdata.c */ extern void be_portalinit(void); -extern void be_portalpush(PortalEntry * entry); +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, +be_typeinit(PortalEntry *entry, TupleDesc attrs, int natts); extern void be_printtup(HeapTuple tuple, TupleDesc typeinfo); @@ -44,7 +44,7 @@ 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, - PQArgBlock * args, int nargs); + PQArgBlock *args, int nargs); extern char *PQexec(char *query); extern int pqtest_PQexec(char *q); extern int pqtest_PQfn(char *q); diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index e983a91c0f..68265f809a 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.7 1997/09/08 02:37:08 momjian Exp $ + * $Id: libpq.h,v 1.8 1997/09/08 21:52:36 momjian Exp $ * * NOTES * This file contains definitions for structures and @@ -36,7 +36,7 @@ typedef struct int *ptr; /* can't use void (dec compiler barfs) */ int integer; } u; -} PQArgBlock; +} PQArgBlock; /* ---------------- * TypeBlock -- @@ -50,7 +50,7 @@ typedef struct TypeBlock char name[NAMEDATALEN]; /* name of the attribute */ int adtid; /* adtid of the type */ int adtsize; /* adtsize of the type */ -} TypeBlock; +} TypeBlock; /* ---------------- * TupleBlock -- @@ -66,7 +66,7 @@ typedef struct TupleBlock * foreach tuple */ struct TupleBlock *next; /* next tuple block */ int tuple_index; /* current tuple index */ -} TupleBlock; +} TupleBlock; /* ---------------- * GroupBuffer -- @@ -80,7 +80,7 @@ typedef struct GroupBuffer TypeBlock *types; /* types of the attributes */ TupleBlock *tuples; /* tuples in this group */ struct GroupBuffer *next; /* next group */ -} GroupBuffer; +} GroupBuffer; /* ---------------- * PortalBuffer -- @@ -93,7 +93,7 @@ typedef struct PortalBuffer int no_tuples; /* number of tuples in this portal buffer */ int no_groups; /* number of tuple groups */ GroupBuffer *groups; /* linked list of tuple groups */ -} PortalBuffer; +} PortalBuffer; /* ---------------- * PortalEntry -- @@ -111,7 +111,7 @@ typedef struct PortalEntry PortalBuffer *portal; /* tuples contained in this portal */ Pointer portalcxt; /* memory context (for backend) */ Pointer result; /* result for PQexec */ -} PortalEntry; +} PortalEntry; #define PORTALS_INITIAL_SIZE 32 #define PORTALS_GROW_BY 32 @@ -130,7 +130,7 @@ typedef struct PQNotifyList int be_pid; /* process id of backend */ int valid; /* has this already been handled by user. */ /* SLNode Node; */ -} PQNotifyList; +} PQNotifyList; /* * Exceptions. @@ -170,37 +170,37 @@ extern void PQuntrace(void); extern int PQnportals(int rule_p); extern void PQpnames(char **pnames, int rule_p); extern PortalBuffer *PQparray(char *pname); -extern int PQrulep(PortalBuffer * portal); -extern int PQntuples(PortalBuffer * portal); -extern int PQninstances(PortalBuffer * portal); -extern int PQngroups(PortalBuffer * portal); -extern int PQntuplesGroup(PortalBuffer * portal, int group_index); -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 PQrulep(PortalBuffer *portal); +extern int PQntuples(PortalBuffer *portal); +extern int PQninstances(PortalBuffer *portal); +extern int PQngroups(PortalBuffer *portal); +extern int PQntuplesGroup(PortalBuffer *portal, int group_index); +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, +PQftypeGroup(PortalBuffer *portal, int group_index, int field_number); extern int -PQfsizeGroup(PortalBuffer * portal, int group_index, +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); -extern int PQnfields(PortalBuffer * portal, int tuple_index); -extern int PQfnumber(PortalBuffer * portal, int tuple_index, char *field_name); -extern char *PQfname(PortalBuffer * portal, int tuple_index, int field_number); -extern int PQftype(PortalBuffer * portal, int tuple_index, int field_number); -extern int PQfsize(PortalBuffer * portal, int tuple_index, int field_number); -extern int PQsametype(PortalBuffer * portal, int tuple_index1, int tuple_index2); -extern char *PQgetvalue(PortalBuffer * portal, int tuple_index, int field_number); -extern char *PQgetAttr(PortalBuffer * portal, int tuple_index, int field_number); -extern int PQgetlength(PortalBuffer * portal, int tuple_index, int field_number); +extern GroupBuffer *PQgroup(PortalBuffer *portal, int tuple_index); +extern int PQgetgroup(PortalBuffer *portal, int tuple_index); +extern int PQnfields(PortalBuffer *portal, int tuple_index); +extern int PQfnumber(PortalBuffer *portal, int tuple_index, char *field_name); +extern char *PQfname(PortalBuffer *portal, int tuple_index, int field_number); +extern int PQftype(PortalBuffer *portal, int tuple_index, int field_number); +extern int PQfsize(PortalBuffer *portal, int tuple_index, int field_number); +extern int PQsametype(PortalBuffer *portal, int tuple_index1, int tuple_index2); +extern char *PQgetvalue(PortalBuffer *portal, int tuple_index, int field_number); +extern char *PQgetAttr(PortalBuffer *portal, int tuple_index, int field_number); +extern int PQgetlength(PortalBuffer *portal, int tuple_index, int field_number); extern void PQclear(char *pname); extern void PQcleanNotify(void); extern void PQnotifies_init(void); extern PQNotifyList *PQnotifies(void); -extern void PQremoveNotify(PQNotifyList * nPtr); +extern void PQremoveNotify(PQNotifyList *nPtr); extern void PQappendNotify(char *relname, int pid); /* @@ -209,7 +209,7 @@ extern void PQappendNotify(char *relname, int pid); extern caddr_t pbuf_alloc(size_t size); extern void pbuf_free(caddr_t pointer); extern PortalBuffer *pbuf_addPortal(void); -extern GroupBuffer *pbuf_addGroup(PortalBuffer * portal); +extern GroupBuffer *pbuf_addGroup(PortalBuffer *portal); extern TypeBlock *pbuf_addTypes(int n); extern TupleBlock *pbuf_addTuples(void); extern char **pbuf_addTuple(int n); @@ -217,18 +217,18 @@ extern int *pbuf_addTupleValueLengths(int n); extern char *pbuf_addValues(int n); extern PortalEntry *pbuf_addEntry(void); extern void pbuf_freeEntry(int i); -extern void pbuf_freeTypes(TypeBlock * types); -extern void pbuf_freeTuples(TupleBlock * tuples, int no_tuples, int no_fields); -extern void pbuf_freeGroup(GroupBuffer * group); -extern void pbuf_freePortal(PortalBuffer * portal); +extern void pbuf_freeTypes(TypeBlock *types); +extern void pbuf_freeTuples(TupleBlock *tuples, int no_tuples, int no_fields); +extern void pbuf_freeGroup(GroupBuffer *group); +extern void pbuf_freePortal(PortalBuffer *portal); extern int pbuf_getIndex(char *pname); -extern void pbuf_setportalinfo(PortalEntry * entry, char *pname); +extern void pbuf_setportalinfo(PortalEntry *entry, char *pname); extern PortalEntry *pbuf_setup(char *pname); extern void pbuf_close(char *pname); -extern GroupBuffer *pbuf_findGroup(PortalBuffer * portal, int group_index); -extern int pbuf_findFnumber(GroupBuffer * group, char *field_name); -extern void pbuf_checkFnumber(GroupBuffer * group, int field_number); -extern char *pbuf_findFname(GroupBuffer * group, int field_number); +extern GroupBuffer *pbuf_findGroup(PortalBuffer *portal, int group_index); +extern int pbuf_findFnumber(GroupBuffer *group, char *field_name); +extern void pbuf_checkFnumber(GroupBuffer *group, int field_number); +extern char *pbuf_findFname(GroupBuffer *group, int field_number); /* * prototypes for functions in pqcomm.c @@ -253,12 +253,12 @@ extern int pq_getinserv(struct sockaddr_in * sin, char *host, char *serv); 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 int StreamOpen(char *hostName, short portName, Port *port); extern void pq_regoob(void (*fptr) ()); extern void pq_unregoob(void); extern void pq_async_notify(void); extern int StreamServerPort(char *hostName, short portName, int *fdP); -extern int StreamConnection(int server_fd, Port * port); +extern int StreamConnection(int server_fd, Port *port); extern void StreamClose(int sock); #endif /* LIBPQ_H */ diff --git a/src/include/libpq/password.h b/src/include/libpq/password.h index 2b933553d5..28b279a7c0 100644 --- a/src/include/libpq/password.h +++ b/src/include/libpq/password.h @@ -7,7 +7,7 @@ #define PWFILE_NAME_SIZE USERMAP_NAME_SIZE int -verify_password(char *user, char *password, Port * port, +verify_password(char *user, char *password, Port *port, char *database, char *DataDir); #endif diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h index f565900a5d..c81c5d666c 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.13 1997/09/08 20:58:26 momjian Exp $ + * $Id: pqcomm.h,v 1.14 1997/09/08 21:52:38 momjian Exp $ * * NOTES * Some of this should move to libpq.h @@ -74,7 +74,7 @@ typedef struct StartupInfo char options[ARGV_SIZE]; /* possible additional args */ char execFile[ARGV_SIZE]; /* possible backend to use */ char tty[PATH_SIZE]; /* possible tty for debug output */ -} StartupInfo; +} StartupInfo; /* amount of available data in a packet buffer */ #define MESSAGE_SIZE sizeof(StartupInfo) + 5 /* why 5? BJM 2/11/97 */ @@ -91,7 +91,7 @@ typedef struct PacketBuf int len; MsgType msgtype; char data[MESSAGE_SIZE]; -} PacketBuf; +} PacketBuf; /* update the conversion routines StartupInfo2PacketBuf() and PacketBuf2StartupInfo() (decl. below) @@ -113,7 +113,7 @@ typedef struct Port * PacketBufId id; *//* id of packet buf currently in use */ PacketBuf buf; /* stream implementation (curr pack buf) */ -} Port; +} Port; /* invalid socket descriptor */ #define INVALID_SOCK (-1) @@ -147,9 +147,9 @@ int pqPutByte(int, FILE *); /* * prototypes for functions in pqpacket.c */ -extern int PacketReceive(Port * port, PacketBuf * buf, char nonBlocking); +extern int PacketReceive(Port *port, PacketBuf *buf, char nonBlocking); extern int -PacketSend(Port * port, PacketBuf * buf, +PacketSend(Port *port, PacketBuf *buf, PacketLen len, char nonBlocking); /* extern PacketBuf* StartupInfo2PacketBuf(StartupInfo*); */ diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index 2e71ab5874..c4c9552959 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.13 1997/09/08 02:33:50 momjian Exp $ + * $Id: miscadmin.h,v 1.14 1997/09/08 21:50:26 momjian Exp $ * * NOTES * some of the information in this file will be moved to @@ -154,7 +154,7 @@ typedef enum ProcessingMode BootstrapProcessing, /* bootstrap creation of template database */ InitProcessing, /* initializing system */ NormalProcessing /* normal processing */ -} ProcessingMode; +} ProcessingMode; /***************************************************************************** diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index a2cafdc642..7a6fdcab94 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.11 1997/09/08 20:58:40 momjian Exp $ + * $Id: execnodes.h,v 1.12 1997/09/08 21:52:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,7 +40,7 @@ typedef struct IndexInfo AttrNumber *ii_KeyAttributeNumbers; FuncIndexInfoPtr ii_FuncIndexInfo; Node *ii_Predicate; -} IndexInfo; +} IndexInfo; /* ---------------- * RelationInfo information @@ -65,7 +65,7 @@ typedef struct RelationInfo int ri_NumIndices; RelationPtr ri_IndexRelationDescs; IndexInfo **ri_IndexRelationInfo; -} RelationInfo; +} RelationInfo; /* ---------------- * ExprContext @@ -90,7 +90,7 @@ typedef struct ExprContext List *ecxt_range_table; Datum *ecxt_values; /* precomputed values for aggreg */ char *ecxt_nulls; /* null flags for aggreg values */ -} ExprContext; +} ExprContext; /* ---------------- * ProjectionInfo node information @@ -116,7 +116,7 @@ typedef struct ProjectionInfo Datum *pi_tupValue; ExprContext *pi_exprContext; TupleTableSlot *pi_slot; -} ProjectionInfo; +} ProjectionInfo; /* ---------------- * JunkFilter @@ -157,7 +157,7 @@ typedef struct JunkFilter int jf_cleanLength; TupleDesc jf_cleanTupType; AttrNumber *jf_cleanMap; -} JunkFilter; +} JunkFilter; /* ---------------- * EState information @@ -205,7 +205,7 @@ typedef struct EState int *es_refcount; uint32 es_processed; /* # of tuples processed */ Oid es_lastoid; /* last oid processed (by INSERT) */ -} EState; +} EState; /* ---------------- * Executor Type information needed by plannodes.h @@ -265,7 +265,7 @@ typedef struct CommonState ExprContext *cs_ExprContext; ProjectionInfo *cs_ProjInfo; bool cs_TupFromTlist; -} CommonState; +} CommonState; /* ---------------------------------------------------------------- @@ -293,7 +293,7 @@ typedef struct ResultState { CommonState cstate; /* its first field is NodeTag */ int rs_done; -} ResultState; +} ResultState; /* ---------------- * AppendState information @@ -362,7 +362,7 @@ typedef struct CommonScanState Relation css_currentRelation; HeapScanDesc css_currentScanDesc; TupleTableSlot *css_ScanTupleSlot; -} CommonScanState; +} CommonScanState; /* ---------------- * IndexScanState information @@ -400,7 +400,7 @@ typedef struct IndexScanState Pointer iss_RuntimeKeyInfo; RelationPtr iss_RelationDescs; IndexScanDescPtr iss_ScanDescs; -} IndexScanState; +} IndexScanState; /* ---------------------------------------------------------------- @@ -444,7 +444,7 @@ typedef struct NestLoopState { JoinState jstate; /* its first field is NodeTag */ bool nl_PortalFlag; -} NestLoopState; +} NestLoopState; /* ---------------- * MergeJoinState information @@ -473,7 +473,7 @@ typedef struct MergeJoinState List *mj_ISortopO; int mj_JoinState; TupleTableSlot *mj_MarkedTupleSlot; -} MergeJoinState; +} MergeJoinState; /* ---------------- * HashJoinState information @@ -523,7 +523,7 @@ typedef struct HashJoinState int hj_OuterReadBlk; TupleTableSlot *hj_OuterTupleSlot; TupleTableSlot *hj_HashTupleSlot; -} HashJoinState; +} HashJoinState; /* ---------------------------------------------------------------- @@ -562,7 +562,7 @@ typedef struct MaterialState CommonScanState csstate; /* its first field is NodeTag */ bool mat_Flag; Relation mat_TempRelation; -} MaterialState; +} MaterialState; /* --------------------- * AggregateState information @@ -587,7 +587,7 @@ typedef struct GroupState bool grp_useLastTuple; /* last tuple not processed yet */ bool grp_done; TupleTableSlot *grp_lastSlot; -} GroupState; +} GroupState; /* ---------------- * SortState information @@ -626,7 +626,7 @@ typedef struct SortState bool sort_Flag; ScanKey sort_Keys; bool cleaned; -} SortState; +} SortState; /* ---------------- * UniqueState information @@ -670,7 +670,7 @@ typedef struct HashState { CommonState cstate; /* its first field is NodeTag */ File *hashBatches; -} HashState; +} HashState; /* ----------------------- * TeeState information @@ -697,6 +697,6 @@ typedef struct TeeState MemoryContext tee_mcxt; HeapScanDesc tee_leftScanDesc; HeapScanDesc tee_rightScanDesc; -} TeeState; +} TeeState; #endif /* EXECNODES_H */ diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h index aa1050af16..e3104996d4 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.6 1997/09/08 02:37:19 momjian Exp $ + * $Id: memnodes.h,v 1.7 1997/09/08 21:52:44 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. @@ -48,10 +48,10 @@ typedef struct MemoryContextMethodsData { - Pointer(*alloc) (); + Pointer (*alloc) (); void (*free_p) (); /* need to use free as a #define, so can't * use free */ - Pointer(*realloc) (); + Pointer (*realloc) (); char *(*getName) (); void (*dump) (); } *MemoryContextMethods; diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h index b1fe746961..de5ad32ab5 100644 --- a/src/include/nodes/nodeFuncs.h +++ b/src/include/nodes/nodeFuncs.h @@ -6,17 +6,17 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeFuncs.h,v 1.4 1997/09/08 02:37:20 momjian Exp $ + * $Id: nodeFuncs.h,v 1.5 1997/09/08 21:52:45 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEFUNCS_H #define NODEFUNCS_H -extern bool single_node(Node * node); -extern bool var_is_outer(Var * var); -extern bool var_is_rel(Var * var); -extern Oper *replace_opid(Oper * oper); -extern bool non_null(Expr * c); +extern bool single_node(Node *node); +extern bool var_is_outer(Var *var); +extern bool var_is_rel(Var *var); +extern Oper *replace_opid(Oper *oper); +extern bool non_null(Expr *c); #endif /* NODEFUNCS_H */ diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index 73c7b84cba..93b071a650 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.13 1997/09/08 02:37:21 momjian Exp $ + * $Id: nodes.h,v 1.14 1997/09/08 21:52:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -209,7 +209,7 @@ typedef enum NodeTag T_SortClause, T_GroupClause, T_SubSelect -} NodeTag; +} NodeTag; /* * The first field of a node of any type is gauranteed to be the NodeTag. @@ -220,7 +220,7 @@ typedef enum NodeTag typedef struct Node { NodeTag type; -} Node; +} Node; #define nodeTag(_node_) ((Node*)_node_)->type @@ -303,7 +303,7 @@ typedef enum CmdType CMD_NOTIFY, CMD_UTILITY /* cmds like create, destroy, copy, * vacuum, etc. */ -} CmdType; +} CmdType; #endif /* NODES_H */ diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index d3e8bd86e8..083c5faed4 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.5 1997/09/08 02:37:22 momjian Exp $ + * $Id: params.h,v 1.6 1997/09/08 21:52:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -83,7 +83,7 @@ typedef struct ParamListInfoData bool isnull; bool byval; Datum value; -} ParamListInfoData; +} ParamListInfoData; typedef ParamListInfoData *ParamListInfo; diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 97890a37a8..ff5759cd05 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.26 1997/09/08 20:58:47 momjian Exp $ + * $Id: parsenodes.h,v 1.27 1997/09/08 21:52:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,7 +64,7 @@ typedef struct Query List *join_relation_list_; /* list of relations generated by * joins */ bool query_is_archival_; /* archival query flag */ -} Query; +} Query; /***************************************************************************** @@ -98,7 +98,7 @@ typedef struct ChangeACLStmt struct AclItem *aclitem; unsigned modechg; List *relNames; -} ChangeACLStmt; +} ChangeACLStmt; /* ---------------------- * Close Portal Statement @@ -108,7 +108,7 @@ typedef struct ClosePortalStmt { NodeTag type; char *portalname; /* name of the portal (cursor) */ -} ClosePortalStmt; +} ClosePortalStmt; /* ---------------------- * Copy Statement @@ -123,7 +123,7 @@ typedef struct CopyStmt int direction; /* TO or FROM */ char *filename; /* if NULL, use stdin/stdout */ char *delimiter; /* delimiter character, \t by default */ -} CopyStmt; +} CopyStmt; /* ---------------------- * Create Table Statement @@ -145,19 +145,19 @@ typedef struct CreateStmt int location; /* smgrid (-1 if none) */ int archiveLoc; /* smgrid (-1 if none) */ List *constraints; /* list of constraints (ConstaintDef) */ -} CreateStmt; +} CreateStmt; typedef enum ConstrType { CONSTR_NONE, CONSTR_CHECK /* type of constaints */ -} ConstrType; +} ConstrType; typedef struct ConstraintDef { ConstrType type; char *name; /* name */ void *def; /* definition */ -} ConstraintDef; +} ConstraintDef; /* ---------------------- * Create/Drop TRIGGER Statements @@ -178,14 +178,14 @@ typedef struct CreateTrigStmt char *text; /* AS 'text' */ List *attr; /* UPDATE OF a, b,... (NI) or NULL */ char *when; /* WHEN 'a > 10 ...' (NI) or NULL */ -} CreateTrigStmt; +} CreateTrigStmt; typedef struct DropTrigStmt { NodeTag type; char *trigname; /* TRIGGER' name */ char *relname; /* triggered relation */ -} DropTrigStmt; +} DropTrigStmt; /* ---------------------- * Create SEQUENCE Statement @@ -197,7 +197,7 @@ typedef struct CreateSeqStmt NodeTag type; char *seqname; /* the relation to create */ List *options; -} CreateSeqStmt; +} CreateSeqStmt; /* ---------------------- * Create Version Statement @@ -210,7 +210,7 @@ typedef struct VersionStmt int direction; /* FORWARD | BACKWARD */ char *fromRelname; /* relation to create a version */ char *date; /* date of the snapshot */ -} VersionStmt; +} VersionStmt; /* ---------------------- * Create {Operator|Type|Aggregate} Statement @@ -222,7 +222,7 @@ typedef struct DefineStmt int defType; /* OPERATOR|P_TYPE|AGGREGATE */ char *defname; List *definition; /* a list of DefElem */ -} DefineStmt; +} DefineStmt; /* ---------------------- * Drop Table Statement @@ -233,7 +233,7 @@ typedef struct DestroyStmt NodeTag type; List *relNames; /* relations to be dropped */ bool sequence; -} DestroyStmt; +} DestroyStmt; /* ---------------------- * Extend Index Statement @@ -246,7 +246,7 @@ typedef struct ExtendStmt Node *whereClause; /* qualifications */ List *rangetable; /* range table, filled in by * transformStmt() */ -} ExtendStmt; +} ExtendStmt; /* ---------------------- * Begin Recipe Statement @@ -256,7 +256,7 @@ typedef struct RecipeStmt { NodeTag type; char *recipeName; /* name of the recipe */ -} RecipeStmt; +} RecipeStmt; /* ---------------------- * Fetch Statement @@ -268,7 +268,7 @@ typedef struct FetchStmt int direction; /* FORWARD or BACKWARD */ int howMany; /* amount to fetch ("ALL" --> 0) */ char *portalname; /* name of portal (cursor) */ -} FetchStmt; +} FetchStmt; /* ---------------------- * Create Index Statement @@ -287,7 +287,7 @@ typedef struct IndexStmt * transformStmt() */ bool *lossy; /* is index lossy? */ bool unique; /* is index unique? */ -} IndexStmt; +} IndexStmt; /* ---------------------- * Move Statement (Not implemented) @@ -300,7 +300,7 @@ typedef struct MoveStmt bool to; int where; char *portalname; -} MoveStmt; +} MoveStmt; /* ---------------------- * Create Function Statement @@ -317,7 +317,7 @@ typedef struct ProcedureStmt List *withClause; /* a list of ParamString */ char *as; /* the SQL statement or filename */ char *language; /* C or SQL */ -} ProcedureStmt; +} ProcedureStmt; /* ---------------------- * Purge Statement @@ -329,7 +329,7 @@ typedef struct PurgeStmt char *relname; /* relation to purge */ char *beforeDate; /* purge before this date */ char *afterDate; /* purge after this date */ -} PurgeStmt; +} PurgeStmt; /* ---------------------- * Drop Aggregate Statement @@ -340,7 +340,7 @@ typedef struct RemoveAggrStmt NodeTag type; char *aggname; /* aggregate to drop */ char *aggtype; /* for this type */ -} RemoveAggrStmt; +} RemoveAggrStmt; /* ---------------------- * Drop Function Statement @@ -351,7 +351,7 @@ typedef struct RemoveFuncStmt NodeTag type; char *funcname; /* function to drop */ List *args; /* types of the arguments */ -} RemoveFuncStmt; +} RemoveFuncStmt; /* ---------------------- * Drop Operator Statement @@ -362,7 +362,7 @@ typedef struct RemoveOperStmt NodeTag type; char *opname; /* operator to drop */ List *args; /* types of the arguments */ -} RemoveOperStmt; +} RemoveOperStmt; /* ---------------------- * Drop {Type|Index|Rule|View} Statement @@ -373,7 +373,7 @@ typedef struct RemoveStmt NodeTag type; int removeType; /* P_TYPE|INDEX|RULE|VIEW */ char *name; /* name to drop */ -} RemoveStmt; +} RemoveStmt; /* ---------------------- * Alter Table Statement @@ -388,7 +388,7 @@ typedef struct RenameStmt * the new name. Otherwise, rename this * column name. */ char *newname; /* the new name */ -} RenameStmt; +} RenameStmt; /* ---------------------- * Create Rule Statement @@ -403,7 +403,7 @@ typedef struct RuleStmt struct Attr *object; /* object affected */ bool instead; /* is a 'do instead'? */ List *actions; /* the action statements */ -} RuleStmt; +} RuleStmt; /* ---------------------- * Notify Statement @@ -413,7 +413,7 @@ typedef struct NotifyStmt { NodeTag type; char *relname; /* relation to notify */ -} NotifyStmt; +} NotifyStmt; /* ---------------------- * Listen Statement @@ -423,7 +423,7 @@ typedef struct ListenStmt { NodeTag type; char *relname; /* relation to listen on */ -} ListenStmt; +} ListenStmt; /* ---------------------- * {Begin|Abort|End} Transaction Statement @@ -433,7 +433,7 @@ typedef struct TransactionStmt { NodeTag type; int command; /* BEGIN|END|ABORT */ -} TransactionStmt; +} TransactionStmt; /* ---------------------- * Create View Statement @@ -444,7 +444,7 @@ typedef struct ViewStmt NodeTag type; char *viewname; /* name of the view */ Query *query; /* the SQL statement */ -} ViewStmt; +} ViewStmt; /* ---------------------- * Load Statement @@ -454,7 +454,7 @@ typedef struct LoadStmt { NodeTag type; char *filename; /* file to load */ -} LoadStmt; +} LoadStmt; /* ---------------------- * Createdb Statement @@ -464,7 +464,7 @@ typedef struct CreatedbStmt { NodeTag type; char *dbname; /* database to create */ -} CreatedbStmt; +} CreatedbStmt; /* ---------------------- * Destroydb Statement @@ -474,7 +474,7 @@ typedef struct DestroydbStmt { NodeTag type; char *dbname; /* database to drop */ -} DestroydbStmt; +} DestroydbStmt; /* ---------------------- * Cluster Statement (support pbrown's cluster index implementation) @@ -485,7 +485,7 @@ typedef struct ClusterStmt NodeTag type; char *relname; /* relation being indexed */ char *indexname; /* original index defined */ -} ClusterStmt; +} ClusterStmt; /* ---------------------- * Vacuum Statement @@ -498,7 +498,7 @@ typedef struct VacuumStmt bool analyze; /* analyze data */ char *vacrel; /* table to vacuum */ List *va_spec; /* columns to analyse */ -} VacuumStmt; +} VacuumStmt; /* ---------------------- * Explain Statement @@ -509,7 +509,7 @@ typedef struct ExplainStmt NodeTag type; Query *query; /* the query */ bool verbose; /* print plan info */ -} ExplainStmt; +} ExplainStmt; /* ---------------------- * Set Statement @@ -521,7 +521,7 @@ typedef struct VariableSetStmt NodeTag type; char *name; char *value; -} VariableSetStmt; +} VariableSetStmt; /* ---------------------- * Show Statement @@ -532,7 +532,7 @@ typedef struct VariableShowStmt { NodeTag type; char *name; -} VariableShowStmt; +} VariableShowStmt; /* ---------------------- * Reset Statement @@ -543,7 +543,7 @@ typedef struct VariableResetStmt { NodeTag type; char *name; -} VariableResetStmt; +} VariableResetStmt; /***************************************************************************** @@ -573,7 +573,7 @@ typedef struct DeleteStmt NodeTag type; char *relname; /* relation to delete from */ Node *whereClause; /* qualifications */ -} DeleteStmt; +} DeleteStmt; /* ---------------------- * Update Statement @@ -586,7 +586,7 @@ typedef struct ReplaceStmt List *targetList; /* the target list (of ResTarget) */ Node *whereClause; /* qualifications */ List *fromClause; /* the from clause */ -} ReplaceStmt; +} ReplaceStmt; /* ---------------------- * Create Cursor Statement @@ -603,7 +603,7 @@ typedef struct CursorStmt Node *whereClause; /* qualifications */ List *groupClause; /* group by clause */ List *sortClause; /* sort clause (a list of SortGroupBy's) */ -} CursorStmt; +} CursorStmt; /* ---------------------- * Select Statement @@ -621,7 +621,7 @@ typedef struct RetrieveStmt Node *havingClause; /* having conditional-expression */ List *selectClause; /* subselect parameters */ List *sortClause; /* sort clause (a list of SortGroupBy's) */ -} RetrieveStmt; +} RetrieveStmt; /**************************************************************************** @@ -640,7 +640,7 @@ typedef struct SubSelect Node *whereClause; /* qualifications */ List *groupClause; /* group by clause */ Node *havingClause; /* having conditional-expression */ -} SubSelect; +} SubSelect; /* * TypeName - specifies a type in definitions @@ -653,7 +653,7 @@ typedef struct TypeName bool setof; /* is a set? */ List *arrayBounds; /* array bounds */ int typlen; /* length for char() and varchar() */ -} TypeName; +} TypeName; /* * ParamNo - specifies a parameter reference @@ -663,7 +663,7 @@ typedef struct ParamNo NodeTag type; int number; /* the number of the parameter */ TypeName *typename; /* the typecast */ -} ParamNo; +} ParamNo; /* * A_Expr - binary expressions @@ -714,7 +714,7 @@ typedef struct ColumnDef TypeName *typename; /* type of column */ bool is_not_null; /* flag to NOT NULL constraint */ char *defval; /* default value of column */ -} ColumnDef; +} ColumnDef; /* * Ident - @@ -730,7 +730,7 @@ typedef struct Ident List *indirection; /* array references */ bool isRel; /* is a relation - filled in by * transformExpr() */ -} Ident; +} Ident; /* * FuncCall - a function/aggregate invocation @@ -740,7 +740,7 @@ typedef struct FuncCall NodeTag type; char *funcname; /* name of function */ List *args; /* the arguments (list of exprs) */ -} FuncCall; +} FuncCall; /* * A_Indices - array reference or bounds ([lidx:uidx] or [uidx]) @@ -763,7 +763,7 @@ typedef struct ResTarget List *indirection; /* array references */ Node *val; /* the value of the result (A_Expr or * Attr) (or A_Const) */ -} ResTarget; +} ResTarget; /* * ParamString - used in with clauses @@ -773,7 +773,7 @@ typedef struct ParamString NodeTag type; char *name; char *val; -} ParamString; +} ParamString; /* * TimeRange - specifies a time range @@ -783,7 +783,7 @@ typedef struct TimeRange NodeTag type; char *startDate; char *endDate; /* snapshot if NULL */ -} TimeRange; +} TimeRange; /* * RelExpr - relation expressions @@ -794,7 +794,7 @@ typedef struct RelExpr char *relname; /* the relation name */ bool inh; /* inheritance query */ TimeRange *timeRange; /* the time range */ -} RelExpr; +} RelExpr; /* * SortGroupBy - for order by clause @@ -806,7 +806,7 @@ typedef struct SortGroupBy char *range; char *name; /* name of column to sort on */ char *useOp; /* operator to use */ -} SortGroupBy; +} SortGroupBy; /* * RangeVar - range variable, used in from clauses @@ -816,7 +816,7 @@ typedef struct RangeVar NodeTag type; RelExpr *relExpr; /* the relation expression */ char *name; /* the name to be referenced (optional) */ -} RangeVar; +} RangeVar; /* * IndexElem - index parameters (used in create index) @@ -828,7 +828,7 @@ typedef struct IndexElem List *args; /* if not NULL, function index */ char *class; TypeName *tname; /* type of index's keys (optional) */ -} IndexElem; +} IndexElem; /* * DefElem - @@ -839,7 +839,7 @@ typedef struct DefElem NodeTag type; char *defname; Node *arg; /* a (Value *) or a (TypeName *) */ -} DefElem; +} DefElem; /**************************************************************************** @@ -859,7 +859,7 @@ typedef struct TargetEntry Resdom *resdom; /* fjoin overload this to be a list?? */ Fjoin *fjoin; Node *expr; /* can be a list too */ -} TargetEntry; +} TargetEntry; /* * RangeTblEntry - @@ -885,7 +885,7 @@ typedef struct RangeTblEntry bool archive; /* filled in by plan_archive */ bool inFromCl; /* comes from From Clause */ TimeQual timeQual; /* filled in by pg_plan */ -} RangeTblEntry; +} RangeTblEntry; /* * SortClause - @@ -896,7 +896,7 @@ typedef struct SortClause NodeTag type; Resdom *resdom; /* attributes in tlist to be sorted */ Oid opoid; /* sort operators */ -} SortClause; +} SortClause; /* * GroupClause - @@ -907,6 +907,6 @@ typedef struct GroupClause NodeTag type; TargetEntry *entry; /* attributes to group on */ Oid grpOpoid; /* the sort operator to use */ -} GroupClause; +} GroupClause; #endif /* PARSENODES_H */ diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index 166ce53bd6..e3e3574193 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.7 1997/09/08 02:37:24 momjian Exp $ + * $Id: pg_list.h,v 1.8 1997/09/08 21:52:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,7 +33,7 @@ typedef struct Value long ival; double dval; } val; -} Value; +} Value; #define intVal(v) (((Value *)v)->val.ival) #define floatVal(v) (((Value *)v)->val.dval) @@ -53,7 +53,7 @@ typedef struct List int int_value; } elem; struct List *next; -} List; +} List; #define NIL ((List *) NULL) @@ -81,36 +81,36 @@ typedef struct List /* * function prototypes in nodes/list.c */ -extern int length(List * list); -extern List *append(List * list1, List * list2); -extern List *nconc(List * list1, List * list2); -extern List *lcons(void *datum, List * list); -extern bool member(void *foo, List * bar); +extern int length(List *list); +extern List *append(List *list1, List *list2); +extern List *nconc(List *list1, List *list2); +extern List *lcons(void *datum, List *list); +extern bool member(void *foo, List *bar); extern Value *makeInteger(long i); extern Value *makeFloat(double d); extern Value *makeString(char *str); extern List *makeList(void *elem,...); -extern List *lappend(List * list, void *obj); -extern List *lremove(void *elem, List * list); -extern void freeList(List * list); -extern List *LispRemove(void *elem, List * list); +extern List *lappend(List *list, void *obj); +extern List *lremove(void *elem, List *list); +extern void freeList(List *list); +extern List *LispRemove(void *elem, List *list); -extern void *nth(int n, List * l); -extern void set_nth(List * l, int n, void *elem); +extern void *nth(int n, List *l); +extern void set_nth(List *l, int n, void *elem); -List *lconsi(int datum, List * list); -List *lappendi(List * list, int datum); +List *lconsi(int datum, List *list); +List *lappendi(List *list, int datum); extern bool intMember(int, List *); -extern List *intAppend(List * list1, List * list2); +extern List *intAppend(List *list1, List *list2); -extern int nthi(int n, List * l); +extern int nthi(int n, List *l); extern List *nreverse(List *); extern List *set_difference(List *, List *); extern List *set_differencei(List *, List *); -extern List *LispUnion(List * foo, List * bar); -extern List *LispUnioni(List * foo, List * bar); -extern bool same(List * foo, List * bar); +extern List *LispUnion(List *foo, List *bar); +extern List *LispUnioni(List *foo, List *bar); +extern bool same(List *foo, List *bar); /* should be in nodes.h but needs List */ diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index c20b9b6376..77447935b8 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.9 1997/09/08 20:58:48 momjian Exp $ + * $Id: plannodes.h,v 1.10 1997/09/08 21:52:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,7 +75,7 @@ typedef struct Plan List *qual; /* Node* or List* ?? */ struct Plan *lefttree; struct Plan *righttree; -} Plan; +} Plan; /* ---------------- * these are are defined to avoid confusion problems with "left" @@ -116,7 +116,7 @@ typedef struct Result Plan plan; Node *resconstantqual; ResultState *resstate; -} Result; +} Result; /* ---------------- * append node @@ -141,7 +141,7 @@ typedef struct Scan Plan plan; Index scanrelid; /* relid is index into the range table */ CommonScanState *scanstate; -} Scan; +} Scan; /* ---------------- * sequential scan node @@ -159,7 +159,7 @@ typedef struct IndexScan List *indxid; List *indxqual; IndexScanState *indxstate; -} IndexScan; +} IndexScan; /* * ========== @@ -181,7 +181,7 @@ typedef struct NestLoop { Join join; NestLoopState *nlstate; -} NestLoop; +} NestLoop; /* ---------------- * merge join node @@ -195,7 +195,7 @@ typedef struct MergeJoin Oid *mergerightorder;/* inner sort operator */ Oid *mergeleftorder; /* outer sort operator */ MergeJoinState *mergestate; -} MergeJoin; +} MergeJoin; /* ---------------- * hash join (probe) node @@ -211,7 +211,7 @@ typedef struct HashJoin IpcMemoryKey hashjointablekey; int hashjointablesize; bool hashdone; -} HashJoin; +} HashJoin; /* --------------- * aggregate node @@ -242,7 +242,7 @@ typedef struct Group int numCols; /* number of group columns */ AttrNumber *grpColIdx; /* index into the target list */ GroupState *grpstate; -} Group; +} Group; /* * ========== @@ -254,7 +254,7 @@ typedef struct Temp Plan plan; Oid tempid; int keycount; -} Temp; +} Temp; /* ---------------- * materialization node @@ -266,7 +266,7 @@ typedef struct Material Oid tempid; int keycount; MaterialState *matstate; -} Material; +} Material; /* ---------------- * sort node @@ -280,7 +280,7 @@ typedef struct Sort SortState *sortstate; void *psortstate; bool cleaned; -} Sort; +} Sort; /* ---------------- * unique node @@ -296,7 +296,7 @@ typedef struct Unique AttrNumber uniqueAttrNum; /* attribute number of attribute to select * distinct on */ UniqueState *uniquestate; -} Unique; +} Unique; /* ---------------- * hash build node @@ -310,7 +310,7 @@ typedef struct Hash HashJoinTable hashtable; IpcMemoryKey hashtablekey; int hashtablesize; -} Hash; +} Hash; /* --------------------- * choose node @@ -320,7 +320,7 @@ typedef struct Choose { Plan plan; List *chooseplanlist; -} Choose; +} Choose; /* ------------------- * Tee node information @@ -340,6 +340,6 @@ typedef struct Tee List *rtentries; /* the range table for the plan below the * Tee may be different than the parent * plans */ -} Tee; +} Tee; #endif /* PLANNODES_H */ diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index 733a7c06ff..f0706d1392 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.10 1997/09/08 20:58:50 momjian Exp $ + * $Id: primnodes.h,v 1.11 1997/09/08 21:52:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,7 @@ typedef struct Resdom Index reskey; Oid reskeyop; int resjunk; -} Resdom; +} Resdom; /* ------------- * Fjoin @@ -73,7 +73,7 @@ typedef struct Fjoin List *fj_innerNode; DatumPtr fj_results; BoolPtr fj_alwaysDone; -} Fjoin; +} Fjoin; /* ---------------- * Expr @@ -87,7 +87,7 @@ typedef struct Fjoin typedef enum OpType { OP_EXPR, FUNC_EXPR, OR_EXPR, AND_EXPR, NOT_EXPR -} OpType; +} OpType; typedef struct Expr { @@ -96,7 +96,7 @@ typedef struct Expr OpType opType; /* type of the op */ Node *oper; /* could be Oper or Func */ List *args; /* list of argument nodes */ -} Expr; +} Expr; /* ---------------- * Var @@ -124,7 +124,7 @@ typedef struct Var Oid vartype; Index varnoold; /* only used by optimizer */ AttrNumber varoattno; /* only used by optimizer */ -} Var; +} Var; /* ---------------- * Oper @@ -154,7 +154,7 @@ typedef struct Oper Oid opresulttype; int opsize; FunctionCachePtr op_fcache; -} Oper; +} Oper; /* ---------------- @@ -183,7 +183,7 @@ typedef struct Const bool constbyval; bool constisset; bool constiscast; -} Const; +} Const; /* ---------------- * Param @@ -220,7 +220,7 @@ typedef struct Param char *paramname; Oid paramtype; List *param_tlist; -} Param; +} Param; /* ---------------- @@ -248,7 +248,7 @@ typedef struct Func FunctionCachePtr func_fcache; List *func_tlist; List *func_planlist; -} Func; +} Func; /* ---------------- * Aggreg diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h index bef8ce3a6c..bd384e864d 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.4 1997/09/08 02:37:28 momjian Exp $ + * $Id: print.h,v 1.5 1997/09/08 21:52:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,14 +21,14 @@ extern void print(void *obj); extern void pprint(void *obj); -extern void print_rt(List * rtable); -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_rt(List *rtable); +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, +print_plan_recursive(Plan *p, Query *parsetree, int indentLevel, char *label); -extern void print_plan(Plan * p, Query * parsetree); +extern void print_plan(Plan *p, Query *parsetree); #endif /* PRINT_H */ diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 4dfcb6692d..8c2fb363a9 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.6 1997/09/08 02:37:29 momjian Exp $ + * $Id: relation.h,v 1.7 1997/09/08 21:53:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -106,9 +106,9 @@ typedef struct Rel List *joininfo; /* join clauses */ List *innerjoin; List *superrels; -} Rel; +} Rel; -extern Var *get_expr(TargetEntry * foo); +extern Var *get_expr(TargetEntry *foo); typedef struct MergeOrder { @@ -118,12 +118,12 @@ typedef struct MergeOrder Oid right_operator; Oid left_type; Oid right_type; -} MergeOrder; +} MergeOrder; typedef enum OrderType { MERGE_ORDER, SORTOP_ORDER -} OrderType; +} OrderType; typedef struct PathOrder { @@ -133,7 +133,7 @@ typedef struct PathOrder Oid *sortop; MergeOrder *merge; } ord; -} PathOrder; +} PathOrder; typedef struct Path { @@ -150,7 +150,7 @@ typedef struct Path Cost outerjoincost; Relid joinid; List *locclauseinfo; -} Path; +} Path; typedef struct IndexPath { @@ -159,7 +159,7 @@ typedef struct IndexPath List *indexqual; int *indexkeys; /* to transform heap attnos into index * ones */ -} IndexPath; +} IndexPath; typedef struct JoinPath { @@ -167,7 +167,7 @@ typedef struct JoinPath List *pathclauseinfo; Path *outerjoinpath; Path *innerjoinpath; -} JoinPath; +} JoinPath; typedef struct MergePath { @@ -175,7 +175,7 @@ typedef struct MergePath List *path_mergeclauses; List *outersortkeys; List *innersortkeys; -} MergePath; +} MergePath; typedef struct HashPath { @@ -183,7 +183,7 @@ typedef struct HashPath List *path_hashclauses; List *outerhashkeys; List *innerhashkeys; -} HashPath; +} HashPath; /****** * Keys @@ -194,14 +194,14 @@ typedef struct OrderKey NodeTag type; int attribute_number; Index array_index; -} OrderKey; +} OrderKey; typedef struct JoinKey { NodeTag type; Var *outer; Var *inner; -} JoinKey; +} JoinKey; /******* * clause info @@ -221,26 +221,26 @@ typedef struct CInfo /* hashjoin only */ Oid hashjoinoperator; Relid cinfojoinid; -} CInfo; +} CInfo; typedef struct JoinMethod { NodeTag type; List *jmkeys; List *clauses; -} JoinMethod; +} JoinMethod; typedef struct HInfo { JoinMethod jmethod; Oid hashop; -} HInfo; +} HInfo; typedef struct MInfo { JoinMethod jmethod; MergeOrder *m_ordering; -} MInfo; +} MInfo; typedef struct JInfo { @@ -250,7 +250,7 @@ typedef struct JInfo bool mergesortable; bool hashjoinable; bool inactive; -} JInfo; +} JInfo; typedef struct Iter { @@ -258,7 +258,7 @@ typedef struct Iter Node *iterexpr; Oid itertype; /* type of the iter expr (use for type * checking) */ -} Iter; +} Iter; /* ** Stream: @@ -292,6 +292,6 @@ typedef struct Stream bool groupup; Cost groupcost; Cost groupsel; -} Stream; +} Stream; #endif /* RELATION_H */ diff --git a/src/include/optimizer/clauseinfo.h b/src/include/optimizer/clauseinfo.h index d6f034a4b5..6d1b0b8fbf 100644 --- a/src/include/optimizer/clauseinfo.h +++ b/src/include/optimizer/clauseinfo.h @@ -6,21 +6,21 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: clauseinfo.h,v 1.3 1997/09/08 02:37:32 momjian Exp $ + * $Id: clauseinfo.h,v 1.4 1997/09/08 21:53:03 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef CLAUSEINFO_H #define CLAUSEINFO_H -extern bool valid_or_clause(CInfo * clauseinfo); -extern List *get_actual_clauses(List * clauseinfo_list); +extern bool valid_or_clause(CInfo *clauseinfo); +extern List *get_actual_clauses(List *clauseinfo_list); extern void -get_relattvals(List * clauseinfo_list, List ** attnos, - List ** values, List ** flags); +get_relattvals(List *clauseinfo_list, List **attnos, + List **values, List **flags); extern void -get_joinvars(Oid relid, List * clauseinfo_list, - List ** attnos, List ** values, List ** flags); -extern List *get_opnos(List * clauseinfo_list); +get_joinvars(Oid relid, List *clauseinfo_list, + List **attnos, List **values, List **flags); +extern List *get_opnos(List *clauseinfo_list); #endif /* CLAUSEINFO_H */ diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index d3a4ef63d6..ebf6cfc04c 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.6 1997/09/08 20:58:54 momjian Exp $ + * $Id: clauses.h,v 1.7 1997/09/08 21:53:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,39 +15,39 @@ #include <nodes/primnodes.h> -extern Expr *make_clause(int type, Node * oper, List * args); -extern bool is_opclause(Node * clause); -extern Expr *make_opclause(Oper * op, Var * leftop, Var * rightop); -extern Var *get_leftop(Expr * clause); -extern Var *get_rightop(Expr * clause); - -extern bool is_funcclause(Node * clause); -extern Expr *make_funcclause(Func * func, List * funcargs); - -extern bool or_clause(Node * clause); -extern Expr *make_orclause(List * orclauses); - -extern bool not_clause(Node * clause); -extern Expr *make_notclause(Expr * notclause); -extern Expr *get_notclausearg(Expr * notclause); - -extern bool and_clause(Node * clause); -extern Expr *make_andclause(List * andclauses); - -extern List *pull_constant_clauses(List * quals, List ** constantQual); -extern void clause_relids_vars(Node * clause, List ** relids, List ** vars); -extern int NumRelids(Node * clause); -extern bool contains_not(Node * clause); -extern bool join_clause_p(Node * clause); -extern bool qual_clause_p(Node * clause); -extern void fix_opid(Node * clause); -extern List *fix_opids(List * clauses); +extern Expr *make_clause(int type, Node *oper, List *args); +extern bool is_opclause(Node *clause); +extern Expr *make_opclause(Oper *op, Var *leftop, Var *rightop); +extern Var *get_leftop(Expr *clause); +extern Var *get_rightop(Expr *clause); + +extern bool is_funcclause(Node *clause); +extern Expr *make_funcclause(Func *func, List *funcargs); + +extern bool or_clause(Node *clause); +extern Expr *make_orclause(List *orclauses); + +extern bool not_clause(Node *clause); +extern Expr *make_notclause(Expr *notclause); +extern Expr *get_notclausearg(Expr *notclause); + +extern bool and_clause(Node *clause); +extern Expr *make_andclause(List *andclauses); + +extern List *pull_constant_clauses(List *quals, List **constantQual); +extern void clause_relids_vars(Node *clause, List **relids, List **vars); +extern int NumRelids(Node *clause); +extern bool contains_not(Node *clause); +extern bool join_clause_p(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, - AttrNumber *attno, Datum * constval, int *flag); +get_relattval(Node *clause, int *relid, + AttrNumber *attno, Datum *constval, int *flag); extern void -get_rels_atts(Node * clause, int *relid1, +get_rels_atts(Node *clause, int *relid1, AttrNumber *attno1, int *relid2, AttrNumber *attno2); -extern void CommuteClause(Node * clause); +extern void CommuteClause(Node *clause); #endif /* CLAUSES_H */ diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index a0ab3a5946..8402e7a265 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.4 1997/09/08 02:37:40 momjian Exp $ + * $Id: cost.h,v 1.5 1997/09/08 21:53:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,37 +26,37 @@ extern bool _enable_mergesort_; extern bool _enable_hashjoin_; extern Cost cost_seqscan(int relid, int relpages, int reltuples); -extern Cost +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 +extern Cost cost_sort(List *keys, int tuples, int width, bool noread); +extern Cost cost_nestloop(Cost outercost, Cost innercost, int outertuples, int innertuples, int outerpages, bool is_indexjoin); -extern Cost +extern Cost cost_mergesort(Cost outercost, Cost innercost, - List * outersortkeys, List * innersortkeys, + List *outersortkeys, List *innersortkeys, int outersize, int innersize, int outerwidth, int innerwidth); -extern Cost -cost_hashjoin(Cost outercost, Cost innercost, List * outerkeys, - List * innerkeys, int outersize, int innersize, +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(Rel * rel); -extern int compute_rel_width(Rel * rel); -extern int compute_joinrel_size(JoinPath * joinpath); +extern int compute_rel_size(Rel *rel); +extern int compute_rel_width(Rel *rel); +extern int compute_joinrel_size(JoinPath *joinpath); extern int page_size(int tuples, int width); /* * prototypes for fuctions in clausesel.h-- * routines to compute clause selectivities */ -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, - Node * clause, List * or_selectivities); +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, + Node *clause, List *or_selectivities); #endif /* COST_H */ diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h index d9e63a1d8f..ef81545f2b 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.5 1997/09/08 02:37:42 momjian Exp $ + * $Id: geqo.h,v 1.6 1997/09/08 21:53:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -66,13 +66,13 @@ double SelectionBias; /* ^^^ */ /* geqo prototypes */ -extern Rel *geqo(Query * root); +extern Rel *geqo(Query *root); extern void geqo_params(int string_length); -extern Cost geqo_eval(Query * root, Gene * tour, int num_gene); +extern Cost geqo_eval(Query *root, Gene *tour, int num_gene); double geqo_log(double x, double b); -extern Rel *gimme_tree(Query * root, Gene * tour, int rel_count, int num_gene, Rel * outer_rel); +extern Rel *gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, Rel *outer_rel); #endif /* GEQO_H */ diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h index 219f503d91..27c9eaad47 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.3 1997/09/08 02:37:43 momjian Exp $ + * $Id: geqo_copy.h,v 1.4 1997/09/08 21:53:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,6 +22,6 @@ #define GEQO_COPY_H -extern void geqo_copy(Chromosome * chromo1, Chromosome * chromo2, int string_length); +extern void geqo_copy(Chromosome *chromo1, Chromosome *chromo2, int string_length); #endif /* GEQO_COPY_H */ diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h index 0363404411..ade40fa740 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.3 1997/09/08 02:37:44 momjian Exp $ + * $Id: geqo_gene.h,v 1.4 1997/09/08 21:53:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,19 +26,19 @@ /* we presume that int instead of Relid is o.k. for Gene; so don't change it! */ typedef -int Gene; +int Gene; typedef struct Chromosome { Gene *string; Cost worth; -} Chromosome; +} Chromosome; typedef struct Pool { Chromosome *data; int size; int string_length; -} Pool; +} Pool; #endif /* GEQO_GENE_H */ diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index 83e8969815..64b8ddf432 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.3 1997/09/08 02:37:46 momjian Exp $ + * $Id: geqo_misc.h,v 1.4 1997/09/08 21:53:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,12 +23,12 @@ #include <stdio.h> -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 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, Rel * rel); -extern void geqo_print_path(Query * root, Path * path, int indent); -extern void geqo_print_joinclauses(Query * root, List * clauses); +extern void geqo_print_rel(Query *root, Rel *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 */ diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h index d195ba0c11..2a18c8cdfd 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.3 1997/09/08 02:37:46 momjian Exp $ + * $Id: geqo_mutation.h,v 1.4 1997/09/08 21:53:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,6 +22,6 @@ #define GEQO_MUTATION_H -extern void geqo_mutation(Gene * tour, int num_gene); +extern void geqo_mutation(Gene *tour, int num_gene); #endif /* GEQO_MUTATION_H */ diff --git a/src/include/optimizer/geqo_paths.h b/src/include/optimizer/geqo_paths.h index b9a9b7e096..8be4032a22 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.3 1997/09/08 02:37:47 momjian Exp $ + * $Id: geqo_paths.h,v 1.4 1997/09/08 21:53:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,7 @@ #define GEQO_PATHS_H -extern List *geqo_prune_rels(List * rel_list); -extern void geqo_rel_paths(Rel * rel); +extern List *geqo_prune_rels(List *rel_list); +extern void geqo_rel_paths(Rel *rel); #endif /* GEQO_PATHS_H */ diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h index 2642a8cc3d..3fe9c71bd2 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.3 1997/09/08 02:37:47 momjian Exp $ + * $Id: geqo_pool.h,v 1.4 1997/09/08 21:53:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,14 +24,14 @@ extern Pool *alloc_pool(int pool_size, int string_length); -extern void free_pool(Pool * pool); +extern void free_pool(Pool *pool); -extern void random_init_pool(Query * root, Pool * pool, int strt, int stop); +extern void random_init_pool(Query *root, Pool *pool, int strt, int stop); extern Chromosome *alloc_chromo(int string_length); -extern void free_chromo(Chromosome * chromo); +extern void free_chromo(Chromosome *chromo); -extern void spread_chromo(Chromosome * chromo, Pool * pool); +extern void spread_chromo(Chromosome *chromo, Pool *pool); -extern void sort_pool(Pool * pool); +extern void sort_pool(Pool *pool); #endif /* GEQO_POOL_H */ diff --git a/src/include/optimizer/geqo_recombination.h b/src/include/optimizer/geqo_recombination.h index 0b678504a4..eea3c58a9f 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.3 1997/09/08 02:37:48 momjian Exp $ + * $Id: geqo_recombination.h,v 1.4 1997/09/08 21:53:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ #define GEQO_RECOMBINATION_H -extern void init_tour(Gene * tour, int num_gene); +extern void init_tour(Gene *tour, int num_gene); /* edge recombination crossover [ERX] */ @@ -34,14 +34,14 @@ typedef struct Edge Gene edge_list[4]; /* list of edges */ int total_edges; int unused_edges; -} Edge; +} Edge; extern Edge *alloc_edge_table(int num_gene); -extern void free_edge_table(Edge * edge_table); +extern void free_edge_table(Edge *edge_table); -extern float gimme_edge_table(Gene * tour1, Gene * tour2, int num_gene, Edge * edge_table); +extern float gimme_edge_table(Gene *tour1, Gene *tour2, int num_gene, Edge *edge_table); -extern int gimme_tour(Edge * edge_table, Gene * new_gene, int num_gene); +extern int gimme_tour(Edge *edge_table, Gene *new_gene, int num_gene); /* partially matched crossover [PMX] */ @@ -49,7 +49,7 @@ extern int gimme_tour(Edge * edge_table, Gene * new_gene, int num_gene); #define DAD 1 /* indicator for gene from dad */ #define MOM 0 /* indicator for gene from mom */ -extern void pmx(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene); +extern void pmx(Gene *tour1, Gene *tour2, Gene *offspring, int num_gene); typedef struct City @@ -58,22 +58,22 @@ typedef struct City int tour1_position; int used; int select_list; -} City; +} City; extern City *alloc_city_table(int num_gene); -extern void free_city_table(City * city_table); +extern void free_city_table(City *city_table); /* cycle crossover [CX] */ -extern int cx(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene, City * city_table); +extern int cx(Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, City *city_table); /* position crossover [PX] */ -extern void px(Gene * tour1, Gene * tour2, Gene * offspring, int num_gene, City * city_table); +extern void px(Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, City *city_table); /* order crossover [OX1] according to Davis */ -extern void ox1(Gene * mom, Gene * dad, Gene * offspring, int num_gene, City * city_table); +extern void ox1(Gene *mom, Gene *dad, Gene *offspring, int num_gene, City *city_table); /* order crossover [OX2] according to Syswerda */ -extern void ox2(Gene * mom, Gene * dad, Gene * offspring, int num_gene, City * city_table); +extern void ox2(Gene *mom, Gene *dad, Gene *offspring, int num_gene, City *city_table); #endif /* GEQO_RECOMBINATION_H */ diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h index 910e204891..ea7b26492f 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.3 1997/09/08 02:37:49 momjian Exp $ + * $Id: geqo_selection.h,v 1.4 1997/09/08 21:53:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,6 @@ #define GEQO_SELECTION_H -extern void geqo_selection(Chromosome * momma, Chromosome * daddy, Pool * pool, double bias); +extern void geqo_selection(Chromosome *momma, Chromosome *daddy, Pool *pool, double bias); #endif /* GEQO_SELECTION_H */ diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h index 505b6a64c2..b6c43fba8d 100644 --- a/src/include/optimizer/joininfo.h +++ b/src/include/optimizer/joininfo.h @@ -6,15 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: joininfo.h,v 1.3 1997/09/08 02:37:50 momjian Exp $ + * $Id: joininfo.h,v 1.4 1997/09/08 21:53:18 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef JOININFO_H #define JOININFO_H -extern JInfo *joininfo_member(List * join_relids, List * joininfo_list); -extern JInfo *find_joininfo_node(Rel * this_rel, List * join_relids); -extern Var *other_join_clause_var(Var * var, Expr * clause); +extern JInfo *joininfo_member(List *join_relids, List *joininfo_list); +extern JInfo *find_joininfo_node(Rel *this_rel, List *join_relids); +extern Var *other_join_clause_var(Var *var, Expr *clause); #endif /* JOININFO_H */ diff --git a/src/include/optimizer/keys.h b/src/include/optimizer/keys.h index cf85d6ef17..85af02e873 100644 --- a/src/include/optimizer/keys.h +++ b/src/include/optimizer/keys.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: keys.h,v 1.4 1997/09/08 02:37:51 momjian Exp $ + * $Id: keys.h,v 1.5 1997/09/08 21:53:18 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef KEYS_H #define KEYS_H -extern bool match_indexkey_operand(int indexkey, Var * operand, Rel * 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); +extern bool match_indexkey_operand(int indexkey, Var *operand, Rel *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 */ diff --git a/src/include/optimizer/ordering.h b/src/include/optimizer/ordering.h index 9d36ac3aaa..eac0035be4 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.5 1997/09/08 02:37:52 momjian Exp $ + * $Id: ordering.h,v 1.6 1997/09/08 21:53:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,14 +15,14 @@ #include <nodes/relation.h> -extern bool -equal_path_path_ordering(PathOrder * path_ordering1, - PathOrder * path_ordering2); -extern bool -equal_path_merge_ordering(Oid * path_ordering, - MergeOrder * merge_ordering); -extern bool -equal_merge_merge_ordering(MergeOrder * merge_ordering1, - MergeOrder * merge_ordering2); +extern bool +equal_path_path_ordering(PathOrder *path_ordering1, + PathOrder *path_ordering2); +extern bool +equal_path_merge_ordering(Oid *path_ordering, + MergeOrder *merge_ordering); +extern bool +equal_merge_merge_ordering(MergeOrder *merge_ordering1, + MergeOrder *merge_ordering2); #endif /* ORDERING_H */ diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index b553851300..ae6848abb5 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.3 1997/09/08 02:37:52 momjian Exp $ + * $Id: pathnode.h,v 1.4 1997/09/08 21:53:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,40 +16,40 @@ /* * prototypes for pathnode.c */ -extern bool path_is_cheaper(Path * path1, Path * path2); -extern Path *set_cheapest(Rel * parent_rel, List * pathlist); +extern bool path_is_cheaper(Path *path1, Path *path2); +extern Path *set_cheapest(Rel *parent_rel, List *pathlist); extern List * -add_pathlist(Rel * parent_rel, List * unique_paths, - List * new_paths); -extern Path *create_seqscan_path(Rel * rel); +add_pathlist(Rel *parent_rel, List *unique_paths, + List *new_paths); +extern Path *create_seqscan_path(Rel *rel); extern IndexPath * -create_index_path(Query * root, Rel * rel, Rel * index, - List * restriction_clauses, bool is_join_scan); +create_index_path(Query *root, Rel *rel, Rel *index, + List *restriction_clauses, bool is_join_scan); extern JoinPath * -create_nestloop_path(Rel * joinrel, Rel * outer_rel, - Path * outer_path, Path * inner_path, List * keys); +create_nestloop_path(Rel *joinrel, Rel *outer_rel, + Path *outer_path, Path *inner_path, List *keys); extern MergePath * -create_mergesort_path(Rel * 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); +create_mergesort_path(Rel *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(Rel * 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); +create_hashjoin_path(Rel *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); /* * prototypes for rel.c */ -extern Rel *rel_member(List * relid, List * rels); -extern Rel *get_base_rel(Query * root, int relid); -extern Rel *get_join_rel(Query * root, List * relid); +extern Rel *rel_member(List *relid, List *rels); +extern Rel *get_base_rel(Query *root, int relid); +extern Rel *get_join_rel(Query *root, List *relid); /* * prototypes for indexnode.h */ -extern List *find_relation_indices(Query * root, Rel * rel); +extern List *find_relation_indices(Query *root, Rel *rel); #endif /* PATHNODE_H */ diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index c3403e19a0..61a9cea940 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.3 1997/09/08 02:37:53 momjian Exp $ + * $Id: paths.h,v 1.4 1997/09/08 21:53:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,35 +17,35 @@ /* * allpaths.h */ -extern List *find_paths(Query * root, List * rels); +extern List *find_paths(Query *root, List *rels); /* * indxpath.h * routines to generate index paths */ extern List * -find_index_paths(Query * root, Rel * rel, List * indices, - List * clauseinfo_list, - List * joininfo_list); +find_index_paths(Query *root, Rel *rel, List *indices, + List *clauseinfo_list, + List *joininfo_list); /* * joinpath.h * routines to create join paths */ -extern void find_all_join_paths(Query * root, List * joinrels); +extern void find_all_join_paths(Query *root, List *joinrels); /* * orindxpath.h */ -extern List *create_or_index_paths(Query * root, Rel * rel, List * clauses); +extern List *create_or_index_paths(Query *root, Rel *rel, List *clauses); /* * hashutils.h * routines to deal with hash keys and clauses */ extern List * -group_clauses_by_hashop(List * clauseinfo_list, +group_clauses_by_hashop(List *clauseinfo_list, int inner_relid); /* @@ -53,45 +53,45 @@ group_clauses_by_hashop(List * clauseinfo_list, * generic join method key/clause routines */ extern List * -match_pathkeys_joinkeys(List * pathkeys, - List * joinkeys, List * joinclauses, int which_subkey, - List ** matchedJoinClausesPtr); +match_pathkeys_joinkeys(List *pathkeys, + List *joinkeys, List *joinclauses, int which_subkey, + List **matchedJoinClausesPtr); extern List * -extract_path_keys(List * joinkeys, List * tlist, +extract_path_keys(List *joinkeys, List *tlist, int which_subkey); extern Path * -match_paths_joinkeys(List * joinkeys, PathOrder * ordering, - List * paths, int which_subkey); +match_paths_joinkeys(List *joinkeys, PathOrder *ordering, + List *paths, int which_subkey); extern List * -new_join_pathkeys(List * outer_pathkeys, - List * join_rel_tlist, List * joinclauses); +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, +group_clauses_by_order(List *clauseinfo_list, int inner_relid); extern MInfo * -match_order_mergeinfo(PathOrder * ordering, - List * mergeinfo_list); +match_order_mergeinfo(PathOrder *ordering, + List *mergeinfo_list); /* * joinrels.h * routines to determine which relations to join */ -extern List *find_join_rels(Query * root, List * outer_rels); -extern void add_new_joininfos(Query * root, List * joinrels, List * outerrels); -extern List *final_join_rels(List * join_rel_list); +extern List *find_join_rels(Query *root, List *outer_rels); +extern void add_new_joininfos(Query *root, List *joinrels, List *outerrels); +extern List *final_join_rels(List *join_rel_list); /* * prototypes for path/prune.c */ -extern List *prune_joinrels(List * rel_list); -extern void prune_rel_paths(List * rel_list); -extern Path *prune_rel_path(Rel * rel, Path * unorderedpath); -extern List *merge_joinrels(List * rel_list1, List * rel_list2); -extern List *prune_oldrels(List * old_rels); +extern List *prune_joinrels(List *rel_list); +extern void prune_rel_paths(List *rel_list); +extern Path *prune_rel_path(Rel *rel, Path *unorderedpath); +extern List *merge_joinrels(List *rel_list1, List *rel_list2); +extern List *prune_oldrels(List *old_rels); #endif /* PATHS_H */ diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index 1a2686e3d3..c52e5c1416 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.5 1997/09/08 02:37:54 momjian Exp $ + * $Id: plancat.h,v 1.6 1997/09/08 21:53:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,20 +31,20 @@ typedef struct IdxInfoRetval Oid *classlist; /* classes of AM operators */ Oid indproc; Node *indpred; -} IdxInfoRetval; +} IdxInfoRetval; extern void -relation_info(Query * root, +relation_info(Query *root, Oid relid, - bool * hashindex, int *pages, + bool *hashindex, int *pages, int *tuples); -extern bool -index_info(Query * root, - bool first, int relid, IdxInfoRetval * info); +extern bool +index_info(Query *root, + bool first, int relid, IdxInfoRetval *info); -extern Cost +extern Cost restriction_selectivity(Oid functionObjectId, Oid operatorObjectId, Oid relationObjectId, @@ -53,11 +53,11 @@ restriction_selectivity(Oid functionObjectId, int32 constFlag); extern void -index_selectivity(Oid indid, Oid * classes, List * opnos, - Oid relid, List * attnos, List * values, List * flags, +index_selectivity(Oid indid, Oid *classes, List *opnos, + Oid relid, List *attnos, List *values, List *flags, int32 nkeys, float *idxPages, float *idxSelec); -extern Cost +extern Cost join_selectivity(Oid functionObjectId, Oid operatorObjectId, Oid relationObjectId1, AttrNumber attributeNumber1, Oid relationObjectId2, AttrNumber attributeNumber2); diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index af16535812..8f2abff932 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.4 1997/09/08 20:58:56 momjian Exp $ + * $Id: planmain.h,v 1.5 1997/09/08 21:53:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,47 +18,47 @@ * prototypes for plan/planmain.c */ extern Plan * -query_planner(Query * root, - int command_type, List * tlist, List * qual); +query_planner(Query *root, + int command_type, List *tlist, List *qual); /* * prototypes for plan/createplan.c */ -extern Plan *create_plan(Path * best_path); +extern Plan *create_plan(Path *best_path); extern SeqScan * -make_seqscan(List * qptlist, List * qpqual, Index scanrelid, - Plan * lefttree); +make_seqscan(List *qptlist, List *qpqual, Index scanrelid, + Plan *lefttree); extern Sort * -make_sort(List * tlist, Oid tempid, Plan * lefttree, +make_sort(List *tlist, Oid tempid, Plan *lefttree, int keycount); -extern Agg *make_agg(List * tlist, int nagg, Aggreg **aggs); +extern Agg *make_agg(List *tlist, int nagg, Aggreg **aggs); extern Group * -make_group(List * tlist, bool tuplePerGroup, int ngrp, - AttrNumber *grpColIdx, Sort * lefttree); -extern Unique *make_unique(List * tlist, Plan * lefttree, char *uniqueAttr); -extern List *generate_fjoin(List * tlist); +make_group(List *tlist, bool tuplePerGroup, int ngrp, + AttrNumber *grpColIdx, Sort *lefttree); +extern Unique *make_unique(List *tlist, Plan *lefttree, char *uniqueAttr); +extern List *generate_fjoin(List *tlist); /* * prototypes for plan/initsplan.c */ -extern void initialize_base_rels_list(Query * root, List * tlist); -extern void initialize_base_rels_jinfo(Query * root, List * clauses); -extern void initialize_join_clause_info(List * rel_list); -extern void add_missing_vars_to_base_rels(Query * root, List * tlist); +extern void initialize_base_rels_list(Query *root, List *tlist); +extern void initialize_base_rels_jinfo(Query *root, List *clauses); +extern void initialize_join_clause_info(List *rel_list); +extern void add_missing_vars_to_base_rels(Query *root, List *tlist); /* * prototypes for plan/setrefs.c */ -extern void set_tlist_references(Plan * plan); +extern void set_tlist_references(Plan *plan); extern List * -join_references(List * clauses, List * outer_tlist, - List * inner_tlist); +join_references(List *clauses, List *outer_tlist, + List *inner_tlist); extern List * -index_outerjoin_references(List * inner_indxqual, - List * outer_tlist, Index inner_relid); -extern void set_result_tlist_references(Result * resultNode); +index_outerjoin_references(List *inner_indxqual, + List *outer_tlist, Index inner_relid); +extern void set_result_tlist_references(Result *resultNode); extern void set_agg_tlist_references(Agg *aggNode); extern void set_agg_agglist_references(Agg *aggNode); diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h index 9f0375a599..da90b768c6 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.4 1997/09/08 02:37:56 momjian Exp $ + * $Id: planner.h,v 1.5 1997/09/08 21:53:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,7 +16,7 @@ /* */ -extern Plan *planner(Query * parse); -extern void pg_checkretval(Oid rettype, QueryTreeList * querytree_list); +extern Plan *planner(Query *parse); +extern void pg_checkretval(Oid rettype, QueryTreeList *querytree_list); #endif /* PLANNER_H */ diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index ccc721495b..69db9b61ce 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.4 1997/09/08 02:37:57 momjian Exp $ + * $Id: prep.h,v 1.5 1997/09/08 21:53:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,23 +19,23 @@ /* * prototypes for archive.h */ -extern void plan_archive(List * rt); +extern void plan_archive(List *rt); extern List *find_archive_rels(Oid relid); /* * prototypes for prepqual.h */ extern List * -preprocess_qualification(Expr * qual, List * tlist, - List ** existentialQualPtr); -extern List *cnfify(Expr * qual, bool removeAndFlag); +preprocess_qualification(Expr *qual, List *tlist, + List **existentialQualPtr); +extern List *cnfify(Expr *qual, bool removeAndFlag); /* * prototypes for preptlist.h */ extern List * -preprocess_targetlist(List * tlist, int command_type, - Index result_relation, List * range_table); +preprocess_targetlist(List *tlist, int command_type, + Index result_relation, List *range_table); /* * prototypes for prepunion.h @@ -43,14 +43,14 @@ preprocess_targetlist(List * tlist, int command_type, typedef enum UnionFlag { INHERITS_FLAG, ARCHIVE_FLAG, VERSION_FLAG -} UnionFlag; +} UnionFlag; extern List * -find_all_inheritors(List * unexamined_relids, - List * examined_relids); -extern int first_matching_rt_entry(List * rangetable, UnionFlag flag); +find_all_inheritors(List *unexamined_relids, + List *examined_relids); +extern int first_matching_rt_entry(List *rangetable, UnionFlag flag); extern Append * -plan_union_queries(Index rt_index, Query * parse, +plan_union_queries(Index rt_index, Query *parse, UnionFlag flag); #endif /* PREP_H */ diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index 99299db757..318ab74f98 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.h @@ -6,31 +6,31 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tlist.h,v 1.4 1997/09/08 02:37:57 momjian Exp $ + * $Id: tlist.h,v 1.5 1997/09/08 21:53:31 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef TLIST_H #define TLIST_H -extern int exec_tlist_length(List * targelist); -extern TargetEntry *tlistentry_member(Var * var, List * targetlist); -extern Expr *matching_tlvar(Var * var, List * targetlist); -extern void add_tl_element(Rel * 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); -extern Resdom *tlist_resdom(List * tlist, Resdom * resnode); +extern int exec_tlist_length(List *targelist); +extern TargetEntry *tlistentry_member(Var *var, List *targetlist); +extern Expr *matching_tlvar(Var *var, List *targetlist); +extern void add_tl_element(Rel *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); +extern Resdom *tlist_resdom(List *tlist, Resdom *resnode); -extern TargetEntry *MakeTLE(Resdom * resdom, Node * expr); -extern Var *get_expr(TargetEntry * tle); +extern TargetEntry *MakeTLE(Resdom *resdom, Node *expr); +extern Var *get_expr(TargetEntry *tle); -extern TargetEntry *match_varid(Var * test_var, List * tlist); -extern List *new_unsorted_tlist(List * targetlist); -extern List *copy_vars(List * target, List * source); -extern List *flatten_tlist(List * tlist); +extern TargetEntry *match_varid(Var *test_var, List *tlist); +extern List *new_unsorted_tlist(List *targetlist); +extern List *copy_vars(List *target, List *source); +extern List *flatten_tlist(List *tlist); extern List * -flatten_tlist_vars(List * full_tlist, - List * flat_tlist); +flatten_tlist_vars(List *full_tlist, + List *flat_tlist); #endif /* TLIST_H */ diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h index 372e5a27a8..ad0dfad36b 100644 --- a/src/include/optimizer/var.h +++ b/src/include/optimizer/var.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: var.h,v 1.3 1997/09/08 02:37:58 momjian Exp $ + * $Id: var.h,v 1.4 1997/09/08 21:53:31 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef VAR_H #define VAR_H -extern List *pull_varnos(Node * me); -extern bool contain_var_clause(Node * clause); -extern List *pull_var_clause(Node * clause); -extern bool var_equal(Var * var1, Var * var2); +extern List *pull_varnos(Node *me); +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 */ diff --git a/src/include/optimizer/xfunc.h b/src/include/optimizer/xfunc.h index b8232db4f7..80a956215e 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.4 1997/09/08 02:37:59 momjian Exp $ + * $Id: xfunc.h,v 1.5 1997/09/08 21:53:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,38 +49,38 @@ 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(Rel * rel); +extern void xfunc_trypullup(Rel *rel); extern int -xfunc_shouldpull(Path * childpath, JoinPath * parentpath, - int whichchild, CInfo * maxcinfopt); +xfunc_shouldpull(Path *childpath, JoinPath *parentpath, + int whichchild, CInfo *maxcinfopt); extern CInfo * -xfunc_pullup(Path * childpath, JoinPath * parentpath, CInfo * cinfo, +xfunc_pullup(Path *childpath, JoinPath *parentpath, CInfo *cinfo, int whichchild, int clausetype); -extern Cost xfunc_rank(Expr * clause); -extern Cost xfunc_expense(Query * queryInfo, Expr * clause); -extern Cost xfunc_join_expense(JoinPath * path, int whichchild); -extern Cost xfunc_local_expense(Expr * clause); -extern Cost xfunc_func_expense(Expr * node, List * args); -extern int xfunc_width(Expr * clause); +extern Cost xfunc_rank(Expr *clause); +extern Cost xfunc_expense(Query *queryInfo, Expr *clause); +extern Cost xfunc_join_expense(JoinPath *path, int whichchild); +extern Cost xfunc_local_expense(Expr *clause); +extern Cost xfunc_func_expense(Expr *node, List *args); +extern int xfunc_width(Expr *clause); /* static, moved to xfunc.c */ /* extern int xfunc_card_unreferenced(Expr *clause, Relid referenced); */ extern int xfunc_card_product(Relid relids); -extern List *xfunc_find_references(List * clause); -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, Rel * rel, int varno); +extern List *xfunc_find_references(List *clause); +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, Rel *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); +extern void xfunc_disjunct_sort(List *clause_list); extern int xfunc_disjunct_compare(void *arg1, void *arg2); -extern int xfunc_func_width(RegProcedure funcid, List * args); +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(Rel * from, Rel ** to); +extern int xfunc_num_join_clauses(JoinPath *path); +extern List *xfunc_LispRemove(List *foo, List *bar); +extern bool xfunc_copyrel(Rel *from, Rel **to); /* * function prototypes for path/predmig.c diff --git a/src/include/parser/catalog_utils.h b/src/include/parser/catalog_utils.h index 0a44971312..707ca3a1c6 100644 --- a/src/include/parser/catalog_utils.h +++ b/src/include/parser/catalog_utils.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: catalog_utils.h,v 1.12 1997/09/08 02:38:01 momjian Exp $ + * $Id: catalog_utils.h,v 1.13 1997/09/08 21:53:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,15 +40,15 @@ extern char *getAttrName(Relation rd, int attrno); extern char *instr2(Type tp, char *string, int typlen); extern Oid GetArrayElementType(Oid typearray); extern Oid funcid_get_rettype(Oid funcid); -extern bool -func_get_detail(char *funcname, int nargs, Oid * oid_array, - Oid * funcid, Oid * rettype, bool * retset, Oid ** true_typeids); +extern bool +func_get_detail(char *funcname, int nargs, Oid *oid_array, + Oid *funcid, Oid *rettype, bool *retset, Oid **true_typeids); extern Oid typeid_get_retinfunc(Oid type_id); extern Oid typeid_get_retoutfunc(Oid type_id); extern Oid typeid_get_relid(Oid type_id); extern Oid get_typrelid(Type typ); extern Oid get_typelem(Oid type_id); -extern void func_error(char *caller, char *funcname, int nargs, Oid * argtypes); +extern void func_error(char *caller, char *funcname, int nargs, Oid *argtypes); extern void agg_error(char *caller, char *aggname, Oid basetypeID); #endif /* CATALOG_UTILS_H */ diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h index 9616893685..2fb04acd56 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.4 1997/09/08 02:38:11 momjian Exp $ + * $Id: gramparse.h,v 1.5 1997/09/08 21:53:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ extern void init_io(void); /* from gram.y */ -extern void parser_init(Oid * typev, int nargs); +extern void parser_init(Oid *typev, int nargs); extern int yyparse(void); #endif /* GRAMPARSE_H */ diff --git a/src/include/parser/keywords.h b/src/include/parser/keywords.h index 9d459cda8a..7feda88a08 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.3 1997/09/08 02:38:14 momjian Exp $ + * $Id: keywords.h,v 1.4 1997/09/08 21:53:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ typedef struct ScanKeyword { char *name; int value; -} ScanKeyword; +} ScanKeyword; extern ScanKeyword *ScanKeywordLookup(char *text); extern char *AtomValueGetString(int atomval); diff --git a/src/include/parser/parse_query.h b/src/include/parser/parse_query.h index 63310a8bd7..7775ec0260 100644 --- a/src/include/parser/parse_query.h +++ b/src/include/parser/parse_query.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_query.h,v 1.11 1997/09/08 02:38:15 momjian Exp $ + * $Id: parse_query.h,v 1.12 1997/09/08 21:53:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,52 +21,52 @@ typedef struct QueryTreeList { int len; /* number of queries */ Query **qtrees; -} QueryTreeList; +} QueryTreeList; -extern RangeTblEntry *refnameRangeTableEntry(List * rtable, char *refname); -extern RangeTblEntry *colnameRangeTableEntry(ParseState * pstate, char *colname); -extern int refnameRangeTablePosn(List * rtable, char *refname); +extern RangeTblEntry *refnameRangeTableEntry(List *rtable, char *refname); +extern RangeTblEntry *colnameRangeTableEntry(ParseState *pstate, char *colname); +extern int refnameRangeTablePosn(List *rtable, char *refname); extern RangeTblEntry * -addRangeTableEntry(ParseState * pstate, +addRangeTableEntry(ParseState *pstate, char *relname, char *refname, bool inh, bool inFromCl, - TimeRange * timeRange); + TimeRange *timeRange); extern List * -expandAll(ParseState * pstate, char *relname, char *refname, +expandAll(ParseState *pstate, char *relname, char *refname, int *this_resno); -extern TimeQual +extern TimeQual makeTimeRange(char *datestring1, char *datestring2, int timecode); -extern Expr *make_op(char *opname, Node * ltree, Node * rtree); +extern Expr *make_op(char *opname, Node *ltree, Node *rtree); extern Oid find_atttype(Oid relid, char *attrname); extern Var * -make_var(ParseState * pstate, - char *relname, char *attrname, Oid * type_id); -extern ArrayRef *make_array_ref(Node * array, List * indirection); +make_var(ParseState *pstate, + char *relname, char *attrname, Oid *type_id); +extern ArrayRef *make_array_ref(Node *array, List *indirection); extern ArrayRef * -make_array_set(Expr * target_expr, List * upperIndexpr, - List * lowerIndexpr, Expr * expr); -extern Const *make_const(Value * value); +make_array_set(Expr *target_expr, List *upperIndexpr, + List *lowerIndexpr, Expr *expr); +extern Const *make_const(Value *value); -extern void param_type_init(Oid * typev, int nargs); +extern void param_type_init(Oid *typev, int nargs); extern Oid param_type(int t); /* parser.c (was ylib.c) */ -extern QueryTreeList *parser(char *str, Oid * typev, int nargs); -extern Node *parser_typecast(Value * expr, TypeName * typename, int typlen); -extern Node *parser_typecast2(Node * expr, Oid exprType, Type tp, int typlen); -extern Aggreg *ParseAgg(char *aggname, Oid basetype, Node * target); +extern QueryTreeList *parser(char *str, Oid *typev, int nargs); +extern Node *parser_typecast(Value *expr, TypeName *typename, int typlen); +extern Node *parser_typecast2(Node *expr, Oid exprType, Type tp, int typlen); +extern Aggreg *ParseAgg(char *aggname, Oid basetype, Node *target); extern void -handleTargetColname(ParseState * pstate, char **resname, +handleTargetColname(ParseState *pstate, char **resname, char *refname, char *colname); /* * analyze.c */ -Oid exprType(Node * expr); -QueryTreeList *parse_analyze(List * querytree_list); +Oid exprType(Node *expr); +QueryTreeList *parse_analyze(List *querytree_list); /* define in parse_query.c, used in gram.y */ extern Oid *param_type_info; diff --git a/src/include/parser/parse_state.h b/src/include/parser/parse_state.h index ce41c6cd76..abda19b18c 100644 --- a/src/include/parser/parse_state.h +++ b/src/include/parser/parse_state.h @@ -4,7 +4,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_state.h,v 1.7 1997/09/08 02:38:15 momjian Exp $ + * $Id: parse_state.h,v 1.8 1997/09/08 21:53:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,7 @@ typedef struct ParseState bool p_is_rule; Relation p_target_relation; RangeTblEntry *p_target_rangetblentry; -} ParseState; +} ParseState; #endif /* PARSE_QUERY_H */ diff --git a/src/include/port/hpux.h b/src/include/port/hpux.h index 447b8ee442..68690cd5cd 100644 --- a/src/include/port/hpux.h +++ b/src/include/port/hpux.h @@ -4,7 +4,7 @@ typedef struct { int sem[4]; -} slock_t; +} slock_t; #ifndef BIG_ENDIAN #define BIG_ENDIAN 4321 diff --git a/src/include/postgres.h b/src/include/postgres.h index 706dcc1a41..37d966cf2f 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.8 1997/09/08 02:33:54 momjian Exp $ + * $Id: postgres.h,v 1.9 1997/09/08 21:50:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -91,7 +91,7 @@ typedef struct varlena text; typedef struct char8 { char data[8]; -} char8; +} char8; /* ---------------- * char16 @@ -100,7 +100,7 @@ typedef struct char8 typedef struct char16 { char data[16]; -} char16; +} char16; typedef char16 *Char16; @@ -110,7 +110,7 @@ typedef Oid oid8[8]; typedef struct nameData { char data[NAMEDATALEN]; -} NameData; +} NameData; typedef NameData *Name; /* ---------------- @@ -123,7 +123,7 @@ typedef struct OidInt4Data { Oid oi_oid; int32 oi_int4; -} OidInt4Data; +} OidInt4Data; typedef struct OidInt4Data *OidInt4; @@ -137,7 +137,7 @@ typedef struct OidInt2Data { Oid oi_oid; int16 oi_int2; -} OidInt2Data; +} OidInt2Data; typedef struct OidInt2Data *OidInt2; @@ -151,7 +151,7 @@ typedef struct OidNameData { Oid id; NameData name; -} OidNameData; +} OidNameData; typedef struct OidNameData *OidName; diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h index 94b3ea4a2d..cd9efbceb7 100644 --- a/src/include/regex/regex.h +++ b/src/include/regex/regex.h @@ -51,13 +51,13 @@ typedef struct size_t re_nsub; /* number of parenthesized subexpressions */ const char *re_endp; /* end pointer for REG_PEND */ struct re_guts *re_g; /* none of your business :-) */ -} regex_t; +} regex_t; typedef struct { regoff_t rm_so; /* start of match */ regoff_t rm_eo; /* end of match */ -} regmatch_t; +} regmatch_t; /* regcomp() flags */ #define REG_BASIC 0000 diff --git a/src/include/regex/regex2.h b/src/include/regex/regex2.h index 70b03b0250..564c626c5b 100644 --- a/src/include/regex/regex2.h +++ b/src/include/regex/regex2.h @@ -130,7 +130,7 @@ typedef struct uch hash; /* hash code */ size_t smultis; char *multis; /* -> char[smulti] ab\0cd\0ef\0\0 */ -} cset; +} cset; /* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */ #define CHadd(cs, c) ((cs)->ptr[(uch)(c)] |= (cs)->mask, (cs)->hash += (c)) diff --git a/src/include/rewrite/locks.h b/src/include/rewrite/locks.h index b1336b51c6..94e0563d8f 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.5 1997/09/08 02:38:44 momjian Exp $ + * $Id: locks.h,v 1.6 1997/09/08 21:54:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ #include "rewrite/prs2lock.h" extern List * -matchLocks(CmdType event, RuleLock * rulelocks, int varno, - Query * parsetree); +matchLocks(CmdType event, RuleLock *rulelocks, int varno, + Query *parsetree); #endif /* LOCKS_H */ diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h index b1d2f019d0..183abf5130 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.6 1997/09/08 02:38:46 momjian Exp $ + * $Id: prs2lock.h,v 1.7 1997/09/08 21:54:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,7 @@ typedef struct RewriteRule Node *qual; List *actions; bool isInstead; -} RewriteRule; +} RewriteRule; /* * RuleLock - @@ -40,6 +40,6 @@ typedef struct RuleLock { int numLocks; RewriteRule **rules; -} RuleLock; +} RuleLock; #endif /* REWRITE_H */ diff --git a/src/include/rewrite/rewriteDefine.h b/src/include/rewrite/rewriteDefine.h index 7dfacf3911..ca72f19105 100644 --- a/src/include/rewrite/rewriteDefine.h +++ b/src/include/rewrite/rewriteDefine.h @@ -6,13 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteDefine.h,v 1.3 1997/09/08 02:38:48 momjian Exp $ + * $Id: rewriteDefine.h,v 1.4 1997/09/08 21:54:05 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef REWRITEDEFINE_H #define REWRITEDEFINE_H -extern void DefineQueryRewrite(RuleStmt * args); +extern void DefineQueryRewrite(RuleStmt *args); #endif /* REWRITEDEFINE_H */ diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h index f38e7c048d..344fd7ae51 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.3 1997/09/08 02:38:50 momjian Exp $ + * $Id: rewriteHandler.h,v 1.4 1997/09/08 21:54:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,6 +31,6 @@ struct _rewrite_meta_knowledge typedef struct _rewrite_meta_knowledge RewriteInfo; -extern List *QueryRewrite(Query * parsetree); +extern List *QueryRewrite(Query *parsetree); #endif /* REWRITEHANDLER_H */ diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h index 4a2f0afb20..fc8935f1c8 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.3 1997/09/08 02:38:51 momjian Exp $ + * $Id: rewriteManip.h,v 1.4 1997/09/08 21:54:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,19 +14,19 @@ #define REWRITEMANIP_H /* RewriteManip.c */ -void OffsetVarNodes(Node * node, int offset); -void ChangeVarNodes(Node * node, int old_varno, int new_varno); -void AddQual(Query * parsetree, Node * qual); -void AddNotQual(Query * parsetree, Node * qual); -void FixResdomTypes(List * user_tlist); -void FixNew(RewriteInfo * info, Query * parsetree); +void OffsetVarNodes(Node *node, int offset); +void ChangeVarNodes(Node *node, int old_varno, int new_varno); +void AddQual(Query *parsetree, Node *qual); +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, +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, +HandleViewRule(Query *parsetree, List *rtable, List *targetlist, int rt_index, int *modified); #endif /* REWRITEMANIP_H */ diff --git a/src/include/rewrite/rewriteSupport.h b/src/include/rewrite/rewriteSupport.h index 99f198504e..e7b910250b 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.4 1997/09/08 02:38:52 momjian Exp $ + * $Id: rewriteSupport.h,v 1.5 1997/09/08 21:54:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,8 +18,8 @@ extern int IsDefinedRewriteRule(char *ruleName); extern void prs2_addToRelation(Oid relid, Oid ruleId, CmdType event_type, - AttrNumber attno, bool isInstead, Node * qual, - List * actions); + AttrNumber attno, bool isInstead, Node *qual, + List *actions); extern void prs2_deleteFromRelation(Oid relid, Oid ruleId); diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h index be40014b0b..b0d268be08 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.17 1997/09/08 20:59:00 momjian Exp $ + * $Id: buf_internals.h,v 1.18 1997/09/08 21:54:14 momjian Exp $ * * NOTE * If BUFFERPAGE0 is defined, then 0 will be used as a @@ -212,7 +212,7 @@ extern void InitFreeList(bool init); /* buf_table.c */ extern void InitBufTable(void); -extern BufferDesc *BufTableLookup(BufferTag * tagPtr); +extern BufferDesc *BufTableLookup(BufferTag *tagPtr); extern bool BufTableDelete(BufferDesc *buf); extern bool BufTableInsert(BufferDesc *buf); @@ -231,7 +231,7 @@ extern int NLocBuffer; extern BufferDesc * LocalBufferAlloc(Relation reln, BlockNumber blockNum, - bool * foundPtr); + bool *foundPtr); extern int WriteLocalBuffer(Buffer buffer, bool release); extern int FlushLocalBuffer(Buffer buffer, bool release); extern void InitLocalBuffer(void); diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 469eca4de2..e9afc2e7e1 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.14 1997/09/08 20:59:05 momjian Exp $ + * $Id: bufmgr.h,v 1.15 1997/09/08 21:54:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -82,7 +82,7 @@ ReleaseAndReadBuffer(Buffer buffer, Relation relation, BlockNumber blockNum); extern void InitBufferPool(IPCKey key); -extern void PrintBufferUsage(FILE * statfp); +extern void PrintBufferUsage(FILE *statfp); extern void ResetBufferUsage(void); extern void ResetBufferPool(void); extern int BufferPoolCheckLeak(void); diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h index 4b031746f0..befb6b0849 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.12 1997/09/08 02:38:59 momjian Exp $ + * $Id: bufpage.h,v 1.13 1997/09/08 21:54:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -102,7 +102,7 @@ typedef uint16 LocationIndex; typedef struct OpaqueData { uint16 od_pagesize; -} OpaqueData; +} OpaqueData; typedef OpaqueData *Opaque; @@ -117,7 +117,7 @@ typedef struct PageHeaderData LocationIndex pd_special; /* offset to start of special space */ OpaqueData pd_opaque; /* AM-generic information */ ItemIdData pd_linp[1]; /* line pointers */ -} PageHeaderData; +} PageHeaderData; typedef PageHeaderData *PageHeader; @@ -125,7 +125,7 @@ typedef enum { ShufflePageManagerMode, OverwritePageManagerMode -} PageManagerMode; +} PageManagerMode; /* ---------------- * misc support macros @@ -280,7 +280,7 @@ typedef enum */ extern void PageInit(Page page, Size pageSize, Size specialSize); -extern OffsetNumber +extern OffsetNumber PageAddItem(Page page, Item item, Size size, OffsetNumber offsetNumber, ItemIdFlags flags); extern Page PageGetTempPage(Page page, Size specialSize); diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h index e75a26c045..b62387b668 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.19 1997/09/08 02:39:01 momjian Exp $ + * $Id: ipc.h,v 1.20 1997/09/08 21:54:21 momjian Exp $ * * NOTES * This file is very architecture-specific. This stuff should actually @@ -28,15 +28,15 @@ #if defined(HAS_TEST_AND_SET) -extern void S_LOCK(slock_t * lock); -extern void S_UNLOCK(slock_t * lock); -extern void S_INIT_LOCK(slock_t * lock); +extern void S_LOCK(slock_t *lock); +extern void S_UNLOCK(slock_t *lock); +extern void S_INIT_LOCK(slock_t *lock); #if (defined(alpha) && !defined(linuxalpha)) || \ defined(hpux) || \ defined(irix5) || \ defined(nextstep) -extern int S_LOCK_FREE(slock_t * lock); +extern int S_LOCK_FREE(slock_t *lock); #else #define S_LOCK_FREE(lock) ((*lock) == 0) @@ -93,7 +93,7 @@ extern void exitpg(int code); extern void quasi_exitpg(void); extern int on_exitpg(void (*function) (), caddr_t arg); -extern IpcSemaphoreId +extern IpcSemaphoreId IpcSemaphoreCreate(IpcSemaphoreKey semKey, int semNum, int permission, int semStartValue, int removeOnExit, int *status); @@ -102,7 +102,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 +extern IpcMemoryId IpcMemoryCreate(IpcMemoryKey memKey, uint32 size, int permission); extern IpcMemoryId IpcMemoryIdGet(IpcMemoryKey memKey, uint32 size); @@ -135,7 +135,7 @@ typedef enum _LockId_ PROCSTRUCTLOCKID, FIRSTFREELOCKID -} _LockId_; +} _LockId_; #define MAX_SPINS FIRSTFREELOCKID @@ -148,7 +148,7 @@ typedef struct slock slock_t exlock; slock_t comlock; struct slock *next; -} SLock; +} SLock; extern void ExclusiveLock(int lockid); extern void ExclusiveUnlock(int lockid); @@ -171,7 +171,7 @@ typedef enum _LockId_ PROCSTRUCTLOCKID, OIDGENLOCKID, FIRSTFREELOCKID -} _LockId_; +} _LockId_; #define MAX_SPINS FIRSTFREELOCKID diff --git a/src/include/storage/itemid.h b/src/include/storage/itemid.h index 1c382fb1b9..c6b0abc19b 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.3 1997/09/08 02:39:02 momjian Exp $ + * $Id: itemid.h,v 1.4 1997/09/08 21:54:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,7 @@ typedef struct ItemIdData /* can be reduced by 2 if necc. */ lp_flags:6, /* flags on tuple */ lp_len:13; /* length of tuple */ -} ItemIdData; +} ItemIdData; typedef struct ItemIdData *ItemId; diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h index b6156ca229..5bac77c9fc 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.6 1997/09/08 02:39:03 momjian Exp $ + * $Id: itemptr.h,v 1.7 1997/09/08 21:54:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ typedef struct ItemPointerData { BlockIdData ip_blkid; OffsetNumber ip_posid; -} ItemPointerData; +} ItemPointerData; typedef ItemPointerData *ItemPointer; diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h index 710b1bac5c..276792e19e 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.6 1997/09/08 02:39:03 momjian Exp $ + * $Id: large_object.h,v 1.7 1997/09/08 21:54:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,7 +38,7 @@ typedef struct LargeObjectDesc #define IFS_ATEOF (1 << 2) u_long flags; /* locking info, etc */ -} LargeObjectDesc; +} LargeObjectDesc; /* * Function definitions... @@ -47,11 +47,11 @@ typedef struct LargeObjectDesc /* inversion stuff in inv_api.c */ extern LargeObjectDesc *inv_create(int flags); extern LargeObjectDesc *inv_open(Oid lobjId, int flags); -extern void inv_close(LargeObjectDesc * obj_desc); +extern void inv_close(LargeObjectDesc *obj_desc); extern int inv_destroy(Oid lobjId); -extern int inv_seek(LargeObjectDesc * obj_desc, int offset, int whence); -extern int inv_tell(LargeObjectDesc * obj_desc); -extern int inv_read(LargeObjectDesc * obj_desc, char *buf, int nbytes); -extern int inv_write(LargeObjectDesc * obj_desc, char *buf, int nbytes); +extern int inv_seek(LargeObjectDesc *obj_desc, int offset, int whence); +extern int inv_tell(LargeObjectDesc *obj_desc); +extern int inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes); +extern int inv_write(LargeObjectDesc *obj_desc, char *buf, int nbytes); #endif /* LARGE_OBJECT_H */ diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h index bd8d50f709..2cfea514e1 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.7 1997/09/08 02:39:04 momjian Exp $ + * $Id: lmgr.h,v 1.8 1997/09/08 21:54:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ typedef struct LRelId { Oid relId; /* a relation identifier */ Oid dbId; /* a database identifier */ -} LRelId; +} LRelId; typedef struct LockInfoData { @@ -32,7 +32,7 @@ typedef struct LockInfoData LRelId lRelId; TransactionId transactionIdData; uint16 flags; -} LockInfoData; +} LockInfoData; typedef LockInfoData *LockInfo; #define LockInfoIsValid(linfo) \ @@ -73,7 +73,7 @@ extern void RelationUnsetWIntentLock(Relation relation); /* single.c */ extern bool SingleLockReln(LockInfo linfo, LOCKT lockt, int action); -extern bool +extern bool SingleLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt, int action); diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 8987957534..d7f9b20472 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.7 1997/09/08 02:39:05 momjian Exp $ + * $Id: lock.h,v 1.8 1997/09/08 21:54:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,7 +60,7 @@ typedef struct ltag Oid relId; Oid dbId; ItemPointerData tupleId; -} LOCKTAG; +} LOCKTAG; #define TAGSIZE (sizeof(LOCKTAG)) @@ -91,7 +91,7 @@ typedef struct lockctl int conflictTab[MAX_LOCKTYPES]; int prio[MAX_LOCKTYPES]; SPINLOCK masterLock; -} LOCKCTL; +} LOCKCTL; /* * lockHash -- hash table on lock Ids, @@ -104,7 +104,7 @@ typedef struct ltable HTAB *lockHash; HTAB *xidHash; LOCKCTL *ctl; -} LOCKTAB; +} LOCKTAB; /* ----------------------- * A transaction never conflicts with its own locks. Hence, if @@ -140,7 +140,7 @@ typedef struct XIDTAG SHMEM_OFFSET lock; int pid; TransactionId xid; -} XIDTAG; +} XIDTAG; typedef struct XIDLookupEnt { @@ -151,7 +151,7 @@ typedef struct XIDLookupEnt int holders[MAX_LOCKTYPES]; int nHolding; SHM_QUEUE queue; -} XIDLookupEnt; +} XIDLookupEnt; #define XID_TAGSIZE (sizeof(XIDTAG)) @@ -160,7 +160,7 @@ typedef struct procQueue { SHM_QUEUE links; int size; -} PROC_QUEUE; +} PROC_QUEUE; /* @@ -186,7 +186,7 @@ typedef struct Lock int nHolding; int activeHolders[MAX_LOCKTYPES]; int nActive; -} LOCK; +} LOCK; #define LockGetLock_nHolders(l) l->nHolders @@ -204,16 +204,16 @@ extern SPINLOCK LockMgrLock; */ extern void InitLocks(void); extern void LockDisable(int status); -extern LockTableId -LockTabInit(char *tabName, MASK * conflictsP, int *prioP, +extern LockTableId +LockTabInit(char *tabName, MASK *conflictsP, int *prioP, int ntypes); -extern bool LockAcquire(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt); +extern bool LockAcquire(LockTableId tableId, LOCKTAG *lockName, LOCKT lockt); extern int -LockResolveConflicts(LOCKTAB * ltable, LOCK * lock, LOCKT lockt, +LockResolveConflicts(LOCKTAB *ltable, LOCK *lock, LOCKT lockt, TransactionId xid); -extern bool LockRelease(LockTableId tableId, LOCKTAG * lockName, LOCKT lockt); -extern void GrantLock(LOCK * lock, LOCKT lockt); -extern bool LockReleaseAll(LockTableId tableId, SHM_QUEUE * lockQueue); +extern bool LockRelease(LockTableId tableId, LOCKTAG *lockName, LOCKT lockt); +extern void GrantLock(LOCK *lock, LOCKT lockt); +extern bool LockReleaseAll(LockTableId tableId, SHM_QUEUE *lockQueue); extern int LockShmemSize(void); extern bool LockingDisabled(void); diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index d8ea70918a..5a7c85b0b1 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.7 1997/09/08 02:39:07 momjian Exp $ + * $Id: proc.h,v 1.8 1997/09/08 21:54:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ typedef struct int semNum; IpcSemaphoreId semId; IpcSemaphoreKey semKey; -} SEMA; +} SEMA; /* * Each backend has: @@ -54,7 +54,7 @@ typedef struct proc short sLocks[MAX_SPINS]; /* Spin lock stats */ SHM_QUEUE lockQueue; /* locks associated with current * transaction */ -} PROC; +} PROC; /* @@ -72,7 +72,7 @@ typedef struct procglobal int numProcs; IPCKey currKey; int32 freeSemMap[MAX_PROC_SEMS / PROC_NSEMS_PER_SET]; -} PROC_HDR; +} PROC_HDR; extern PROC *MyProc; @@ -101,13 +101,13 @@ extern bool ProcRemove(int pid); /* extern bool ProcKill(int exitStatus, int pid); */ /* make static in storage/lmgr/proc.c -- jolly */ -extern void ProcQueueInit(PROC_QUEUE * queue); +extern void ProcQueueInit(PROC_QUEUE *queue); extern int -ProcSleep(PROC_QUEUE * queue, SPINLOCK spinlock, int token, - int prio, LOCK * lock); -extern int ProcLockWakeup(PROC_QUEUE * queue, char *ltable, char *lock); -extern void ProcAddLock(SHM_QUEUE * elem); -extern void ProcReleaseSpins(PROC * proc); +ProcSleep(PROC_QUEUE *queue, SPINLOCK spinlock, int token, + int prio, LOCK *lock); +extern int ProcLockWakeup(PROC_QUEUE *queue, char *ltable, char *lock); +extern void ProcAddLock(SHM_QUEUE *elem); +extern void ProcReleaseSpins(PROC *proc); extern void ProcFreeAllSemaphores(void); #endif /* PROC_H */ diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h index a11783f91d..168d4fb969 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.8 1997/09/08 20:59:07 momjian Exp $ + * $Id: shmem.h,v 1.9 1997/09/08 21:54:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,7 +56,7 @@ typedef struct SHM_QUEUE { SHMEM_OFFSET prev; SHMEM_OFFSET next; -} SHM_QUEUE; +} SHM_QUEUE; /* shmem.c */ extern void ShmemBindingTabReset(void); @@ -66,12 +66,12 @@ extern long *ShmemAlloc(unsigned long size); extern int ShmemIsValid(unsigned long addr); extern HTAB * ShmemInitHash(char *name, long init_size, long max_size, - HASHCTL * infoP, int hash_flags); -extern bool ShmemPIDLookup(int pid, SHMEM_OFFSET * locationPtr); + 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, - bool * foundPtr); + bool *foundPtr); extern bool TransactionIdIsInProgress(TransactionId xid); @@ -96,13 +96,13 @@ typedef struct /* * prototypes for functions in shmqueue.c */ -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 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, - SHM_QUEUE * nextQueue); -extern bool SHMQueueEmpty(SHM_QUEUE * queue); +SHMQueueFirst(SHM_QUEUE *queue, Pointer *nextPtrPtr, + SHM_QUEUE *nextQueue); +extern bool SHMQueueEmpty(SHM_QUEUE *queue); #endif /* SHMEM_H */ diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index 1862cda616..d499dc3b35 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.5 1997/09/08 02:39:13 momjian Exp $ + * $Id: sinvaladt.h,v 1.6 1997/09/08 21:54:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,7 +57,7 @@ typedef struct ProcState bool resetState; /* true, if backend has to reset its state */ int tag; /* special tag, recieved from the * postmaster */ -} ProcState; +} ProcState; typedef struct SISeg @@ -74,7 +74,7 @@ typedef struct SISeg ProcState procState[MaxBackendId]; /* reflects the * invalidation state */ /* here starts the entry section, controlled by offsets */ -} SISeg; +} SISeg; #define SizeSISeg sizeof(SISeg) @@ -83,7 +83,7 @@ typedef struct SharedInvalidData int cacheId; /* XXX */ Index hashIndex; ItemPointerData pointerData; -} SharedInvalidData; +} SharedInvalidData; typedef SharedInvalidData *SharedInvalid; @@ -93,7 +93,7 @@ typedef struct SISegEntry SharedInvalidData entryData;/* the message data */ bool isfree; /* entry free? */ Offset next; /* offset to next entry */ -} SISegEntry; +} SISegEntry; #define SizeOfOneSISegEntry sizeof(SISegEntry) @@ -102,7 +102,7 @@ typedef struct SISegOffsets Offset startSegment; /* always 0 (for now) */ Offset offsetToFirstEntry; /* A + a = B */ Offset offsetToEndOfSegemnt; /* A + a + b */ -} SISegOffsets; +} SISegOffsets; /****************************************************************************/ @@ -119,15 +119,15 @@ extern SISeg *shmInvalBuffer; /* * prototypes for functions in sinvaladt.c */ -extern int SIBackendInit(SISeg * segInOutP); +extern int SIBackendInit(SISeg *segInOutP); 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 bool SISetDataEntry(SISeg *segP, SharedInvalidData *data); +extern void SISetProcStateInvalid(SISeg *segP); +extern bool SIDelDataEntry(SISeg *segP); extern void -SIReadEntryData(SISeg * segP, int backendId, +SIReadEntryData(SISeg *segP, int backendId, void (*invalFunction) (), void (*resetFunction) ()); -extern void SIDelExpiredDataEntries(SISeg * segP); +extern void SIDelExpiredDataEntries(SISeg *segP); #endif /* SINVALADT_H */ diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h index 0eeda39c82..813be1f5f9 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.10 1997/09/08 02:39:16 momjian Exp $ + * $Id: dest.h,v 1.11 1997/09/08 21:54:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,7 +53,7 @@ typedef enum RemoteInternal, /* results sent to frontend process in * internal (binary) form */ SPI /* results sent to SPI manager */ -} CommandDest; +} CommandDest; /* AttrInfo* replaced with TupleDesc, now that TupleDesc also has within it diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h index b4c72305aa..37a870286d 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.6 1997/09/08 02:39:19 momjian Exp $ + * $Id: pquery.h,v 1.7 1997/09/08 21:54:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,12 +24,12 @@ extern EState *CreateExecutorState(void); extern void -ProcessPortal(char *portalName, Query * parseTree, - Plan * plan, EState * state, TupleDesc attinfo, +ProcessPortal(char *portalName, Query *parseTree, + Plan *plan, EState *state, TupleDesc attinfo, CommandDest dest); extern void -ProcessQuery(Query * parsetree, Plan * plan, char *argv[], - Oid * typev, int nargs, CommandDest dest); +ProcessQuery(Query *parsetree, Plan *plan, char *argv[], + Oid *typev, int nargs, CommandDest dest); #endif /* pqueryIncluded */ diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index 86883ab642..6142f24e96 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.6 1997/09/08 02:39:20 momjian Exp $ + * $Id: tcopprot.h,v 1.7 1997/09/08 21:54:42 momjian Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -23,11 +23,11 @@ #ifndef BOOTSTRAP_INCLUDE extern List * -pg_plan(char *query_string, Oid * typev, int nargs, - QueryTreeList ** queryListP, CommandDest dest); -extern void pg_eval(char *query_string, char **argv, Oid * typev, int nargs); +pg_plan(char *query_string, Oid *typev, int nargs, + QueryTreeList **queryListP, CommandDest dest); +extern void pg_eval(char *query_string, char **argv, Oid *typev, int nargs); extern void -pg_eval_dest(char *query_string, char **argv, Oid * typev, +pg_eval_dest(char *query_string, char **argv, Oid *typev, int nargs, CommandDest dest); #endif /* BOOTSTRAP_HEADER */ diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h index 6dd5add42c..99b43229ff 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.4 1997/09/08 02:39:21 momjian Exp $ + * $Id: utility.h,v 1.5 1997/09/08 21:54:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,6 +15,6 @@ #include <executor/execdesc.h> -extern void ProcessUtility(Node * parsetree, CommandDest dest); +extern void ProcessUtility(Node *parsetree, CommandDest dest); #endif /* UTILITY_H */ diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index fcf6ca32ec..b35dbd199a 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.10 1997/09/08 20:59:15 momjian Exp $ + * $Id: acl.h,v 1.11 1997/09/08 21:54:47 momjian Exp $ * * NOTES * For backward-compatability purposes we have to allow there @@ -142,7 +142,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, +makeAclStmt(char *privs, List *rel_list, char *grantee, char grant_or_revoke); /* @@ -165,10 +165,10 @@ extern char *get_groname(AclId grosysid); /* XXX move these elsewhere -pma */ extern int32 pg_aclcheck(char *relname, char *usename, AclMode mode); extern int32 pg_ownercheck(char *usename, char *value, int cacheid); -extern int32 +extern int32 pg_func_ownercheck(char *usename, char *funcname, - int nargs, Oid * arglist); -extern int32 + int nargs, Oid *arglist); +extern int32 pg_aggr_ownercheck(char *usename, char *aggname, Oid basetypeID); diff --git a/src/include/utils/array.h b/src/include/utils/array.h index b8116065d4..d09330e92a 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.7 1997/09/08 20:59:18 momjian Exp $ + * $Id: array.h,v 1.8 1997/09/08 21:54:49 momjian Exp $ * * NOTES * XXX the data array should be LONGALIGN'd -- notice that the array @@ -109,27 +109,27 @@ typedef struct { char lo_name[NAME_LEN]; int C[MAXDIM]; -} CHUNK_INFO; +} CHUNK_INFO; /* * prototypes for functions defined in arrayfuncs.c */ extern char *array_in(char *string, Oid element_type); extern char *array_out(ArrayType *v, Oid element_type); -extern char *array_dims(ArrayType *v, bool * isNull); -extern Datum +extern char *array_dims(ArrayType *v, bool *isNull); +extern Datum array_ref(ArrayType *array, int n, int indx[], int reftype, - int elmlen, int arraylen, bool * isNull); -extern Datum + int elmlen, int arraylen, bool *isNull); +extern Datum array_clip(ArrayType *array, int n, int upperIndx[], - int lowerIndx[], int reftype, int len, bool * isNull); + int lowerIndx[], int reftype, int len, bool *isNull); extern char * array_set(ArrayType *array, int n, int indx[], char *dataPtr, - int reftype, int elmlen, int arraylen, bool * isNull); + int reftype, int elmlen, int arraylen, bool *isNull); extern char * array_assgn(ArrayType *array, int n, int upperIndx[], int lowerIndx[], ArrayType *newArr, int reftype, - int len, bool * isNull); + int len, bool *isNull); extern int array_eq(ArrayType *array1, ArrayType *array2); extern int _LOtransfer(char **destfd, int size, int nitems, char **srcfd, @@ -157,14 +157,14 @@ 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, +_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, - char *destfp, ArrayType *array, int isDestLO, bool * isNull); + char *destfp, ArrayType *array, int isDestLO, bool *isNull); extern struct varlena * _ReadChunkArray1El(int st[], int bsize, int fp, - ArrayType *array, bool * isNull); + ArrayType *array, bool *isNull); #endif /* ARRAY_H */ diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index f7fc9d2190..58d6885f35 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.24 1997/09/08 20:59:19 momjian Exp $ + * $Id: builtins.h,v 1.25 1997/09/08 21:54:50 momjian Exp $ * * NOTES * This should normally only be included by fmgr.h. @@ -92,7 +92,7 @@ extern int32 char8cmp(char *arg1, char *arg2); extern int32 int2in(char *num); extern char *int2out(int16 sh); extern int16 *int28in(char *shs); -extern char *int28out(int16(*shs)[]); +extern char *int28out(int16 (*shs)[]); extern int32 *int44in(char *input_string); extern char *int44out(int32 an_array[]); extern int32 int4in(char *num); @@ -123,7 +123,7 @@ extern bool int42lt(int32 arg1, int32 arg2); extern bool int42le(int32 arg1, int32 arg2); extern bool int42gt(int32 arg1, int32 arg2); extern bool int42ge(int32 arg1, int32 arg2); -extern bool keyfirsteq(int16 * arg1, int16 arg2); +extern bool keyfirsteq(int16 *arg1, int16 arg2); extern int32 int4um(int32 arg); extern int32 int4pl(int32 arg1, int32 arg2); extern int32 int4mi(int32 arg1, int32 arg2); @@ -157,13 +157,13 @@ extern int32 int4smaller(int32 arg1, int32 arg2); /* name.c */ extern NameData *namein(char *s); -extern char *nameout(NameData * s); -extern bool nameeq(NameData * arg1, NameData * arg2); -extern bool namene(NameData * arg1, NameData * arg2); -extern bool namelt(NameData * arg1, NameData * arg2); -extern bool namele(NameData * arg1, NameData * arg2); -extern bool namegt(NameData * arg1, NameData * arg2); -extern bool namege(NameData * arg1, NameData * arg2); +extern char *nameout(NameData *s); +extern bool nameeq(NameData *arg1, NameData *arg2); +extern bool namene(NameData *arg1, NameData *arg2); +extern bool namelt(NameData *arg1, NameData *arg2); +extern bool namele(NameData *arg1, NameData *arg2); +extern bool namegt(NameData *arg1, NameData *arg2); +extern bool namege(NameData *arg1, NameData *arg2); extern int namecmp(Name n1, Name n2); extern int namecpy(Name n1, Name n2); extern int namestrcpy(Name name, char *str); @@ -195,7 +195,7 @@ extern int32 btchar2cmp(uint16 a, uint16 b); extern int32 btchar4cmp(uint32 a, uint32 b); extern int32 btchar8cmp(char *a, char *b); extern int32 btchar16cmp(char *a, char *b); -extern int32 btnamecmp(NameData * a, NameData * b); +extern int32 btnamecmp(NameData *a, NameData *b); extern int32 bttextcmp(struct varlena * a, struct varlena * b); /* support routines for the rtree access method, by opclass */ @@ -203,9 +203,9 @@ extern BOX *rt_box_union(BOX *a, BOX *b); extern BOX *rt_box_inter(BOX *a, BOX *b); extern void rt_box_size(BOX *a, float *size); extern void rt_bigbox_size(BOX *a, float *size); -extern void rt_poly_size(POLYGON * a, float *size); -extern POLYGON *rt_poly_union(POLYGON * a, POLYGON * b); -extern POLYGON *rt_poly_inter(POLYGON * a, POLYGON * b); +extern void rt_poly_size(POLYGON *a, float *size); +extern POLYGON *rt_poly_union(POLYGON *a, POLYGON *b); +extern POLYGON *rt_poly_inter(POLYGON *a, POLYGON *b); /* projection utilities */ /* extern char *GetAttributeByName(); @@ -222,7 +222,7 @@ extern int32 reltimein(char *timestring); extern char *reltimeout(int32 timevalue); extern TimeInterval tintervalin(char *intervalstr); extern char *tintervalout(TimeInterval interval); -extern RelativeTime timespan_reltime(TimeSpan * timespan); +extern RelativeTime timespan_reltime(TimeSpan *timespan); extern TimeSpan *reltime_timespan(RelativeTime reltime); extern TimeInterval mktinterval(AbsoluteTime t1, AbsoluteTime t2); extern AbsoluteTime timepl(AbsoluteTime t1, RelativeTime t2); @@ -254,9 +254,9 @@ extern text *timeofday(void); /* dt.c */ extern DateTime *datetime_in(char *str); -extern char *datetime_out(DateTime * datetime); +extern char *datetime_out(DateTime *datetime); extern TimeSpan *timespan_in(char *str); -extern char *timespan_out(TimeSpan * timespan); +extern char *timespan_out(TimeSpan *timespan); extern int datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn); /* filename.c */ @@ -341,8 +341,8 @@ extern bool float84ge(float64 arg1, float32 arg2); extern double *box_area(BOX *box); /* misc.c */ -extern bool nullvalue(Datum value, bool * isNull); -extern bool nonnullvalue(Datum value, bool * isNull); +extern bool nullvalue(Datum value, bool *isNull); +extern bool nonnullvalue(Datum value, bool *isNull); extern bool oidrand(Oid o, int32 X); extern bool oidsrand(int32 X); extern int32 userfntest(int i); @@ -357,7 +357,7 @@ extern bool oidnotin(Oid the_oid, char *compare); /* oid.c */ extern Oid *oid8in(char *oidString); -extern char *oid8out(Oid(*oidArray)[]); +extern char *oid8out(Oid (*oidArray)[]); extern Oid oidin(char *s); extern char *oidout(Oid o); extern bool oideq(Oid arg1, Oid arg2); @@ -375,8 +375,8 @@ extern bool char8regexeq(char *s, struct varlena * p); extern bool char8regexne(char *s, struct varlena * p); extern bool char16regexeq(char *s, struct varlena * p); extern bool char16regexne(char *s, struct varlena * p); -extern bool nameregexeq(NameData * n, struct varlena * p); -extern bool nameregexne(NameData * s, struct varlena * p); +extern bool nameregexeq(NameData *n, struct varlena * p); +extern bool nameregexne(NameData *s, struct varlena * p); extern bool textregexeq(struct varlena * s, struct varlena * p); extern bool textregexne(struct varlena * s, struct varlena * p); extern bool char2icregexeq(uint16 arg1, struct varlena * p); @@ -387,8 +387,8 @@ extern bool char8icregexeq(char *s, struct varlena * p); extern bool char8icregexne(char *s, struct varlena * p); extern bool char16icregexeq(char *s, struct varlena * p); extern bool char16icregexne(char *s, struct varlena * p); -extern bool nameicregexeq(NameData * s, struct varlena * p); -extern bool nameicregexne(NameData * s, struct varlena * p); +extern bool nameicregexeq(NameData *s, struct varlena * p); +extern bool nameicregexne(NameData *s, struct varlena * p); extern bool texticregexeq(struct varlena * s, struct varlena * p); extern bool texticregexne(struct varlena * s, struct varlena * p); @@ -462,14 +462,14 @@ extern struct varlena *byteain(char *inputText); extern char *byteaout(struct varlena * vlena); extern struct varlena *textin(char *inputText); extern char *textout(struct varlena * vlena); -extern text *textcat(text * t1, text * t2); +extern text *textcat(text *t1, text *t2); extern bool texteq(struct varlena * arg1, struct varlena * arg2); extern bool textne(struct varlena * arg1, struct varlena * arg2); extern bool text_lt(struct varlena * arg1, struct varlena * arg2); extern bool text_le(struct varlena * arg1, struct varlena * arg2); extern bool text_gt(struct varlena * arg1, struct varlena * arg2); extern bool text_ge(struct varlena * arg1, struct varlena * arg2); -extern int32 textpos(text * t1, text * t2); +extern int32 textpos(text *t1, text *t2); extern int32 byteaGetSize(struct varlena * v); extern int32 byteaGetByte(struct varlena * v, int32 n); extern int32 byteaGetBit(struct varlena * v, int32 n); @@ -492,19 +492,19 @@ extern int32 date_mi(DateADT dateVal1, DateADT dateVal2); extern DateADT date_pli(DateADT dateVal, int32 days); extern DateADT date_mii(DateADT dateVal, int32 days); extern DateTime *date_datetime(DateADT date); -extern DateADT datetime_date(DateTime * datetime); -extern DateTime *datetime_datetime(DateADT date, TimeADT * time); +extern DateADT datetime_date(DateTime *datetime); +extern DateTime *datetime_datetime(DateADT date, TimeADT *time); extern DateADT abstime_date(AbsoluteTime abstime); extern TimeADT *time_in(char *timestr); -extern char *time_out(TimeADT * time); -extern bool time_eq(TimeADT * time1, TimeADT * time2); -extern bool time_ne(TimeADT * time1, TimeADT * time2); -extern bool time_lt(TimeADT * time1, TimeADT * time2); -extern bool time_le(TimeADT * time1, TimeADT * time2); -extern bool time_gt(TimeADT * time1, TimeADT * time2); -extern bool time_ge(TimeADT * time1, TimeADT * time2); -extern int time_cmp(TimeADT * time1, TimeADT * time2); +extern char *time_out(TimeADT *time); +extern bool time_eq(TimeADT *time1, TimeADT *time2); +extern bool time_ne(TimeADT *time1, TimeADT *time2); +extern bool time_lt(TimeADT *time1, TimeADT *time2); +extern bool time_le(TimeADT *time1, TimeADT *time2); +extern bool time_gt(TimeADT *time1, TimeADT *time2); +extern bool time_ge(TimeADT *time1, TimeADT *time2); +extern int time_cmp(TimeADT *time1, TimeADT *time2); extern int32 int42reltime(int32 timevalue); /* like.c */ @@ -516,22 +516,22 @@ extern bool char8like(char *s, struct varlena * p); extern bool char8nlike(char *s, struct varlena * p); extern bool char16like(char *s, struct varlena * p); extern bool char16nlike(char *s, struct varlena * p); -extern bool namelike(NameData * n, struct varlena * p); -extern bool namenlike(NameData * s, struct varlena * p); +extern bool namelike(NameData *n, struct varlena * p); +extern bool namenlike(NameData *s, struct varlena * p); extern bool textlike(struct varlena * s, struct varlena * p); extern bool textnlike(struct varlena * s, struct varlena * p); /* oracle_compat.c */ -extern text *lower(text * string); -extern text *upper(text * string); -extern text *initcap(text * string); -extern text *lpad(text * string1, int4 len, text * string2); -extern text *rpad(text * string1, int4 len, text * string2); -extern text *ltrim(text * string, text * set); -extern text *rtrim(text * string, text * set); -extern text *substr(text * string, int4 m, int4 n); -extern text *translate(text * string, char from, char to); +extern text *lower(text *string); +extern text *upper(text *string); +extern text *initcap(text *string); +extern text *lpad(text *string1, int4 len, text *string2); +extern text *rpad(text *string1, int4 len, text *string2); +extern text *ltrim(text *string, text *set); +extern text *rtrim(text *string, text *set); +extern text *substr(text *string, int4 m, int4 n); +extern text *translate(text *string, char from, char to); /* acl.c */ diff --git a/src/include/utils/cash.h b/src/include/utils/cash.h index 4a88219090..dc1692dee9 100644 --- a/src/include/utils/cash.h +++ b/src/include/utils/cash.h @@ -12,24 +12,24 @@ /* if we store this as 4 bytes, we better make it int, not long, bjm */ typedef signed int Cash; -extern const char *cash_out(Cash * value); +extern const char *cash_out(Cash *value); extern Cash *cash_in(const char *str); -extern bool cash_eq(Cash * c1, Cash * c2); -extern bool cash_ne(Cash * c1, Cash * c2); -extern bool cash_lt(Cash * c1, Cash * c2); -extern bool cash_le(Cash * c1, Cash * c2); -extern bool cash_gt(Cash * c1, Cash * c2); -extern bool cash_ge(Cash * c1, Cash * c2); +extern bool cash_eq(Cash *c1, Cash *c2); +extern bool cash_ne(Cash *c1, Cash *c2); +extern bool cash_lt(Cash *c1, Cash *c2); +extern bool cash_le(Cash *c1, Cash *c2); +extern bool cash_gt(Cash *c1, Cash *c2); +extern bool cash_ge(Cash *c1, Cash *c2); -extern Cash *cash_pl(Cash * c1, Cash * c2); -extern Cash *cash_mi(Cash * c1, Cash * c2); -extern Cash *cash_mul(Cash * c, float8 * f); -extern Cash *cash_div(Cash * c, float8 * f); +extern Cash *cash_pl(Cash *c1, Cash *c2); +extern Cash *cash_mi(Cash *c1, Cash *c2); +extern Cash *cash_mul(Cash *c, float8 *f); +extern Cash *cash_div(Cash *c, float8 *f); -extern Cash *cashlarger(Cash * c1, Cash * c2); -extern Cash *cashsmaller(Cash * c1, Cash * c2); +extern Cash *cashlarger(Cash *c1, Cash *c2); +extern Cash *cashsmaller(Cash *c1, Cash *c2); -extern const char *cash_words_out(Cash * value); +extern const char *cash_words_out(Cash *value); #endif /* CASH_H */ diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index c7dc628344..d84da610ec 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.7 1997/09/08 02:39:34 momjian Exp $ + * $Id: catcache.h,v 1.8 1997/09/08 21:54:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,7 @@ typedef struct catctup Dlelem *ct_node; /* points to LRU list is the CatCTup is in * the cache, else, points to the cache if * the CatCTup is in LRU list */ -} CatCTup; +} CatCTup; /* voodoo constants */ #define NCCBUCK 500 /* CatCache buckets */ @@ -43,7 +43,7 @@ typedef struct catcache Oid indexId; char *cc_relname; /* relation name for defered open */ char *cc_indname; /* index name for defered open */ - HeapTuple(*cc_iscanfunc) (); /* index scanfunction */ + HeapTuple (*cc_iscanfunc) (); /* index scanfunction */ TupleDesc cc_tupdesc; /* tuple descriptor from reldesc */ int id; /* XXX could be improved -hirohama */ short cc_ntup; /* # of tuples in this cache */ @@ -56,7 +56,7 @@ typedef struct catcache struct catcache *cc_next; Dllist *cc_lrulist; /* LRU list, most recent first */ Dllist *cc_cache[NCCBUCK + 1]; -} CatCache; +} CatCache; #define InvalidCatalogCacheId (-1) @@ -69,8 +69,8 @@ CatalogCacheIdInvalidate(int cacheId, Index hashIndex, extern void ResetSystemCache(void); extern CatCache * InitSysCache(char *relname, char *indname, int id, int nkeys, - int key[], HeapTuple(*iScanfuncP) ()); -extern HeapTuple + int key[], HeapTuple (*iScanfuncP) ()); +extern HeapTuple SearchSysCache(struct catcache * cache, Datum v1, Datum v2, Datum v3, Datum v4); extern void diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h index 8fcd213656..923df6c96a 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.4 1997/09/08 02:39:36 momjian Exp $ + * $Id: datum.h,v 1.5 1997/09/08 21:54:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,7 +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 +extern bool datumIsEqual(Datum value1, Datum value2, Oid type, bool byVal, Size len); diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h index 8634b7f03c..64d270ed74 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.20 1997/09/08 02:39:37 momjian Exp $ + * $Id: dt.h,v 1.21 1997/09/08 21:54:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,7 +36,7 @@ typedef struct * years */ int4 month; /* months and years, after time for * alignment */ -} TimeSpan; +} TimeSpan; /* ---------------------------------------------------------------- @@ -191,7 +191,7 @@ typedef struct #endif /* aix */ char type; char value; /* this may be unsigned, alas */ -} datetkn; +} datetkn; #ifdef NAN #define DT_INVALID (NAN) @@ -260,52 +260,52 @@ extern int datetime_is_epoch(double j); */ extern DateTime *datetime_in(char *str); -extern char *datetime_out(DateTime * dt); -extern bool datetime_eq(DateTime * dt1, DateTime * dt2); -extern bool datetime_ne(DateTime * dt1, DateTime * dt2); -extern bool datetime_lt(DateTime * dt1, DateTime * dt2); -extern bool datetime_le(DateTime * dt1, DateTime * dt2); -extern bool datetime_ge(DateTime * dt1, DateTime * dt2); -extern bool datetime_gt(DateTime * dt1, DateTime * dt2); -extern bool datetime_finite(DateTime * datetime); -extern int datetime_cmp(DateTime * dt1, DateTime * dt2); -extern DateTime *datetime_smaller(DateTime * dt1, DateTime * dt2); -extern DateTime *datetime_larger(DateTime * dt1, DateTime * dt2); +extern char *datetime_out(DateTime *dt); +extern bool datetime_eq(DateTime *dt1, DateTime *dt2); +extern bool datetime_ne(DateTime *dt1, DateTime *dt2); +extern bool datetime_lt(DateTime *dt1, DateTime *dt2); +extern bool datetime_le(DateTime *dt1, DateTime *dt2); +extern bool datetime_ge(DateTime *dt1, DateTime *dt2); +extern bool datetime_gt(DateTime *dt1, DateTime *dt2); +extern bool datetime_finite(DateTime *datetime); +extern int datetime_cmp(DateTime *dt1, DateTime *dt2); +extern DateTime *datetime_smaller(DateTime *dt1, DateTime *dt2); +extern DateTime *datetime_larger(DateTime *dt1, DateTime *dt2); extern TimeSpan *timespan_in(char *str); -extern char *timespan_out(TimeSpan * span); -extern bool timespan_eq(TimeSpan * span1, TimeSpan * span2); -extern bool timespan_ne(TimeSpan * span1, TimeSpan * span2); -extern bool timespan_lt(TimeSpan * span1, TimeSpan * span2); -extern bool timespan_le(TimeSpan * span1, TimeSpan * span2); -extern bool timespan_ge(TimeSpan * span1, TimeSpan * span2); -extern bool timespan_gt(TimeSpan * span1, TimeSpan * span2); -extern int timespan_cmp(TimeSpan * span1, TimeSpan * span2); -extern TimeSpan *timespan_smaller(TimeSpan * span1, TimeSpan * span2); -extern TimeSpan *timespan_larger(TimeSpan * span1, TimeSpan * span2); - -extern text *datetime_text(DateTime * datetime); -extern DateTime *text_datetime(text * str); -extern text *timespan_text(TimeSpan * timespan); -extern DateTime *datetime_trunc(text * units, DateTime * datetime); -extern TimeSpan *timespan_trunc(text * units, TimeSpan * timespan); -extern float64 datetime_part(text * units, DateTime * datetime); -extern float64 timespan_part(text * units, TimeSpan * timespan); -extern text *datetime_zone(text * zone, DateTime * datetime); - -extern TimeSpan *timespan_um(TimeSpan * span); -extern TimeSpan *timespan_pl(TimeSpan * span1, TimeSpan * span2); -extern TimeSpan *timespan_mi(TimeSpan * span1, TimeSpan * span2); -extern TimeSpan *timespan_div(TimeSpan * span1, float8 * arg2); - -extern TimeSpan *datetime_mi(DateTime * dt1, DateTime * dt2); -extern DateTime *datetime_pl_span(DateTime * dt, TimeSpan * span); -extern DateTime *datetime_mi_span(DateTime * dt, TimeSpan * span); -extern TimeSpan *datetime_age(DateTime * dt1, DateTime * dt2); +extern char *timespan_out(TimeSpan *span); +extern bool timespan_eq(TimeSpan *span1, TimeSpan *span2); +extern bool timespan_ne(TimeSpan *span1, TimeSpan *span2); +extern bool timespan_lt(TimeSpan *span1, TimeSpan *span2); +extern bool timespan_le(TimeSpan *span1, TimeSpan *span2); +extern bool timespan_ge(TimeSpan *span1, TimeSpan *span2); +extern bool timespan_gt(TimeSpan *span1, TimeSpan *span2); +extern int timespan_cmp(TimeSpan *span1, TimeSpan *span2); +extern TimeSpan *timespan_smaller(TimeSpan *span1, TimeSpan *span2); +extern TimeSpan *timespan_larger(TimeSpan *span1, TimeSpan *span2); + +extern text *datetime_text(DateTime *datetime); +extern DateTime *text_datetime(text *str); +extern text *timespan_text(TimeSpan *timespan); +extern DateTime *datetime_trunc(text *units, DateTime *datetime); +extern TimeSpan *timespan_trunc(text *units, TimeSpan *timespan); +extern float64 datetime_part(text *units, DateTime *datetime); +extern float64 timespan_part(text *units, TimeSpan *timespan); +extern text *datetime_zone(text *zone, DateTime *datetime); + +extern TimeSpan *timespan_um(TimeSpan *span); +extern TimeSpan *timespan_pl(TimeSpan *span1, TimeSpan *span2); +extern TimeSpan *timespan_mi(TimeSpan *span1, TimeSpan *span2); +extern TimeSpan *timespan_div(TimeSpan *span1, float8 *arg2); + +extern TimeSpan *datetime_mi(DateTime *dt1, DateTime *dt2); +extern DateTime *datetime_pl_span(DateTime *dt, TimeSpan *span); +extern DateTime *datetime_mi_span(DateTime *dt, TimeSpan *span); +extern TimeSpan *datetime_age(DateTime *dt1, DateTime *dt2); extern void GetCurrentTime(struct tm * tm); extern DateTime SetDateTime(DateTime datetime); -extern int tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime * dt); +extern int tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *dt); extern void j2date(int jd, int *year, int *month, int *day); extern int date2j(int year, int month, int day); diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h index 7c8b075a90..13ed4174f3 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.7 1997/09/08 02:39:38 momjian Exp $ + * $Id: dynamic_loader.h,v 1.8 1997/09/08 21:54:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,7 +34,7 @@ typedef struct df_files ino_t inode; /* Inode number of file */ void *handle; /* a handle for pg_dl* functions */ struct df_files *next; -} DynamicFileList; +} DynamicFileList; extern void *pg_dlopen(char *filename); extern func_ptr pg_dlsym(void *handle, char *funcname); diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h index c8b791cb6f..bdc9a83d0e 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.9 1997/09/08 02:39:41 momjian Exp $ + * $Id: exc.h,v 1.10 1997/09/08 21:54:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,7 +43,7 @@ typedef struct ExcFrame ExcDetail detail; ExcData data; ExcMessage message; -} ExcFrame; +} ExcFrame; extern ExcFrame *ExcCurFrameP; @@ -71,7 +71,7 @@ extern ExcFrame *ExcCurFrameP; #define reraise() \ raise4(*exception.id,exception.detail,exception.data,exception.message) -typedef void ExcProc(Exception *, ExcDetail, ExcData, ExcMessage); +typedef void ExcProc (Exception *, ExcDetail, ExcData, ExcMessage); /* @@ -79,7 +79,7 @@ typedef void ExcProc(Exception *, ExcDetail, ExcData, ExcMessage); */ extern void EnableExceptionHandling(bool on); extern void -ExcRaise(Exception * excP, +ExcRaise(Exception *excP, ExcDetail detail, ExcData data, ExcMessage message); @@ -89,7 +89,7 @@ ExcRaise(Exception * excP, * prototypes for functions in excabort.c */ extern void -ExcAbort(const Exception * excP, ExcDetail detail, ExcData data, +ExcAbort(const Exception *excP, ExcDetail detail, ExcData data, ExcMessage message); #endif /* EXC_H */ diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h index af8111676e..f9ace84b13 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.4 1997/09/08 02:39:43 momjian Exp $ + * $Id: fcache.h,v 1.5 1997/09/08 21:54:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,6 +49,7 @@ typedef struct * of tuples */ bool istrusted; /* trusted fn? */ -} FunctionCache, *FunctionCachePtr; +} FunctionCache, + *FunctionCachePtr; #endif /* FCACHE_H */ diff --git a/src/include/utils/fcache2.h b/src/include/utils/fcache2.h index bf9c7fb0c6..9ed3c76603 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.4 1997/09/08 02:39:43 momjian Exp $ + * $Id: fcache2.h,v 1.5 1997/09/08 21:55:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,6 +16,6 @@ #include <nodes/execnodes.h> extern void - setFcache(Node * node, Oid foid, List * argList, ExprContext * econtext); + setFcache(Node *node, Oid foid, List *argList, ExprContext *econtext); #endif /* FCACHE2_H */ diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h index a94e7f4811..953f181137 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.6 1997/09/08 02:39:44 momjian Exp $ + * $Id: fmgrtab.h,v 1.7 1997/09/08 21:55:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,7 @@ typedef struct uint16 nargs; func_ptr func; char *funcName; -} FmgrCall; +} FmgrCall; extern FmgrCall *fmgr_isbuiltin(Oid id); extern func_ptr fmgr_lookupByName(char *name); diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h index be308f28ae..878f1bb418 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.11 1997/09/08 20:59:21 momjian Exp $ + * $Id: geo_decls.h,v 1.12 1997/09/08 21:55:06 momjian Exp $ * * NOTE * These routines do *not* use the float types from adt/. @@ -67,7 +67,7 @@ typedef struct { double x, y; -} Point; +} Point; /*--------------------------------------------------------------------- @@ -78,7 +78,7 @@ typedef struct Point p[2]; double m; /* precomputed to save time, not in tuple */ -} LSEG; +} LSEG; /*--------------------------------------------------------------------- @@ -91,7 +91,7 @@ typedef struct int32 closed; /* is this a closed polygon? */ int32 dummy; /* padding to make it double align */ Point p[1]; /* variable length array of POINTs */ -} PATH; +} PATH; /*--------------------------------------------------------------------- @@ -109,7 +109,7 @@ typedef struct C; double m; -} LINE; +} LINE; /*--------------------------------------------------------------------- @@ -133,7 +133,7 @@ typedef struct int32 npts; BOX boundbox; Point p[1]; /* variable length array of POINTs */ -} POLYGON; +} POLYGON; /*--------------------------------------------------------------------- * CIRCLE - Specified by a center point and radius. @@ -142,7 +142,7 @@ typedef struct { Point center; double radius; -} CIRCLE; +} CIRCLE; /* * in geo_ops.h @@ -150,65 +150,65 @@ typedef struct /* public point routines */ extern Point *point_in(char *str); -extern char *point_out(Point * pt); -extern bool point_left(Point * pt1, Point * pt2); -extern bool point_right(Point * pt1, Point * pt2); -extern bool point_above(Point * pt1, Point * pt2); -extern bool point_below(Point * pt1, Point * pt2); -extern bool point_vert(Point * pt1, Point * pt2); -extern bool point_horiz(Point * pt1, Point * pt2); -extern bool point_eq(Point * pt1, Point * pt2); -extern int32 pointdist(Point * p1, Point * p2); -extern double *point_distance(Point * pt1, Point * pt2); -extern double *point_slope(Point * pt1, Point * pt2); +extern char *point_out(Point *pt); +extern bool point_left(Point *pt1, Point *pt2); +extern bool point_right(Point *pt1, Point *pt2); +extern bool point_above(Point *pt1, Point *pt2); +extern bool point_below(Point *pt1, Point *pt2); +extern bool point_vert(Point *pt1, Point *pt2); +extern bool point_horiz(Point *pt1, Point *pt2); +extern bool point_eq(Point *pt1, Point *pt2); +extern int32 pointdist(Point *p1, Point *p2); +extern double *point_distance(Point *pt1, Point *pt2); +extern double *point_slope(Point *pt1, Point *pt2); /* private routines */ -extern double point_dt(Point * pt1, Point * pt2); -extern double point_sl(Point * pt1, Point * pt2); +extern double point_dt(Point *pt1, Point *pt2); +extern double point_sl(Point *pt1, Point *pt2); -extern Point *point(float8 * x, float8 * y); -extern Point *point_add(Point * p1, Point * p2); -extern Point *point_sub(Point * p1, Point * p2); -extern Point *point_mul(Point * p1, Point * p2); -extern Point *point_div(Point * p1, Point * p2); +extern Point *point(float8 *x, float8 *y); +extern Point *point_add(Point *p1, Point *p2); +extern Point *point_sub(Point *p1, Point *p2); +extern Point *point_mul(Point *p1, Point *p2); +extern Point *point_div(Point *p1, Point *p2); /* public lseg routines */ extern LSEG *lseg_in(char *str); -extern char *lseg_out(LSEG * ls); -extern bool lseg_intersect(LSEG * l1, LSEG * l2); -extern bool lseg_parallel(LSEG * l1, LSEG * l2); -extern bool lseg_perp(LSEG * l1, LSEG * l2); -extern bool lseg_vertical(LSEG * lseg); -extern bool lseg_horizontal(LSEG * lseg); -extern bool lseg_eq(LSEG * l1, LSEG * l2); -extern double *lseg_distance(LSEG * l1, LSEG * l2); -extern Point *lseg_center(LSEG * lseg); -extern Point *lseg_interpt(LSEG * l1, LSEG * l2); -extern double *dist_pl(Point * pt, LINE * line); -extern double *dist_ps(Point * pt, LSEG * lseg); -extern double *dist_ppath(Point * pt, PATH * path); -extern double *dist_pb(Point * pt, BOX *box); -extern double *dist_sl(LSEG * lseg, LINE * line); -extern double *dist_sb(LSEG * lseg, BOX *box); -extern double *dist_lb(LINE * line, BOX *box); -extern Point *close_pl(Point * pt, LINE * line); -extern Point *close_ps(Point * pt, LSEG * lseg); -extern Point *close_pb(Point * pt, BOX *box); -extern Point *close_sl(LSEG * lseg, LINE * line); -extern Point *close_sb(LSEG * lseg, BOX *box); -extern Point *close_lb(LINE * line, BOX *box); -extern bool on_pl(Point * pt, LINE * line); -extern bool on_ps(Point * pt, LSEG * lseg); -extern bool on_pb(Point * pt, BOX *box); -extern bool on_ppath(Point * pt, PATH * path); -extern bool on_sl(LSEG * lseg, LINE * line); -extern bool on_sb(LSEG * lseg, BOX *box); -extern bool inter_sl(LSEG * lseg, LINE * line); -extern bool inter_sb(LSEG * lseg, BOX *box); -extern bool inter_lb(LINE * line, BOX *box); +extern char *lseg_out(LSEG *ls); +extern bool lseg_intersect(LSEG *l1, LSEG *l2); +extern bool lseg_parallel(LSEG *l1, LSEG *l2); +extern bool lseg_perp(LSEG *l1, LSEG *l2); +extern bool lseg_vertical(LSEG *lseg); +extern bool lseg_horizontal(LSEG *lseg); +extern bool lseg_eq(LSEG *l1, LSEG *l2); +extern double *lseg_distance(LSEG *l1, LSEG *l2); +extern Point *lseg_center(LSEG *lseg); +extern Point *lseg_interpt(LSEG *l1, LSEG *l2); +extern double *dist_pl(Point *pt, LINE *line); +extern double *dist_ps(Point *pt, LSEG *lseg); +extern double *dist_ppath(Point *pt, PATH *path); +extern double *dist_pb(Point *pt, BOX *box); +extern double *dist_sl(LSEG *lseg, LINE *line); +extern double *dist_sb(LSEG *lseg, BOX *box); +extern double *dist_lb(LINE *line, BOX *box); +extern Point *close_pl(Point *pt, LINE *line); +extern Point *close_ps(Point *pt, LSEG *lseg); +extern Point *close_pb(Point *pt, BOX *box); +extern Point *close_sl(LSEG *lseg, LINE *line); +extern Point *close_sb(LSEG *lseg, BOX *box); +extern Point *close_lb(LINE *line, BOX *box); +extern bool on_pl(Point *pt, LINE *line); +extern bool on_ps(Point *pt, LSEG *lseg); +extern bool on_pb(Point *pt, BOX *box); +extern bool on_ppath(Point *pt, PATH *path); +extern bool on_sl(LSEG *lseg, LINE *line); +extern bool on_sb(LSEG *lseg, BOX *box); +extern bool inter_sl(LSEG *lseg, LINE *line); +extern bool inter_sb(LSEG *lseg, BOX *box); +extern bool inter_lb(LINE *line, BOX *box); /* private routines */ -extern LSEG *lseg_construct(Point * pt1, Point * pt2); +extern LSEG *lseg_construct(Point *pt1, Point *pt2); /* public box routines */ extern BOX *box_in(char *str); @@ -241,120 +241,120 @@ extern LSEG *box_diagonal(BOX *box); extern double box_dt(BOX *box1, BOX *box2); -extern BOX *box(Point * p1, Point * p2); -extern BOX *box_add(BOX *box, Point * p); -extern BOX *box_sub(BOX *box, Point * p); -extern BOX *box_mul(BOX *box, Point * p); -extern BOX *box_div(BOX *box, Point * p); +extern BOX *box(Point *p1, Point *p2); +extern BOX *box_add(BOX *box, Point *p); +extern BOX *box_sub(BOX *box, Point *p); +extern BOX *box_mul(BOX *box, Point *p); +extern BOX *box_div(BOX *box, Point *p); /* private line routines */ -extern double *line_distance(LINE * l1, LINE * l2); +extern double *line_distance(LINE *l1, LINE *l2); /* public path routines */ extern PATH *path_in(char *str); -extern char *path_out(PATH * path); -extern bool path_n_lt(PATH * p1, PATH * p2); -extern bool path_n_gt(PATH * p1, PATH * p2); -extern bool path_n_eq(PATH * p1, PATH * p2); -extern bool path_n_le(PATH * p1, PATH * p2); -extern bool path_n_ge(PATH * p1, PATH * p2); -extern bool path_inter(PATH * p1, PATH * p2); -extern double *path_distance(PATH * p1, PATH * p2); -extern double *path_length(PATH * path); - -extern bool path_isclosed(PATH * path); -extern bool path_isopen(PATH * path); -extern int4 path_npoints(PATH * path); - -extern PATH *path_close(PATH * path); -extern PATH *path_open(PATH * path); -extern PATH *path_add(PATH * p1, PATH * p2); -extern PATH *path_add_pt(PATH * path, Point * point); -extern PATH *path_sub_pt(PATH * path, Point * point); -extern PATH *path_mul_pt(PATH * path, Point * point); -extern PATH *path_div_pt(PATH * path, Point * point); -extern bool path_contain_pt(PATH * path, Point * p); -extern bool pt_contained_path(Point * p, PATH * path); - -extern Point *path_center(PATH * path); -extern POLYGON *path_poly(PATH * path); - -extern PATH *upgradepath(PATH * path); -extern bool isoldpath(PATH * path); +extern char *path_out(PATH *path); +extern bool path_n_lt(PATH *p1, PATH *p2); +extern bool path_n_gt(PATH *p1, PATH *p2); +extern bool path_n_eq(PATH *p1, PATH *p2); +extern bool path_n_le(PATH *p1, PATH *p2); +extern bool path_n_ge(PATH *p1, PATH *p2); +extern bool path_inter(PATH *p1, PATH *p2); +extern double *path_distance(PATH *p1, PATH *p2); +extern double *path_length(PATH *path); + +extern bool path_isclosed(PATH *path); +extern bool path_isopen(PATH *path); +extern int4 path_npoints(PATH *path); + +extern PATH *path_close(PATH *path); +extern PATH *path_open(PATH *path); +extern PATH *path_add(PATH *p1, PATH *p2); +extern PATH *path_add_pt(PATH *path, Point *point); +extern PATH *path_sub_pt(PATH *path, Point *point); +extern PATH *path_mul_pt(PATH *path, Point *point); +extern PATH *path_div_pt(PATH *path, Point *point); +extern bool path_contain_pt(PATH *path, Point *p); +extern bool pt_contained_path(Point *p, PATH *path); + +extern Point *path_center(PATH *path); +extern POLYGON *path_poly(PATH *path); + +extern PATH *upgradepath(PATH *path); +extern bool isoldpath(PATH *path); /* public polygon routines */ extern POLYGON *poly_in(char *s); -extern char *poly_out(POLYGON * poly); -extern bool poly_left(POLYGON * polya, POLYGON * polyb); -extern bool poly_overleft(POLYGON * polya, POLYGON * polyb); -extern bool poly_right(POLYGON * polya, POLYGON * polyb); -extern bool poly_overright(POLYGON * polya, POLYGON * polyb); -extern bool poly_same(POLYGON * polya, POLYGON * polyb); -extern bool poly_overlap(POLYGON * polya, POLYGON * polyb); -extern bool poly_contain(POLYGON * polya, POLYGON * polyb); -extern bool poly_contained(POLYGON * polya, POLYGON * polyb); -extern bool poly_contain_pt(POLYGON * poly, Point * p); -extern bool pt_contained_poly(Point * p, POLYGON * poly); - -extern double *poly_distance(POLYGON * polya, POLYGON * polyb); -extern int4 poly_npoints(POLYGON * poly); -extern Point *poly_center(POLYGON * poly); -extern BOX *poly_box(POLYGON * poly); -extern PATH *poly_path(POLYGON * poly); +extern char *poly_out(POLYGON *poly); +extern bool poly_left(POLYGON *polya, POLYGON *polyb); +extern bool poly_overleft(POLYGON *polya, POLYGON *polyb); +extern bool poly_right(POLYGON *polya, POLYGON *polyb); +extern bool poly_overright(POLYGON *polya, POLYGON *polyb); +extern bool poly_same(POLYGON *polya, POLYGON *polyb); +extern bool poly_overlap(POLYGON *polya, POLYGON *polyb); +extern bool poly_contain(POLYGON *polya, POLYGON *polyb); +extern bool poly_contained(POLYGON *polya, POLYGON *polyb); +extern bool poly_contain_pt(POLYGON *poly, Point *p); +extern bool pt_contained_poly(Point *p, POLYGON *poly); + +extern double *poly_distance(POLYGON *polya, POLYGON *polyb); +extern int4 poly_npoints(POLYGON *poly); +extern Point *poly_center(POLYGON *poly); +extern BOX *poly_box(POLYGON *poly); +extern PATH *poly_path(POLYGON *poly); extern POLYGON *box_poly(BOX *box); -extern POLYGON *upgradepoly(POLYGON * poly); -extern POLYGON *revertpoly(POLYGON * poly); +extern POLYGON *upgradepoly(POLYGON *poly); +extern POLYGON *revertpoly(POLYGON *poly); /* private polygon routines */ /* public circle routines */ extern CIRCLE *circle_in(char *str); -extern char *circle_out(CIRCLE * circle); -extern bool circle_same(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_overlap(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_overleft(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_left(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_right(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_overright(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_contained(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_contain(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_below(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_above(CIRCLE * circle1, CIRCLE * circle2); - -extern bool circle_eq(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_ne(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_lt(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_gt(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_le(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_ge(CIRCLE * circle1, CIRCLE * circle2); -extern bool circle_contain_pt(CIRCLE * circle, Point * point); -extern bool pt_contained_circle(Point * point, CIRCLE * circle); -extern CIRCLE *circle_add_pt(CIRCLE * circle, Point * point); -extern CIRCLE *circle_sub_pt(CIRCLE * circle, Point * point); -extern CIRCLE *circle_mul_pt(CIRCLE * circle, Point * point); -extern CIRCLE *circle_div_pt(CIRCLE * circle, Point * point); -extern double *circle_diameter(CIRCLE * circle); -extern double *circle_radius(CIRCLE * circle); -extern double *circle_distance(CIRCLE * circle1, CIRCLE * circle2); -extern double *dist_pc(Point * point, CIRCLE * circle); -extern double *dist_cpoly(CIRCLE * circle, POLYGON * poly); -extern Point *circle_center(CIRCLE * circle); -extern CIRCLE *circle(Point * center, float8 * radius); +extern char *circle_out(CIRCLE *circle); +extern bool circle_same(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_overlap(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_overleft(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_left(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_right(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_overright(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_contained(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_contain(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_below(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_above(CIRCLE *circle1, CIRCLE *circle2); + +extern bool circle_eq(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_ne(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_lt(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_gt(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_le(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_ge(CIRCLE *circle1, CIRCLE *circle2); +extern bool circle_contain_pt(CIRCLE *circle, Point *point); +extern bool pt_contained_circle(Point *point, CIRCLE *circle); +extern CIRCLE *circle_add_pt(CIRCLE *circle, Point *point); +extern CIRCLE *circle_sub_pt(CIRCLE *circle, Point *point); +extern CIRCLE *circle_mul_pt(CIRCLE *circle, Point *point); +extern CIRCLE *circle_div_pt(CIRCLE *circle, Point *point); +extern double *circle_diameter(CIRCLE *circle); +extern double *circle_radius(CIRCLE *circle); +extern double *circle_distance(CIRCLE *circle1, CIRCLE *circle2); +extern double *dist_pc(Point *point, CIRCLE *circle); +extern double *dist_cpoly(CIRCLE *circle, POLYGON *poly); +extern Point *circle_center(CIRCLE *circle); +extern CIRCLE *circle(Point *center, float8 *radius); extern CIRCLE *box_circle(BOX *box); -extern BOX *circle_box(CIRCLE * circle); -extern CIRCLE *poly_circle(POLYGON * poly); -extern POLYGON *circle_poly(int npts, CIRCLE * circle); +extern BOX *circle_box(CIRCLE *circle); +extern CIRCLE *poly_circle(POLYGON *poly); +extern POLYGON *circle_poly(int npts, CIRCLE *circle); /* private routines */ -extern double *circle_area(CIRCLE * circle); -extern double circle_dt(CIRCLE * circle1, CIRCLE * circle2); +extern double *circle_area(CIRCLE *circle); +extern double circle_dt(CIRCLE *circle1, CIRCLE *circle2); /* geo_selfuncs.c */ -extern float64 +extern float64 areasel(Oid opid, Oid relid, AttrNumber attno, char *value, int32 flag); -extern float64 +extern float64 areajoinsel(Oid opid, Oid relid, AttrNumber attno, char *value, int32 flag); diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h index 7cc6894c92..55fe23315d 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.5 1997/09/08 02:39:47 momjian Exp $ + * $Id: hsearch.h,v 1.6 1997/09/08 21:55:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,7 +36,7 @@ typedef struct element { unsigned long next; /* secret from user */ long key; -} ELEMENT; +} ELEMENT; typedef unsigned long BUCKET_INDEX; @@ -67,7 +67,7 @@ typedef struct hashhdr long accesses; long collisions; #endif -} HHDR; +} HHDR; typedef struct htab { @@ -79,7 +79,7 @@ typedef struct htab long *(*alloc) (); /* memory allocator (long * for alignment * reasons) */ -} HTAB; +} HTAB; typedef struct hashctl { @@ -97,7 +97,7 @@ typedef struct hashctl long *dir; /* directory if allocated already */ long *hctl; /* location of header information in shd * mem */ -} HASHCTL; +} HASHCTL; /* Flags to indicate action for hctl */ #define HASH_BUCKET 0x001 /* Setting bucket size */ @@ -125,18 +125,18 @@ typedef enum HASH_REMOVE, HASH_FIND_SAVE, HASH_REMOVE_SAVED -} HASHACTION; +} HASHACTION; /* * prototypes from functions in dynahash.c */ -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 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, - bool * foundPtr); -extern long *hash_seq(HTAB * hashp); +hash_search(HTAB *hashp, char *keyPtr, HASHACTION action, + bool *foundPtr); +extern long *hash_seq(HTAB *hashp); /* * prototypes from functions in hashfn.c diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h index ada1cf32d1..06ebf21927 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.6 1997/09/08 02:39:48 momjian Exp $ + * $Id: inval.h,v 1.7 1997/09/08 21:55:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,13 +30,13 @@ extern void RelationInvalidateHeapTuple(Relation relation, HeapTuple tuple); typedef struct InvalidationUserData { struct InvalidationUserData *dataP[1]; /* VARIABLE LENGTH */ -} InvalidationUserData; /* VARIABLE LENGTH STRUCTURE */ +} InvalidationUserData; /* VARIABLE LENGTH STRUCTURE */ typedef struct InvalidationEntryData { InvalidationUserData *nextP; InvalidationUserData userData; /* VARIABLE LENGTH ARRAY */ -} InvalidationEntryData; /* VARIABLE LENGTH STRUCTURE */ +} InvalidationEntryData; /* VARIABLE LENGTH STRUCTURE */ typedef Pointer InvalidationEntry; diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h index f31fa5583d..a820f2ddaf 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.6 1997/09/08 02:39:48 momjian Exp $ + * $Id: lselect.h,v 1.7 1997/09/08 21:55:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,13 +32,13 @@ typedef struct int nKeys; ScanKey scanKeys; int sortMem; /* needed for psort */ -} LeftistContextData; +} LeftistContextData; typedef LeftistContextData *LeftistContext; extern struct leftist * lmerge(struct leftist * pt, struct leftist * qt, LeftistContext context); -extern HeapTuple +extern HeapTuple gettuple(struct leftist ** treep, short *devnum, LeftistContext context); extern void diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index cad6ecfbfa..ca07a4a25c 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.5 1997/09/08 02:39:49 momjian Exp $ + * $Id: lsyscache.h,v 1.6 1997/09/08 21:55:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,9 +23,9 @@ extern Oid get_atttype(Oid relid, AttrNumber attnum); extern bool get_attisset(Oid relid, char *attname); extern RegProcedure get_opcode(Oid opid); extern char *get_opname(Oid opid); -extern bool +extern bool op_mergesortable(Oid opid, Oid ltype, Oid rtype, - Oid * leftOp, Oid * rightOp); + Oid *leftOp, Oid *rightOp); extern Oid op_hashjoinable(Oid opid, Oid ltype, Oid rtype); extern Oid get_commutator(Oid opid); extern HeapTuple get_operator_tuple(Oid opno); @@ -34,7 +34,7 @@ extern RegProcedure get_oprrest(Oid opid); extern RegProcedure get_oprjoin(Oid opid); extern int get_relnatts(Oid relid); extern char *get_rel_name(Oid relid); -extern struct varlena *get_relstub(Oid relid, int no, bool * islast); +extern struct varlena *get_relstub(Oid relid, int no, bool *islast); extern Oid get_ruleid(char *rulename); extern Oid get_eventrelid(Oid ruleid); extern int16 get_typlen(Oid typid); diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h index 4c37d33187..54f7723943 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.7 1997/09/08 02:39:49 momjian Exp $ + * $Id: mcxt.h,v 1.8 1997/09/08 21:55:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,7 +39,7 @@ extern MemoryContext TopMemoryContext; */ extern void EnableMemoryContext(bool on); extern Pointer MemoryContextAlloc(MemoryContext context, Size size); -extern Pointer +extern Pointer MemoryContextRealloc(MemoryContext context, Pointer pointer, Size size); diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h index f1a065caf4..8fcaee7bc5 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.12 1997/09/08 02:39:51 momjian Exp $ + * $Id: nabstime.h,v 1.13 1997/09/08 21:55:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,7 @@ typedef struct { int32 status; AbsoluteTime data[2]; -} TimeIntervalData; +} TimeIntervalData; typedef TimeIntervalData *TimeInterval; /* @@ -112,7 +112,7 @@ extern bool abstimele(AbsoluteTime t1, AbsoluteTime t2); extern bool abstimege(AbsoluteTime t1, AbsoluteTime t2); extern bool abstime_finite(AbsoluteTime time); -extern AbsoluteTime datetime_abstime(DateTime * datetime); +extern AbsoluteTime datetime_abstime(DateTime *datetime); extern DateTime *abstime_datetime(AbsoluteTime abstime); extern bool AbsoluteTimeIsBefore(AbsoluteTime time1, AbsoluteTime time2); diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 84a5d539af..8150bb9caa 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.6 1997/09/08 02:39:53 momjian Exp $ + * $Id: portal.h,v 1.7 1997/09/08 21:55:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,7 +34,7 @@ typedef struct PortalBlockData { AllocSetData setData; FixedItemData itemData; -} PortalBlockData; +} PortalBlockData; typedef PortalBlockData *PortalBlock; @@ -69,13 +69,13 @@ extern void EnablePortalManager(bool on); extern Portal GetPortalByName(char *name); extern Portal BlankPortalAssignName(char *name); extern void -PortalSetQuery(Portal portal, QueryDesc * queryDesc, - TupleDesc attinfo, EState * state, +PortalSetQuery(Portal portal, QueryDesc *queryDesc, + TupleDesc attinfo, EState *state, void (*cleanup) (Portal portal)); extern QueryDesc *PortalGetQueryDesc(Portal portal); extern EState *PortalGetState(Portal portal); extern Portal CreatePortal(char *name); -extern void PortalDestroy(Portal * portalP); +extern void PortalDestroy(Portal *portalP); extern void StartPortalAllocMode(AllocMode mode, Size limit); extern void EndPortalAllocMode(void); extern PortalVariableMemory PortalGetVariableMemory(Portal portal); diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h index 01fa4153c1..21366b2220 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.9 1997/09/08 02:39:54 momjian Exp $ + * $Id: psort.h,v 1.10 1997/09/08 21:55:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,7 +64,7 @@ typedef struct Psortstate bool using_tape_files; HeapTuple *memtuples; -} Psortstate; +} Psortstate; #ifdef EBUG #include <stdio.h> @@ -98,10 +98,10 @@ if (1) CODE; else #endif /* psort.c */ -extern bool psort_begin(Sort * node, int nkeys, ScanKey key); -extern HeapTuple psort_grabtuple(Sort * node); -extern void psort_markpos(Sort * node); -extern void psort_restorepos(Sort * node); -extern void psort_end(Sort * node); +extern bool psort_begin(Sort *node, int nkeys, ScanKey key); +extern HeapTuple psort_grabtuple(Sort *node); +extern void psort_markpos(Sort *node); +extern void psort_restorepos(Sort *node); +extern void psort_end(Sort *node); #endif /* PSORT_H */ diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index 9fe943c58d..0dbf0e1c39 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.11 1997/09/08 02:39:55 momjian Exp $ + * $Id: rel.h,v 1.12 1997/09/08 21:55:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,7 +29,7 @@ typedef struct Trigger int16 tgnargs; int16 tgattr[8]; char **tgargs; -} Trigger; +} Trigger; typedef struct TriggerDesc { @@ -42,7 +42,7 @@ typedef struct TriggerDesc Trigger **tg_after_row[4]; Trigger **tg_after_statement[4]; Trigger *triggers; -} TriggerDesc; +} TriggerDesc; typedef struct RelationData { @@ -62,7 +62,7 @@ typedef struct RelationData IndexStrategy rd_istrat; RegProcedure *rd_support; TriggerDesc *trigdesc; -} RelationData; +} RelationData; typedef RelationData *Relation; @@ -190,6 +190,6 @@ extern IndexStrategy RelationGetIndexStrategy(Relation relation); extern void RelationSetIndexSupport(Relation relation, IndexStrategy strategy, - RegProcedure * support); + RegProcedure *support); #endif /* REL_H */ diff --git a/src/include/utils/rel2.h b/src/include/utils/rel2.h index 19873d34e2..0f750f47ff 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.3 1997/09/07 05:02:58 momjian Exp $ + * $Id: rel2.h,v 1.4 1997/09/08 21:55:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,6 +19,6 @@ extern IndexStrategy RelationGetIndexStrategy(Relation relation); extern void RelationSetIndexSupport(Relation relation, IndexStrategy strategy, - RegProcedure * support); + RegProcedure *support); #endif /* TMP_REL2_H */ diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h index 627356e29a..54c42a1984 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.6 1997/09/08 02:39:58 momjian Exp $ + * $Id: syscache.h,v 1.7 1997/09/08 21:55:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -73,16 +73,15 @@ struct cachedesc int size; /* sizeof(appropriate struct) */ char *indname; /* index relation for this cache, if * exists */ - HeapTuple(*iScanFunc) (); /* function to handle - * index scans */ + HeapTuple (*iScanFunc) ();/* function to handle index scans */ }; extern void zerocaches(void); extern void InitCatalogCache(void); -extern HeapTuple +extern HeapTuple SearchSysCacheTuple(int cacheId, Datum key1, Datum key2, Datum key3, Datum key4); -extern int32 +extern int32 SearchSysCacheStruct(int cacheId, char *returnStruct, Datum key1, Datum key2, Datum key3, Datum key4); extern void * diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index 579c6e9525..11253891a9 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tqual.h,v 1.8 1997/09/08 02:39:59 momjian Exp $ + * $Id: tqual.h,v 1.9 1997/09/08 21:55:19 momjian Exp $ * * NOTE * It may be desirable to allow time qualifications to indicate @@ -22,7 +22,7 @@ typedef struct TimeQualSpace { char data[12]; -} TimeQualSpace; +} TimeQualSpace; typedef Pointer TimeQual; @@ -36,7 +36,7 @@ extern void setheapoverride(bool on); extern bool heapisoverride(void); extern TimeQual TimeFormSnapshotTimeQual(AbsoluteTime time); -extern TimeQual +extern TimeQual TimeFormRangedTimeQual(AbsoluteTime startTime, AbsoluteTime endTime); extern bool HeapTupleSatisfiesTimeQual(HeapTuple tuple, TimeQual qual); |