diff options
Diffstat (limited to 'src/include')
130 files changed, 1298 insertions, 1023 deletions
diff --git a/src/include/access/genam.h b/src/include/access/genam.h index 79aa1fc89f..b92e38379b 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: genam.h,v 1.11 1998/01/24 22:47:48 momjian Exp $ + * $Id: genam.h,v 1.12 1998/02/26 04:39:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,25 +25,31 @@ extern Relation index_open(Oid relationId); extern Relation index_openr(char *relationName); extern void index_close(Relation relation); -extern InsertIndexResult index_insert(Relation relation, +extern InsertIndexResult +index_insert(Relation relation, Datum *datum, char *nulls, ItemPointer heap_t_ctid, Relation heapRel); extern void index_delete(Relation relation, ItemPointer indexItem); -extern IndexScanDesc index_beginscan(Relation relation, bool scanFromEnd, +extern IndexScanDesc +index_beginscan(Relation relation, bool scanFromEnd, uint16 numberOfKeys, ScanKey key); extern void index_rescan(IndexScanDesc scan, bool scanFromEnd, ScanKey key); extern void index_endscan(IndexScanDesc scan); -extern RetrieveIndexResult index_getnext(IndexScanDesc scan, +extern RetrieveIndexResult +index_getnext(IndexScanDesc scan, ScanDirection direction); -extern RegProcedure index_getprocid(Relation irel, AttrNumber attnum, +extern RegProcedure +index_getprocid(Relation irel, AttrNumber attnum, uint16 procnum); -extern Datum GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc, +extern Datum +GetIndexValue(HeapTuple tuple, TupleDesc hTupDesc, int attOff, AttrNumber attrNums[], FuncIndexInfo *fInfo, bool *attNull, Buffer buffer); /* in genam.c */ -extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd, +extern IndexScanDesc +RelationGetIndexScan(Relation relation, bool scanFromEnd, uint16 numberOfKeys, ScanKey key); extern void IndexScanMarkPosition(IndexScanDesc scan); extern void IndexScanRestorePosition(IndexScanDesc scan); diff --git a/src/include/access/gist.h b/src/include/access/gist.h index 4c665aeaec..15294ce06c 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -188,18 +188,21 @@ typedef struct intrange int flag; } INTRANGE; -extern void gistbuild(Relation heap, +extern void +gistbuild(Relation heap, Relation index, int natts, AttrNumber *attnum, IndexStrategy istrat, uint16 pint, Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo); -extern InsertIndexResult gistinsert(Relation r, Datum *datum, +extern InsertIndexResult +gistinsert(Relation r, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel); extern void _gistdump(Relation r); extern void gistfreestack(GISTSTACK *s); extern void initGISTstate(GISTSTATE *giststate, Relation index); -extern void gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, +extern void +gistdentryinit(GISTSTATE *giststate, GISTENTRY *e, char *pr, Relation r, Page pg, OffsetNumber o, int b, bool l); extern StrategyNumber RelationGetGISTStrategy(Relation, AttrNumber, RegProcedure); diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h index e38b26d990..071238bd17 100644 --- a/src/include/access/gistscan.h +++ b/src/include/access/gistscan.h @@ -16,7 +16,8 @@ #include <storage/block.h> #include <utils/rel.h> -extern IndexScanDesc gistbeginscan(Relation r, bool fromEnd, +extern IndexScanDesc +gistbeginscan(Relation r, bool fromEnd, uint16 nkeys, ScanKey key); extern void gistrescan(IndexScanDesc s, bool fromEnd, ScanKey key); extern void gistmarkpos(IndexScanDesc s); diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h index f5e6e45d77..1007dd3ec2 100644 --- a/src/include/access/giststrat.h +++ b/src/include/access/giststrat.h @@ -15,7 +15,8 @@ #include <access/strat.h> #include <utils/rel.h> -extern StrategyNumber RelationGetGISTStrategy(Relation r, +extern StrategyNumber +RelationGetGISTStrategy(Relation r, AttrNumber attnum, RegProcedure proc); #endif /* GISTSTRAT_H */ diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 268edd82ea..b74b074e81 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hash.h,v 1.12 1998/01/24 22:47:55 momjian Exp $ + * $Id: hash.h,v 1.13 1998/02/26 04:39:59 momjian Exp $ * * NOTES * modeled after Margo Seltzer's hash implementation for unix. @@ -248,13 +248,16 @@ typedef HashItemData *HashItem; /* public routines */ -extern void hashbuild(Relation heap, Relation index, int natts, +extern void +hashbuild(Relation heap, Relation index, int natts, AttrNumber *attnum, IndexStrategy istrat, uint16 pcount, Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo); -extern InsertIndexResult hashinsert(Relation rel, Datum *datum, char *nulls, +extern InsertIndexResult +hashinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel); extern char *hashgettuple(IndexScanDesc scan, ScanDirection dir); -extern char * hashbeginscan(Relation rel, bool fromEnd, uint16 keysz, +extern char * +hashbeginscan(Relation rel, bool fromEnd, uint16 keysz, ScanKey scankey); extern void hashrescan(IndexScanDesc scan, bool fromEnd, ScanKey scankey); extern void hashendscan(IndexScanDesc scan); @@ -285,9 +288,11 @@ extern InsertIndexResult _hash_doinsert(Relation rel, HashItem hitem); /* hashovfl.c */ extern Buffer _hash_addovflpage(Relation rel, Buffer *metabufp, Buffer buf); extern Buffer _hash_freeovflpage(Relation rel, Buffer ovflbuf); -extern int32 _hash_initbitmap(Relation rel, HashMetaPage metap, int32 pnum, +extern int32 +_hash_initbitmap(Relation rel, HashMetaPage metap, int32 pnum, int32 nbits, int32 ndx); -extern void _hash_squeezebucket(Relation rel, HashMetaPage metap, +extern void +_hash_squeezebucket(Relation rel, HashMetaPage metap, Bucket bucket); @@ -297,7 +302,8 @@ extern Buffer _hash_getbuf(Relation rel, BlockNumber blkno, int access); extern void _hash_relbuf(Relation rel, Buffer buf, int access); extern void _hash_wrtbuf(Relation rel, Buffer buf); extern void _hash_wrtnorelbuf(Relation rel, Buffer buf); -extern Page _hash_chgbufaccess(Relation rel, Buffer *bufp, int from_access, +extern Page +_hash_chgbufaccess(Relation rel, Buffer *bufp, int from_access, int to_access); extern void _hash_pageinit(Page page, Size size); extern void _hash_pagedel(Relation rel, ItemPointer tid); @@ -311,16 +317,19 @@ extern void _hash_adjscans(Relation rel, ItemPointer tid); /* hashsearch.c */ -extern void _hash_search(Relation rel, int keysz, ScanKey scankey, +extern void +_hash_search(Relation rel, int keysz, ScanKey scankey, Buffer *bufP, HashMetaPage metap); extern RetrieveIndexResult _hash_next(IndexScanDesc scan, ScanDirection dir); extern RetrieveIndexResult _hash_first(IndexScanDesc scan, ScanDirection dir); -extern bool _hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir, +extern bool +_hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir, Buffer metabuf); /* hashutil.c */ -extern ScanKey _hash_mkscankey(Relation rel, IndexTuple itup, +extern ScanKey +_hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap); extern void _hash_freeskey(ScanKey skey); extern bool _hash_checkqual(IndexScanDesc scan, IndexTuple itup); diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index ad1114c5bf..7dc2533735 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.29 1998/02/06 20:18:00 momjian Exp $ + * $Id: heapam.h,v 1.30 1998/02/26 04:40:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -99,7 +99,7 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics; (attnum) == 1) ? \ ( \ (Datum)fetchatt(&((tupleDesc)->attrs[(attnum)-1]), \ - (char *) (tup) + (tup)->t_hoff + \ + (char *) (tup) + (tup)->t_hoff + \ ( \ ((attnum) != 1) ? \ (tupleDesc)->attrs[(attnum)-1]->attcacheoff \ @@ -131,7 +131,7 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics; ) - + /* ---------------- * heap_getattr * @@ -205,7 +205,8 @@ extern void doinsert(Relation relation, HeapTuple tup); extern Relation heap_open(Oid relationId); extern Relation heap_openr(char *relationName); extern void heap_close(Relation relation); -extern HeapScanDesc heap_beginscan(Relation relation, int atend, +extern HeapScanDesc +heap_beginscan(Relation relation, int atend, bool seeself, unsigned nkeys, ScanKey key); extern void heap_rescan(HeapScanDesc sdesc, bool scanFromEnd, ScanKey key); extern void heap_endscan(HeapScanDesc sdesc); @@ -213,26 +214,31 @@ extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw, Buffer *b); extern HeapTuple heap_fetch(Relation relation, bool seeself, ItemPointer tid, Buffer *b); extern Oid heap_insert(Relation relation, HeapTuple tup); extern int heap_delete(Relation relation, ItemPointer tid); -extern int heap_replace(Relation relation, ItemPointer otid, +extern int +heap_replace(Relation relation, ItemPointer otid, HeapTuple tup); extern void heap_markpos(HeapScanDesc sdesc); extern void heap_restrpos(HeapScanDesc sdesc); /* in common/heaptuple.c */ extern Size ComputeDataSize(TupleDesc tupleDesc, Datum value[], char nulls[]); -extern void DataFill(char *data, TupleDesc tupleDesc, +extern void +DataFill(char *data, TupleDesc tupleDesc, Datum value[], char nulls[], uint16 *infomask, bits8 *bit); extern int heap_attisnull(HeapTuple tup, int attnum); extern int heap_sysattrlen(AttrNumber attno); extern bool heap_sysattrbyval(AttrNumber attno); extern Datum heap_getsysattr(HeapTuple tup, Buffer b, int attnum); -extern Datum nocachegetattr(HeapTuple tup, int attnum, - TupleDesc att, bool *isnull); +extern Datum +nocachegetattr(HeapTuple tup, int attnum, + TupleDesc att, bool *isnull); extern HeapTuple heap_copytuple(HeapTuple tuple); -extern HeapTuple heap_formtuple(TupleDesc tupleDescriptor, +extern HeapTuple +heap_formtuple(TupleDesc tupleDescriptor, Datum value[], char nulls[]); -extern HeapTuple heap_modifytuple(HeapTuple tuple, Buffer buffer, +extern HeapTuple +heap_modifytuple(HeapTuple tuple, Buffer buffer, Relation relation, Datum replValue[], char replNull[], char repl[]); HeapTuple heap_addheader(uint32 natts, int structlen, char *structure); @@ -241,7 +247,8 @@ extern void PrintHeapAccessStatistics(HeapAccessStatistics stats); extern void initam(void); /* hio.c */ -extern void RelationPutHeapTuple(Relation relation, BlockNumber blockIndex, +extern void +RelationPutHeapTuple(Relation relation, BlockNumber blockIndex, HeapTuple tuple); extern void RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple); diff --git a/src/include/access/hio.h b/src/include/access/hio.h index 0f7c40e1ed..5b38a42d63 100644 --- a/src/include/access/hio.h +++ b/src/include/access/hio.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hio.h,v 1.6 1998/01/24 22:48:01 momjian Exp $ + * $Id: hio.h,v 1.7 1998/02/26 04:40:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,8 @@ #include <utils/rel.h> -extern void RelationPutHeapTuple(Relation relation, BlockNumber blockIndex, +extern void +RelationPutHeapTuple(Relation relation, BlockNumber blockIndex, HeapTuple tuple); extern void RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple); diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 6e7674ea7c..2479fe9d4b 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: htup.h,v 1.8 1998/01/31 04:39:22 momjian Exp $ + * $Id: htup.h,v 1.9 1998/02/26 04:40:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,25 +28,25 @@ */ typedef struct HeapTupleData { - unsigned int t_len; /* length of entire tuple */ + unsigned int t_len; /* length of entire tuple */ - Oid t_oid; /* OID of this tuple -- 4 bytes */ + Oid t_oid; /* OID of this tuple -- 4 bytes */ - CommandId t_cmin; /* insert CID stamp -- 4 bytes each */ - CommandId t_cmax; /* delete CommandId stamp */ + CommandId t_cmin; /* insert CID stamp -- 4 bytes each */ + CommandId t_cmax; /* delete CommandId stamp */ - TransactionId t_xmin; /* insert XID stamp -- 4 bytes each */ - TransactionId t_xmax; /* delete XID stamp */ + TransactionId t_xmin; /* insert XID stamp -- 4 bytes each */ + TransactionId t_xmax; /* delete XID stamp */ - ItemPointerData t_ctid; /* current TID of this tuple */ - - int16 t_natts; /* number of attributes */ + ItemPointerData t_ctid; /* current TID of this tuple */ - uint16 t_infomask; /* various infos */ + int16 t_natts; /* number of attributes */ - uint8 t_hoff; /* sizeof tuple header */ + uint16 t_infomask; /* various infos */ - bits8 t_bits[MinHeapTupleBitmapSize / 8]; + uint8 t_hoff; /* sizeof tuple header */ + + bits8 t_bits[MinHeapTupleBitmapSize / 8]; /* bit map of domains */ /* MORE DATA FOLLOWS AT END OF STRUCT */ diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h index 3cc1700f9c..977045f0dc 100644 --- a/src/include/access/iqual.h +++ b/src/include/access/iqual.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: iqual.h,v 1.8 1998/01/24 22:48:05 momjian Exp $ + * $Id: iqual.h,v 1.9 1998/02/26 04:40:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,8 @@ extern int NIndexTupleProcessed; -extern bool index_keytest(IndexTuple tuple, TupleDesc tupdesc, +extern bool +index_keytest(IndexTuple tuple, TupleDesc tupdesc, int scanKeySize, ScanKey key); #endif /* IQUAL_H */ diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h index f2dcf2f554..f1d202a778 100644 --- a/src/include/access/istrat.h +++ b/src/include/access/istrat.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: istrat.h,v 1.9 1998/01/24 22:48:05 momjian Exp $ + * $Id: istrat.h,v 1.10 1998/02/26 04:40:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,18 +47,23 @@ */ #define IndexStrategyIsValid(s) PointerIsValid(s) -extern StrategyMap IndexStrategyGetStrategyMap(IndexStrategy indexStrategy, +extern StrategyMap +IndexStrategyGetStrategyMap(IndexStrategy indexStrategy, StrategyNumber maxStrategyNum, AttrNumber attrNum); -extern Size AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber, +extern Size +AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber, StrategyNumber maxStrategyNumber); -extern StrategyNumber RelationGetStrategy(Relation relation, +extern StrategyNumber +RelationGetStrategy(Relation relation, AttrNumber attributeNumber, StrategyEvaluation evaluation, RegProcedure procedure); -extern bool RelationInvokeStrategy(Relation relation, +extern bool +RelationInvokeStrategy(Relation relation, StrategyEvaluation evaluation, AttrNumber attributeNumber, StrategyNumber strategy, Datum left, Datum right); -extern void IndexSupportInitialize(IndexStrategy indexStrategy, +extern void +IndexSupportInitialize(IndexStrategy indexStrategy, RegProcedure *indexSupport, Oid indexObjectId, Oid accessMethodObjectId, StrategyNumber maxStrategyNumber, StrategyNumber maxSupportNumber, AttrNumber maxAttributeNumber); diff --git a/src/include/access/itup.h b/src/include/access/itup.h index b230ab2265..68fa5e2a7b 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: itup.h,v 1.12 1998/02/06 20:18:01 momjian Exp $ + * $Id: itup.h,v 1.13 1998/02/26 04:40:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -127,7 +127,7 @@ typedef struct PredInfo (attnum) == 1) ? \ ( \ (Datum)fetchatt(&((tupleDesc)->attrs[(attnum)-1]), \ - (char *) (tup) + \ + (char *) (tup) + \ ( \ IndexTupleHasMinHeader(tup) ? \ sizeof (*(tup)) \ @@ -164,13 +164,16 @@ typedef struct PredInfo ) \ ) - + /* indextuple.h */ -extern IndexTuple index_formtuple(TupleDesc tupleDescriptor, +extern IndexTuple +index_formtuple(TupleDesc tupleDescriptor, Datum value[], char null[]); -extern Datum nocache_index_getattr(IndexTuple tup, int attnum, - TupleDesc tupleDesc, bool *isnull); -extern RetrieveIndexResult FormRetrieveIndexResult(ItemPointer indexItemPointer, +extern Datum +nocache_index_getattr(IndexTuple tup, int attnum, + TupleDesc tupleDesc, bool *isnull); +extern RetrieveIndexResult +FormRetrieveIndexResult(ItemPointer indexItemPointer, ItemPointer heapItemPointer); extern void CopyIndexTuple(IndexTuple source, IndexTuple *target); diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index 8370422efc..c701200556 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nbtree.h,v 1.19 1998/01/24 22:48:07 momjian Exp $ + * $Id: nbtree.h,v 1.20 1998/02/26 04:40:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -213,11 +213,13 @@ typedef struct BTPageState /* * prototypes for functions in nbtinsert.c */ -extern InsertIndexResult _bt_doinsert(Relation rel, BTItem btitem, +extern InsertIndexResult +_bt_doinsert(Relation rel, BTItem btitem, bool index_is_unique, Relation heapRel); /* default is to allow duplicates */ -extern bool _bt_itemcmp(Relation rel, Size keysz, BTItem item1, BTItem item2, +extern bool +_bt_itemcmp(Relation rel, Size keysz, BTItem item1, BTItem item2, StrategyNumber strat); /* @@ -239,13 +241,16 @@ extern void _bt_pagedel(Relation rel, ItemPointer tid); */ extern bool BuildingBtree; /* in nbtree.c */ -extern void btbuild(Relation heap, Relation index, int natts, +extern void +btbuild(Relation heap, Relation index, int natts, AttrNumber *attnum, IndexStrategy istrat, uint16 pcount, Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo); -extern InsertIndexResult btinsert(Relation rel, Datum *datum, char *nulls, +extern InsertIndexResult +btinsert(Relation rel, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel); extern char *btgettuple(IndexScanDesc scan, ScanDirection dir); -extern char * btbeginscan(Relation rel, bool fromEnd, uint16 keysz, +extern char * +btbeginscan(Relation rel, bool fromEnd, uint16 keysz, ScanKey scankey); extern void btrescan(IndexScanDesc scan, bool fromEnd, ScanKey scankey); @@ -265,13 +270,17 @@ extern void _bt_adjscans(Relation rel, ItemPointer tid, int op); /* * prototypes for functions in nbtsearch.c */ -extern BTStack _bt_search(Relation rel, int keysz, ScanKey scankey, +extern BTStack +_bt_search(Relation rel, int keysz, ScanKey scankey, Buffer *bufP); -extern Buffer _bt_moveright(Relation rel, Buffer buf, int keysz, +extern Buffer +_bt_moveright(Relation rel, Buffer buf, int keysz, ScanKey scankey, int access); -extern bool _bt_skeycmp(Relation rel, Size keysz, ScanKey scankey, +extern bool +_bt_skeycmp(Relation rel, Size keysz, ScanKey scankey, Page page, ItemId itemid, StrategyNumber strat); -extern OffsetNumber _bt_binsrch(Relation rel, Buffer buf, int keysz, +extern OffsetNumber +_bt_binsrch(Relation rel, Buffer buf, int keysz, ScanKey scankey, int srchtype); extern RetrieveIndexResult _bt_next(IndexScanDesc scan, ScanDirection dir); extern RetrieveIndexResult _bt_first(IndexScanDesc scan, ScanDirection dir); @@ -280,9 +289,11 @@ extern bool _bt_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir); /* * prototypes for functions in nbtstrat.c */ -extern StrategyNumber _bt_getstrat(Relation rel, AttrNumber attno, +extern StrategyNumber +_bt_getstrat(Relation rel, AttrNumber attno, RegProcedure proc); -extern bool _bt_invokestrat(Relation rel, AttrNumber attno, +extern bool +_bt_invokestrat(Relation rel, AttrNumber attno, StrategyNumber strat, Datum left, Datum right); /* diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h index 2af1c90a8c..ea45c08c11 100644 --- a/src/include/access/rtree.h +++ b/src/include/access/rtree.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rtree.h,v 1.11 1998/01/24 22:48:08 momjian Exp $ + * $Id: rtree.h,v 1.12 1998/02/26 04:40:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -114,29 +114,34 @@ extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir); * RTree code. * Defined in access/index-rtree/ */ -extern InsertIndexResult rtinsert(Relation r, Datum *datum, char *nulls, +extern InsertIndexResult +rtinsert(Relation r, Datum *datum, char *nulls, ItemPointer ht_ctid, Relation heapRel); extern char *rtdelete(Relation r, ItemPointer tid); extern RetrieveIndexResult rtgettuple(IndexScanDesc s, ScanDirection dir); -extern IndexScanDesc rtbeginscan(Relation r, bool fromEnd, uint16 nkeys, +extern IndexScanDesc +rtbeginscan(Relation r, bool fromEnd, uint16 nkeys, ScanKey key); extern void rtendscan(IndexScanDesc s); extern void rtmarkpos(IndexScanDesc s); extern void rtrestrpos(IndexScanDesc s); extern void rtrescan(IndexScanDesc s, bool fromEnd, ScanKey key); -extern void rtbuild(Relation heap, Relation index, int natts, +extern void +rtbuild(Relation heap, Relation index, int natts, AttrNumber *attnum, IndexStrategy istrat, uint16 pcount, Datum *params, FuncIndexInfo *finfo, PredInfo *predInfo); extern void _rtdump(Relation r); /* rtscan.c */ -extern void rtadjscans(Relation r, int op, BlockNumber blkno, +extern void +rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); /* rtstrat.h */ -extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum, +extern RegProcedure +RTMapOperator(Relation r, AttrNumber attnum, RegProcedure proc); #endif /* RTREE_H */ diff --git a/src/include/access/rtstrat.h b/src/include/access/rtstrat.h index edb6b32db5..06236ae220 100644 --- a/src/include/access/rtstrat.h +++ b/src/include/access/rtstrat.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rtstrat.h,v 1.6 1998/01/24 22:48:08 momjian Exp $ + * $Id: rtstrat.h,v 1.7 1998/02/26 04:40:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,7 +16,8 @@ #include <utils/rel.h> #include <access/attnum.h> -extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum, +extern RegProcedure +RTMapOperator(Relation r, AttrNumber attnum, RegProcedure proc); #endif /* RTSTRAT_H */ diff --git a/src/include/access/skey.h b/src/include/access/skey.h index e51b521518..af60c7656a 100644 --- a/src/include/access/skey.h +++ b/src/include/access/skey.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: skey.h,v 1.8 1998/01/24 22:48:10 momjian Exp $ + * $Id: skey.h,v 1.9 1998/02/26 04:40:27 momjian Exp $ * * * Note: @@ -46,7 +46,8 @@ typedef ScanKeyData *ScanKey; * prototypes for functions in access/common/scankey.c */ extern void ScanKeyEntrySetIllegal(ScanKey entry); -extern void ScanKeyEntryInitialize(ScanKey entry, bits16 flags, +extern void +ScanKeyEntryInitialize(ScanKey entry, bits16 flags, AttrNumber attributeNumber, RegProcedure procedure, Datum argument); #endif /* SKEY_H */ diff --git a/src/include/access/strat.h b/src/include/access/strat.h index 0ad737b36c..0c3e82e9a2 100644 --- a/src/include/access/strat.h +++ b/src/include/access/strat.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: strat.h,v 1.8 1997/09/08 21:51:02 momjian Exp $ + * $Id: strat.h,v 1.9 1998/02/26 04:40:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,6 +28,7 @@ typedef struct StrategyTransformMapData * * * + * * STRUCTURE */ typedef StrategyTransformMapData *StrategyTransformMap; diff --git a/src/include/access/transam.h b/src/include/access/transam.h index 7f8417ca0f..282e0ce847 100644 --- a/src/include/access/transam.h +++ b/src/include/access/transam.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: transam.h,v 1.13 1998/01/24 22:48:11 momjian Exp $ + * $Id: transam.h,v 1.14 1998/02/26 04:40:30 momjian Exp $ * * NOTES * Transaction System Version 101 now support proper oid @@ -41,10 +41,10 @@ * commiting of child xactions. * ---------------- */ -#define XID_COMMIT 2 /* transaction commited */ -#define XID_ABORT 1 /* transaction aborted */ -#define XID_INPROGRESS 0 /* transaction in progress */ -#define XID_COMMIT_CHILD 3 /* child xact commited */ +#define XID_COMMIT 2 /* transaction commited */ +#define XID_ABORT 1 /* transaction aborted */ +#define XID_INPROGRESS 0 /* transaction in progress */ +#define XID_COMMIT_CHILD 3 /* child xact commited */ typedef unsigned char XidStatus;/* (2 bits) */ @@ -106,10 +106,10 @@ typedef LogRelationContentsData *LogRelationContents; */ typedef struct VariableRelationContentsData { - int TransSystemVersion; - TransactionId nextXidData; - TransactionId lastXidData; /* unused */ - Oid nextOid; + int TransSystemVersion; + TransactionId nextXidData; + TransactionId lastXidData; /* unused */ + Oid nextOid; } VariableRelationContentsData; typedef VariableRelationContentsData *VariableRelationContents; @@ -130,11 +130,14 @@ extern void TransactionIdAbort(TransactionId transactionId); /* in transam/transsup.c */ extern void AmiTransactionOverride(bool flag); -extern void TransComputeBlockNumber(Relation relation, +extern void +TransComputeBlockNumber(Relation relation, TransactionId transactionId, BlockNumber *blockNumberOutP); -extern XidStatus TransBlockNumberGetXidStatus(Relation relation, +extern XidStatus +TransBlockNumberGetXidStatus(Relation relation, BlockNumber blockNumber, TransactionId xid, bool *failP); -extern void TransBlockNumberSetXidStatus(Relation relation, +extern void +TransBlockNumberSetXidStatus(Relation relation, BlockNumber blockNumber, TransactionId xid, XidStatus xstatus, bool *failP); diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index 4af8027068..276a83b86b 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tupdesc.h,v 1.15 1998/02/10 16:03:57 momjian Exp $ + * $Id: tupdesc.h,v 1.16 1998/02/26 04:40:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,7 +65,8 @@ extern TupleDesc CreateTupleDescCopyConstr(TupleDesc tupdesc); extern void FreeTupleDesc(TupleDesc tupdesc); -extern bool TupleDescInitEntry(TupleDesc desc, +extern bool +TupleDescInitEntry(TupleDesc desc, AttrNumber attributeNumber, char *attributeName, Oid typeid, diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h index c7711f5333..173ac2cdcb 100644 --- a/src/include/access/tupmacs.h +++ b/src/include/access/tupmacs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tupmacs.h,v 1.3 1998/02/01 05:38:40 momjian Exp $ + * $Id: tupmacs.h,v 1.4 1998/02/26 04:40:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,7 +51,7 @@ ( \ (char *) (long) *((int32 *)(T)) \ ) \ - : \ + : \ ( \ (*(A))->attlen < sizeof(int16) ? \ (char *) (long) *((char *)(T)) \ diff --git a/src/include/access/xact.h b/src/include/access/xact.h index 92588e3512..60bd8cab61 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: xact.h,v 1.11 1997/11/07 18:39:38 thomas Exp $ + * $Id: xact.h,v 1.12 1998/02/26 04:40:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,7 +57,7 @@ typedef TransactionStateData *TransactionState; #define TransactionIdIsValid(xid) ((bool) (xid != NullTransactionId)) #define TransactionIdStore(xid, dest) \ (*((TransactionId*)dest) = (TransactionId)xid) -#define StoreInvalidTransactionId(dest) \ +#define StoreInvalidTransactionId(dest) \ (*((TransactionId*)dest) = NullTransactionId) /* ---------------- diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index e0e126e504..f3546d3f72 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.10 1998/01/24 22:48:15 momjian Exp $ + * $Id: bootstrap.h,v 1.11 1998/02/26 04:40:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,7 +33,8 @@ extern int numattr; extern int DebugMode; extern int BootstrapMain(int ac, char *av[]); -extern void index_register(char *heap, +extern void +index_register(char *heap, char *ind, int natts, AttrNumber *attnos, diff --git a/src/include/c.h b/src/include/c.h index fbb6dba546..b30aefa6f8 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.35 1998/02/24 06:04:35 scrappy Exp $ + * $Id: c.h,v 1.36 1998/02/26 04:39:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -710,10 +710,10 @@ typedef struct Exception /* * This function gets call too often, so we inline it if we can. - * Are we aligned for int32? + * Are we aligned for int32? * We have to cast the pointer to int so we can do the AND * We got the 64 number by testing this against the stock memset() on - * BSD/OS 3.0. Larger values were slower. + * BSD/OS 3.0. Larger values were slower. */ #define MemSet(start, val, len) do \ { \ @@ -742,7 +742,8 @@ extern Exception BadArg; extern Exception BadState; /* in utils/error/assert.c */ -extern int ExceptionalCondition(char *conditionName, +extern int +ExceptionalCondition(char *conditionName, Exception *exceptionP, char *details, char *fileName, int lineNumber); diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h index 68dc9b7809..e43ac0cd0e 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.11 1998/01/24 22:48:19 momjian Exp $ + * $Id: heap.h,v 1.12 1998/02/26 04:40:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,7 @@ extern Relation heap_create(char *relname, TupleDesc att); -extern Oid heap_create_with_catalog(char relname[], TupleDesc tupdesc); +extern Oid heap_create_with_catalog(char relname[], TupleDesc tupdesc); extern void heap_destroy_with_catalog(char relname[]); extern void heap_destroy(Relation r); diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index 9f2f6826d6..1667b75091 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.9 1998/01/24 22:48:22 momjian Exp $ + * $Id: index.h,v 1.10 1998/02/26 04:40:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,15 +18,17 @@ #include <access/itup.h> #include <access/funcindex.h> -extern Form_pg_am AccessMethodObjectIdGetAccessMethodTupleForm(Oid accessMethodObjectId); +extern Form_pg_am AccessMethodObjectIdGetAccessMethodTupleForm(Oid accessMethodObjectId); extern void UpdateIndexPredicate(Oid indexoid, Node *oldPred, Node *predicate); -extern void InitIndexStrategy(int numatts, +extern void +InitIndexStrategy(int numatts, Relation indexRelation, Oid accessMethodObjectId); -extern void index_create(char *heapRelationName, +extern void +index_create(char *heapRelationName, char *indexRelationName, FuncIndexInfo *funcInfo, List *attributeList, @@ -42,17 +44,20 @@ extern void index_create(char *heapRelationName, extern void index_destroy(Oid indexId); -extern void FormIndexDatum(int numberOfAttributes, +extern void +FormIndexDatum(int numberOfAttributes, AttrNumber attributeNumber[], HeapTuple heapTuple, TupleDesc heapDescriptor, Buffer buffer, Datum *datum, char *nullv, FuncIndexInfoPtr fInfo); extern void UpdateStats(Oid relid, long reltuples, bool hasindex); -extern void FillDummyExprContext(ExprContext *econtext, TupleTableSlot *slot, +extern void +FillDummyExprContext(ExprContext *econtext, TupleTableSlot *slot, TupleDesc tupdesc, Buffer buffer); -extern void index_build(Relation heapRelation, Relation indexRelation, +extern void +index_build(Relation heapRelation, Relation indexRelation, int numberOfAttributes, AttrNumber attributeNumber[], uint16 parameterCount, Datum *parameter, FuncIndexInfo *funcInfo, PredInfo *predInfo); diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h index b12390ceed..bd3c6127dd 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.14 1998/01/24 22:48:27 momjian Exp $ + * $Id: indexing.h,v 1.15 1998/02/26 04:40:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -66,21 +66,25 @@ extern char *IndexedCatalogNames[]; */ extern void CatalogOpenIndices(int nIndices, char *names[], Relation idescs[]); extern void CatalogCloseIndices(int nIndices, Relation *idescs); -extern void CatalogIndexInsert(Relation *idescs, +extern void +CatalogIndexInsert(Relation *idescs, int nIndices, Relation heapRelation, HeapTuple heapTuple); extern bool CatalogHasIndex(char *catName, Oid catId); -extern HeapTuple AttributeNameIndexScan(Relation heapRelation, +extern HeapTuple +AttributeNameIndexScan(Relation heapRelation, Oid relid, char *attname); -extern HeapTuple AttributeNumIndexScan(Relation heapRelation, +extern HeapTuple +AttributeNumIndexScan(Relation heapRelation, Oid relid, AttrNumber attnum); extern HeapTuple ProcedureOidIndexScan(Relation heapRelation, Oid procId); -extern HeapTuple ProcedureNameIndexScan(Relation heapRelation, +extern HeapTuple +ProcedureNameIndexScan(Relation heapRelation, char *procName, int nargs, Oid *argTypes); extern HeapTuple ProcedureSrcIndexScan(Relation heapRelation, text *procSrc); extern HeapTuple TypeOidIndexScan(Relation heapRelation, Oid typeId); diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h index 6ba8d1ee52..5ca32d0527 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.13 1998/01/24 22:48:31 momjian Exp $ + * $Id: pg_aggregate.h,v 1.14 1998/02/26 04:40:44 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -88,11 +88,11 @@ typedef FormData_pg_aggregate *Form_pg_aggregate; * --------------- */ -DATA(insert OID = 0 ( avg PGUID int4pl int4inc int4div 23 23 23 23 _null_ 0 )); -DATA(insert OID = 0 ( avg PGUID int2pl int2inc int2div 21 21 21 21 _null_ 0 )); -DATA(insert OID = 0 ( avg PGUID float4pl float4inc float4div 700 700 700 700 _null_ 0.0 )); -DATA(insert OID = 0 ( avg PGUID float8pl float8inc float8div 701 701 701 701 _null_ 0.0 )); -DATA(insert OID = 0 ( avg PGUID cash_pl float8inc cash_div_flt8 790 790 701 790 _null_ 0.0 )); +DATA(insert OID = 0 ( avg PGUID int4pl int4inc int4div 23 23 23 23 _null_ 0 )); +DATA(insert OID = 0 ( avg PGUID int2pl int2inc int2div 21 21 21 21 _null_ 0 )); +DATA(insert OID = 0 ( avg PGUID float4pl float4inc float4div 700 700 700 700 _null_ 0.0 )); +DATA(insert OID = 0 ( avg PGUID float8pl float8inc float8div 701 701 701 701 _null_ 0.0 )); +DATA(insert OID = 0 ( avg PGUID cash_pl float8inc cash_div_flt8 790 790 701 790 _null_ 0.0 )); DATA(insert OID = 0 ( avg PGUID timespan_pl float8inc timespan_div 1186 1186 701 1186 _null_ 0.0 )); DATA(insert OID = 0 ( sum PGUID int4pl - - 23 23 0 23 _null_ _null_ )); @@ -129,7 +129,8 @@ DATA(insert OID = 0 ( count PGUID - int4inc - 0 0 23 23 _null_ 0 )); /* * prototypes for functions in pg_aggregate.c */ -extern void AggregateCreate(char *aggName, +extern void +AggregateCreate(char *aggName, char *aggtransfn1Name, char *aggtransfn2Name, char *aggfinalfnName, @@ -138,7 +139,8 @@ extern void AggregateCreate(char *aggName, char *aggtransfn2typeName, char *agginitval1, char *agginitval2); -extern char * AggNameGetInitVal(char *aggName, Oid basetype, +extern char * +AggNameGetInitVal(char *aggName, Oid basetype, int xfuncno, bool *isNull); #endif /* PG_AGGREGATE_H */ diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h index cd1193424a..76948533d4 100644 --- a/src/include/catalog/pg_amop.h +++ b/src/include/catalog/pg_amop.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_amop.h,v 1.8 1997/11/30 23:03:28 thomas Exp $ + * $Id: pg_amop.h,v 1.9 1998/02/26 04:40:47 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -540,29 +540,29 @@ BKI_END */ /* int2_ops */ -DATA(insert OID = 0 ( 405 421 94 1 hashsel hashnpage )); +DATA(insert OID = 0 ( 405 421 94 1 hashsel hashnpage )); /* float8_ops */ -DATA(insert OID = 0 ( 405 423 670 1 hashsel hashnpage )); +DATA(insert OID = 0 ( 405 423 670 1 hashsel hashnpage )); /* int4_ops */ -DATA(insert OID = 0 ( 405 426 96 1 hashsel hashnpage )); +DATA(insert OID = 0 ( 405 426 96 1 hashsel hashnpage )); /* oid_ops */ -DATA(insert OID = 0 ( 405 427 607 1 hashsel hashnpage )); +DATA(insert OID = 0 ( 405 427 607 1 hashsel hashnpage )); /* float4_ops */ -DATA(insert OID = 0 ( 405 428 620 1 hashsel hashnpage )); +DATA(insert OID = 0 ( 405 428 620 1 hashsel hashnpage )); /* char_ops */ -DATA(insert OID = 0 ( 405 429 92 1 hashsel hashnpage )); +DATA(insert OID = 0 ( 405 429 92 1 hashsel hashnpage )); /* char2_ops */ -DATA(insert OID = 0 ( 405 406 412 1 hashsel hashnpage )); +DATA(insert OID = 0 ( 405 406 412 1 hashsel hashnpage )); /* char4_ops */ -DATA(insert OID = 0 ( 405 407 413 1 hashsel hashnpage )); +DATA(insert OID = 0 ( 405 407 413 1 hashsel hashnpage )); /* char8_ops */ -DATA(insert OID = 0 ( 405 408 414 1 hashsel hashnpage )); +DATA(insert OID = 0 ( 405 408 414 1 hashsel hashnpage )); /* char16_ops */ -DATA(insert OID = 0 ( 405 430 1267 1 hashsel hashnpage )); +DATA(insert OID = 0 ( 405 430 1267 1 hashsel hashnpage )); /* name_ops */ DATA(insert OID = 0 ( 405 1181 93 1 hashsel hashnpage )); /* text_ops */ -DATA(insert OID = 0 ( 405 431 98 1 hashsel hashnpage )); +DATA(insert OID = 0 ( 405 431 98 1 hashsel hashnpage )); /* bpchar_ops */ DATA(insert OID = 0 ( 405 1076 1054 1 hashsel hashnpage )); /* varchar_ops */ diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index 2fc383a50c..91ab9f46bf 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_attribute.h,v 1.29 1998/02/25 13:09:24 scrappy Exp $ + * $Id: pg_attribute.h,v 1.30 1998/02/26 04:40:48 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -77,6 +77,7 @@ CATALOG(pg_attribute) BOOTSTRAP int4 attnelems; int4 attcacheoff; + /* * fastgetattr() uses attcacheoff to cache byte offsets of attributes * in heap tuples. The data actually stored in pg_attribute (-1) @@ -86,13 +87,15 @@ CATALOG(pg_attribute) BOOTSTRAP */ int2 atttypmod; + /* * atttypmod records type-specific modifications supplied at table - * creation time, and passes it to input and output functions as the - * third argument. + * creation time, and passes it to input and output functions as the + * third argument. */ bool attbyval; + /* * attbyval is a copy of the typbyval field from pg_type for this * attribute. See atttypid above. See struct TypeTupleFormData for @@ -176,21 +179,21 @@ typedef FormData_pg_attribute *AttributeTupleForm; */ #define Schema_pg_type \ { 1247l, {"typname"}, 19l, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ -{ 1247l, {"typowner"}, 26l, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1247l, {"typlen"}, 21l, 0, 2, 3, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ -{ 1247l, {"typprtlen"}, 21l, 0, 2, 4, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ -{ 1247l, {"typbyval"}, 16l, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1247l, {"typtype"}, 18l, 0, 1, 6, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1247l, {"typisdefined"}, 16l, 0, 1, 7, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1247l, {"typdelim"}, 18l, 0, 1, 8, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1247l, {"typrelid"}, 26l, 0, 4, 9, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1247l, {"typelem"}, 26l, 0, 4, 10, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1247l, {"typinput"}, 24l, 0, 4, 11, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1247l, {"typoutput"}, 24l, 0, 4, 12, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1247l, {"typreceive"}, 24l, 0, 4, 13, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1247l, {"typsend"}, 24l, 0, 4, 14, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1247l, {"typalign"}, 18l, 0, 1, 15, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1247l, {"typdefault"}, 25l, 0, -1, 16, 0, -1, -1, '\0' , '\0', 'i', '\0', '\0' } +{ 1247l, {"typowner"}, 26l, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1247l, {"typlen"}, 21l, 0, 2, 3, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ +{ 1247l, {"typprtlen"}, 21l, 0, 2, 4, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ +{ 1247l, {"typbyval"}, 16l, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1247l, {"typtype"}, 18l, 0, 1, 6, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1247l, {"typisdefined"}, 16l, 0, 1, 7, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1247l, {"typdelim"}, 18l, 0, 1, 8, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1247l, {"typrelid"}, 26l, 0, 4, 9, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1247l, {"typelem"}, 26l, 0, 4, 10, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1247l, {"typinput"}, 24l, 0, 4, 11, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1247l, {"typoutput"}, 24l, 0, 4, 12, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1247l, {"typreceive"}, 24l, 0, 4, 13, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1247l, {"typsend"}, 24l, 0, 4, 14, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1247l, {"typalign"}, 18l, 0, 1, 15, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1247l, {"typdefault"}, 25l, 0, -1, 16, 0, -1, -1, '\0' , '\0', 'i', '\0', '\0' } DATA(insert OID = 0 ( 1247 typname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f)); DATA(insert OID = 0 ( 1247 typowner 26 0 4 2 0 -1 -1 t f i f f)); @@ -239,7 +242,7 @@ DATA(insert OID = 0 ( 1262 cmax 29 0 4 -6 0 -1 -1 t f i f f)); { 1255l, {"prolang"}, 26l, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1255l, {"proisinh"}, 16l, 0, 1, 4, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1255l, {"proistrusted"}, 16l, 0, 1, 5, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1255l, {"proiscachable"}, 16l, 0, 1, 6, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ +{ 1255l, {"proiscachable"}, 16l, 0, 1, 6, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1255l, {"pronargs"}, 21l, 0, 2, 7, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ { 1255l, {"proretset"}, 16l, 0, 1, 8, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1255l, {"prorettype"}, 26l, 0, 4, 9, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ @@ -278,14 +281,14 @@ DATA(insert OID = 0 ( 1255 cmax 29 0 4 -6 0 -1 -1 t f i f f)); * pg_shadow * ---------------- */ -DATA(insert OID = 0 ( 1260 usename 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f)); -DATA(insert OID = 0 ( 1260 usesysid 23 0 4 2 0 -1 -1 t f s f f)); -DATA(insert OID = 0 ( 1260 usecreatedb 16 0 1 3 0 -1 -1 t f c f f)); -DATA(insert OID = 0 ( 1260 usetrace 16 0 1 4 0 -1 -1 t f c f f)); -DATA(insert OID = 0 ( 1260 usesuper 16 0 1 5 0 -1 -1 t f c f f)); -DATA(insert OID = 0 ( 1260 usecatupd 16 0 1 6 0 -1 -1 t f c f f)); -DATA(insert OID = 0 ( 1260 passwd 25 0 -1 7 0 -1 -1 f f i f f)); -DATA(insert OID = 0 ( 1260 valuntil 702 0 4 8 0 -1 -1 t f i f f)); +DATA(insert OID = 0 ( 1260 usename 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f)); +DATA(insert OID = 0 ( 1260 usesysid 23 0 4 2 0 -1 -1 t f s f f)); +DATA(insert OID = 0 ( 1260 usecreatedb 16 0 1 3 0 -1 -1 t f c f f)); +DATA(insert OID = 0 ( 1260 usetrace 16 0 1 4 0 -1 -1 t f c f f)); +DATA(insert OID = 0 ( 1260 usesuper 16 0 1 5 0 -1 -1 t f c f f)); +DATA(insert OID = 0 ( 1260 usecatupd 16 0 1 6 0 -1 -1 t f c f f)); +DATA(insert OID = 0 ( 1260 passwd 25 0 -1 7 0 -1 -1 f f i f f)); +DATA(insert OID = 0 ( 1260 valuntil 702 0 4 8 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1260 ctid 27 0 6 -1 0 -1 -1 f f i f f)); DATA(insert OID = 0 ( 1260 oid 26 0 4 -2 0 -1 -1 t f i f f)); DATA(insert OID = 0 ( 1260 xmin 28 0 4 -3 0 -1 -1 f f i f f)); @@ -313,14 +316,14 @@ DATA(insert OID = 0 ( 1261 cmax 29 0 4 -6 0 -1 -1 t f i f f)); */ #define Schema_pg_attribute \ { 1249l, {"attrelid"}, 26l, 0, 4, 1, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1249l, {"attname"}, 19l, 0, NAMEDATALEN, 2, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ +{ 1249l, {"attname"}, 19l, 0, NAMEDATALEN, 2, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ { 1249l, {"atttypid"}, 26l, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1249l, {"attdisbursion"}, 700l, 0, 4, 4, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ +{ 1249l, {"attdisbursion"}, 700l, 0, 4, 4, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ { 1249l, {"attlen"}, 21l, 0, 2, 5, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ { 1249l, {"attnum"}, 21l, 0, 2, 6, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ { 1249l, {"attnelems"}, 23l, 0, 4, 7, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1249l, {"attcacheoff"}, 23l, 0, 4, 8, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1249l, {"atttypmod"}, 21l, 0, 2, 9, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ +{ 1249l, {"atttypmod"}, 21l, 0, 2, 9, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ { 1249l, {"attbyval"}, 16l, 0, 1, 10, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1249l, {"attisset"}, 16l, 0, 1, 11, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1249l, {"attalign"}, 18l, 0, 1, 12, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ @@ -354,19 +357,19 @@ DATA(insert OID = 0 ( 1249 cmax 29 0 4 -6 0 -1 -1 t f i f f)); */ #define Schema_pg_class \ { 1259l, {"relname"}, 19l, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \ -{ 1259l, {"reltype"}, 26l, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1259l, {"relowner"}, 26l, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ -{ 1259l, {"relam"}, 26l, 0, 4, 4, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1259l, {"reltype"}, 26l, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1259l, {"relowner"}, 26l, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ +{ 1259l, {"relam"}, 26l, 0, 4, 4, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259l, {"relpages"}, 23, 0l, 4, 5, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259l, {"reltuples"}, 23, 0l, 4, 6, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \ { 1259l, {"relhasindex"}, 16, 0l, 1, 7, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1259l, {"relisshared"}, 16, 0l, 1, 8, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1259l, {"relkind"}, 18, 0l, 1, 9, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1259l, {"relnatts"}, 21, 0l, 2, 10, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ -{ 1259l, {"relchecks"}, 21l, 0, 2, 11, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ -{ 1259l, {"reltriggers"}, 21l, 0, 2, 12, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ +{ 1259l, {"relchecks"}, 21l, 0, 2, 11, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ +{ 1259l, {"reltriggers"}, 21l, 0, 2, 12, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ { 1259l, {"relhasrules"}, 16, 0l, 1, 13, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ -{ 1259l, {"relacl"}, 1034l, 0, -1, 14, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' } +{ 1259l, {"relacl"}, 1034l, 0, -1, 14, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' } DATA(insert OID = 0 ( 1259 relname 19 0 NAMEDATALEN 1 0 -1 -1 f f i f f)); DATA(insert OID = 0 ( 1259 reltype 26 0 4 2 0 -1 -1 t f i f f)); diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h index 0ff0eee91a..223c60f894 100644 --- a/src/include/catalog/pg_class.h +++ b/src/include/catalog/pg_class.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_class.h,v 1.19 1998/02/25 13:09:25 scrappy Exp $ + * $Id: pg_class.h,v 1.20 1998/02/26 04:40:52 momjian Exp $ * * NOTES * ``pg_relation'' is being replaced by ``pg_class''. currently @@ -68,7 +68,8 @@ CATALOG(pg_class) BOOTSTRAP * must be exactly this many instances in Class pg_attribute for this * class which have attnum > 0 (= user attribute). */ - int2 relchecks; /* # of CHECK constraints, not stored in db? */ + int2 relchecks; /* # of CHECK constraints, not stored in + * db? */ int2 reltriggers; /* # of TRIGGERs */ bool relhasrules; aclitem relacl[1]; /* this is here for the catalog */ diff --git a/src/include/catalog/pg_description.h b/src/include/catalog/pg_description.h index 5882eeb9b3..f2916ee3a8 100644 --- a/src/include/catalog/pg_description.h +++ b/src/include/catalog/pg_description.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_description.h,v 1.4 1997/11/16 04:36:41 momjian Exp $ + * $Id: pg_description.h,v 1.5 1998/02/26 04:40:53 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -28,7 +28,7 @@ */ /* ---------------- - * pg_description definition. cpp turns this into + * pg_description definition. cpp turns this into * typedef struct FormData_pg_description * ---------------- */ @@ -51,7 +51,7 @@ typedef FormData_pg_description *Form_pg_description; */ #define Natts_pg_description 2 #define Anum_pg_description_objoid 1 -#define Anum_pg_description_description 2 +#define Anum_pg_description_description 2 /* ---------------- * initial contents of pg_description @@ -59,7 +59,7 @@ typedef FormData_pg_description *Form_pg_description; */ /* Because the contents of this table are taken from the other *.h files, - there is no initialization. It is loaded from initdb using a COPY + there is no initialization. It is loaded from initdb using a COPY statement. */ diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h index c701dd8861..48fde89e39 100644 --- a/src/include/catalog/pg_operator.h +++ b/src/include/catalog/pg_operator.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_operator.h,v 1.24 1998/02/03 16:01:54 thomas Exp $ + * $Id: pg_operator.h,v 1.25 1998/02/26 04:40:56 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -387,7 +387,7 @@ DATA(insert OID = 795 ( "<=" PGUID 0 b t f 602 602 701 794 0 0 0 path_n DATA(insert OID = 796 ( ">=" PGUID 0 b t f 602 602 701 793 0 0 0 path_n_ge intltsel intltjoinsel )); DATA(insert OID = 797 ( "#" PGUID 0 l t f 0 602 23 0 0 0 0 path_npoints - - )); DATA(insert OID = 798 ( "?#" PGUID 0 b t f 602 602 16 0 0 0 0 path_inter - - )); -DATA(insert OID = 799 ( "@-@" PGUID 0 l t f 0 602 701 0 0 0 0 path_length - - )); +DATA(insert OID = 799 ( "@-@" PGUID 0 l t f 0 602 701 0 0 0 0 path_length - - )); DATA(insert OID = 800 ( ">^" PGUID 0 b t f 603 603 16 0 0 0 0 box_above intltsel intltjoinsel )); DATA(insert OID = 801 ( "<^" PGUID 0 b t f 603 603 16 0 0 0 0 box_below intltsel intltjoinsel )); DATA(insert OID = 802 ( "?#" PGUID 0 b t f 603 603 16 0 0 0 0 box_overlap - - )); @@ -657,12 +657,13 @@ DATA(insert OID = 1588 ( "<=" PGUID 0 b t f 601 601 16 1589 0 0 0 lseg_le DATA(insert OID = 1589 ( ">" PGUID 0 b t f 601 601 16 1588 0 0 0 lseg_gt intltsel - )); DATA(insert OID = 1590 ( ">=" PGUID 0 b t f 601 601 16 1587 0 0 0 lseg_ge intltsel - )); -DATA(insert OID = 1591 ( "@-@" PGUID 0 l t f 0 601 701 0 0 0 0 lseg_length - - )); +DATA(insert OID = 1591 ( "@-@" PGUID 0 l t f 0 601 701 0 0 0 0 lseg_length - - )); /* * function prototypes */ -extern void OperatorCreate(char *operatorName, +extern void +OperatorCreate(char *operatorName, char *leftTypeName, char *rightTypeName, char *procedureName, diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index ffc1e05da3..3606242bcb 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.46 1998/02/03 16:01:59 thomas Exp $ + * $Id: pg_proc.h,v 1.47 1998/02/26 04:40:59 momjian Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -178,7 +178,7 @@ DESCR("equals"); DATA(insert OID = 66 ( int4lt PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 67 ( texteq PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0 foo bar )); +DATA(insert OID = 67 ( texteq PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0 foo bar )); DESCR("equals"); #define TextEqualRegProcedure 67 @@ -209,13 +209,13 @@ DATA(insert OID = 79 ( nameregexeq PGUID 11 f t f 2 f 16 "19 25" 100 0 0 10 DESCR("matches regex., case-sensitive"); DATA(insert OID = 1252 ( nameregexne PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100 foo bar )); DESCR("does not match regex., case-sensitive"); -DATA(insert OID = 1254 ( textregexeq PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0 foo bar )); +DATA(insert OID = 1254 ( textregexeq PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0 foo bar )); DESCR("matches regex., case-sensitive"); -DATA(insert OID = 1256 ( textregexne PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0 foo bar )); +DATA(insert OID = 1256 ( textregexne PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0 foo bar )); DESCR("does not match regex., case-sensitive"); DATA(insert OID = 1257 ( textlen PGUID 11 f t f 1 f 23 "25" 100 0 1 0 foo bar )); DESCR("length"); -DATA(insert OID = 1258 ( textcat PGUID 11 f t f 2 f 25 "25 25" 100 0 1 0 foo bar )); +DATA(insert OID = 1258 ( textcat PGUID 11 f t f 2 f 25 "25 25" 100 0 1 0 foo bar )); DESCR("concat"); DATA(insert OID = 84 ( boolne PGUID 11 f t f 2 f 16 "16 16" 100 0 0 100 foo bar )); DESCR("not equal"); @@ -251,7 +251,7 @@ DATA(insert OID = 108 ( intgtjoinsel PGUID 11 f t f 5 f 701 "26 26 21 26 21" DESCR("selectivity"); DATA(insert OID = 112 ( int4_text PGUID 11 f t f 1 f 25 "23" 100 0 0 100 foo bar )); - DESCR("convert"); +DESCR("convert"); DATA(insert OID = 113 ( int2_text PGUID 11 f t f 1 f 25 "21" 100 0 0 100 foo bar )); DESCR("convert"); DATA(insert OID = 114 ( oid_text PGUID 11 f t f 1 f 25 "26" 100 0 0 100 foo bar )); @@ -278,29 +278,29 @@ DATA(insert OID = 123 ( box_in PGUID 11 f t f 1 f 603 "0" 100 0 0 100 foo DESCR("(internal)"); DATA(insert OID = 124 ( box_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); -DATA(insert OID = 125 ( box_overlap PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100 foo bar )); +DATA(insert OID = 125 ( box_overlap PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100 foo bar )); DESCR("overlaps"); -DATA(insert OID = 126 ( box_ge PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100 foo bar )); +DATA(insert OID = 126 ( box_ge PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100 foo bar )); DESCR("greater-than-or-equals"); -DATA(insert OID = 127 ( box_gt PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100 foo bar )); +DATA(insert OID = 127 ( box_gt PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100 foo bar )); DESCR("greater-than"); -DATA(insert OID = 128 ( box_eq PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100 foo bar )); +DATA(insert OID = 128 ( box_eq PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100 foo bar )); DESCR("equals"); -DATA(insert OID = 129 ( box_lt PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100 foo bar )); +DATA(insert OID = 129 ( box_lt PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 130 ( box_le PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100 foo bar )); +DATA(insert OID = 130 ( box_le PGUID 11 f t f 2 f 16 "603 603" 100 1 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 131 ( point_above PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); +DATA(insert OID = 131 ( point_above PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); DESCR("is above"); -DATA(insert OID = 132 ( point_left PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); +DATA(insert OID = 132 ( point_left PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); DESCR("is left of"); -DATA(insert OID = 133 ( point_right PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); +DATA(insert OID = 133 ( point_right PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); DESCR("is left of"); -DATA(insert OID = 134 ( point_below PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); +DATA(insert OID = 134 ( point_below PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); DESCR("is below"); -DATA(insert OID = 135 ( point_eq PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); +DATA(insert OID = 135 ( point_eq PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); DESCR("same as"); -DATA(insert OID = 136 ( on_pb PGUID 11 f t f 2 f 16 "600 603" 100 0 0 100 foo bar )); +DATA(insert OID = 136 ( on_pb PGUID 11 f t f 2 f 16 "600 603" 100 0 0 100 foo bar )); DESCR("point is inside"); DATA(insert OID = 137 ( on_ppath PGUID 11 f t f 2 f 16 "600 602" 100 0 1 0 foo bar )); DESCR("contained in"); @@ -314,7 +314,7 @@ DATA(insert OID = 141 ( int4mul PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100 DESCR("multiply"); DATA(insert OID = 142 ( int4fac PGUID 11 f t f 1 f 23 "23" 100 0 0 100 foo bar )); DESCR("fraction"); -DATA(insert OID = 143 ( pointdist PGUID 11 f t f 2 f 23 "600 600" 100 0 0 100 foo bar )); +DATA(insert OID = 143 ( pointdist PGUID 11 f t f 2 f 23 "600 600" 100 0 0 100 foo bar )); DESCR(""); DATA(insert OID = 144 ( int4ne PGUID 11 f t f 2 f 16 "23 23" 100 0 0 100 foo bar )); DESCR("not equal"); @@ -343,7 +343,7 @@ DATA(insert OID = 155 ( int2mod PGUID 11 f t f 2 f 21 "21 21" 100 0 0 100 DESCR("modulus"); DATA(insert OID = 156 ( int4mod PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100 foo bar )); DESCR("modulus"); -DATA(insert OID = 157 ( textne PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0 foo bar )); +DATA(insert OID = 157 ( textne PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0 foo bar )); DESCR("not equal"); DATA(insert OID = 158 ( int24eq PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100 foo bar )); DESCR("equals"); @@ -403,19 +403,19 @@ DESCR("equals"); DATA(insert OID = 185 ( oidne PGUID 11 f t f 2 f 16 "26 26" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 186 ( box_same PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100 foo bar )); +DATA(insert OID = 186 ( box_same PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100 foo bar )); DESCR("same as"); -DATA(insert OID = 187 ( box_contain PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100 foo bar )); +DATA(insert OID = 187 ( box_contain PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100 foo bar )); DESCR("contains"); -DATA(insert OID = 188 ( box_left PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100 foo bar )); +DATA(insert OID = 188 ( box_left PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100 foo bar )); DESCR("is left of"); -DATA(insert OID = 189 ( box_overleft PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100 foo bar )); +DATA(insert OID = 189 ( box_overleft PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100 foo bar )); DESCR("overlaps, but does not extend to right of"); -DATA(insert OID = 190 ( box_overright PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100 foo bar )); +DATA(insert OID = 190 ( box_overright PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100 foo bar )); DESCR("overlaps, but does not extend to left of"); -DATA(insert OID = 191 ( box_right PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100 foo bar )); +DATA(insert OID = 191 ( box_right PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100 foo bar )); DESCR("is left of"); -DATA(insert OID = 192 ( box_contained PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100 foo bar )); +DATA(insert OID = 192 ( box_contained PGUID 11 f t f 2 f 16 "603 603" 100 0 0 100 foo bar )); DESCR("contained in"); DATA(insert OID = 193 ( rt_box_union PGUID 11 f t f 2 f 603 "603 603" 100 0 0 100 foo bar )); DESCR("r-tree"); @@ -534,53 +534,53 @@ DATA(insert OID = 246 ( tintervalin PGUID 11 f t f 1 f 704 "0" 100 0 0 100 DESCR("(internal)"); DATA(insert OID = 247 ( tintervalout PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); -DATA(insert OID = 248 ( ininterval PGUID 11 f t f 2 f 16 "702 704" 100 0 0 100 foo bar )); +DATA(insert OID = 248 ( ininterval PGUID 11 f t f 2 f 16 "702 704" 100 0 0 100 foo bar )); DESCR("abstime in tinterval"); DATA(insert OID = 249 ( intervalrel PGUID 11 f t f 1 f 703 "704" 100 0 0 100 foo bar )); DESCR(""); DATA(insert OID = 250 ( timenow PGUID 11 f t f 0 f 702 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); -DATA(insert OID = 251 ( abstimeeq PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100 foo bar )); +DATA(insert OID = 251 ( abstimeeq PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100 foo bar )); DESCR("equals"); -DATA(insert OID = 252 ( abstimene PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100 foo bar )); +DATA(insert OID = 252 ( abstimene PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 253 ( abstimelt PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100 foo bar )); +DATA(insert OID = 253 ( abstimelt PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 254 ( abstimegt PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100 foo bar )); +DATA(insert OID = 254 ( abstimegt PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100 foo bar )); DESCR("greater-than"); -DATA(insert OID = 255 ( abstimele PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100 foo bar )); +DATA(insert OID = 255 ( abstimele PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 256 ( abstimege PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100 foo bar )); +DATA(insert OID = 256 ( abstimege PGUID 11 f t f 2 f 16 "702 702" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); -DATA(insert OID = 257 ( reltimeeq PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100 foo bar )); +DATA(insert OID = 257 ( reltimeeq PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100 foo bar )); DESCR("equals"); -DATA(insert OID = 258 ( reltimene PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100 foo bar )); +DATA(insert OID = 258 ( reltimene PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 259 ( reltimelt PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100 foo bar )); +DATA(insert OID = 259 ( reltimelt PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 260 ( reltimegt PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100 foo bar )); +DATA(insert OID = 260 ( reltimegt PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100 foo bar )); DESCR("greater-than"); -DATA(insert OID = 261 ( reltimele PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100 foo bar )); +DATA(insert OID = 261 ( reltimele PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 262 ( reltimege PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100 foo bar )); +DATA(insert OID = 262 ( reltimege PGUID 11 f t f 2 f 16 "703 703" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); -DATA(insert OID = 263 ( intervalsame PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); +DATA(insert OID = 263 ( intervalsame PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); DESCR("same as"); -DATA(insert OID = 264 ( intervalct PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); +DATA(insert OID = 264 ( intervalct PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 265 ( intervalov PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); +DATA(insert OID = 265 ( intervalov PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); DESCR("overlaps"); -DATA(insert OID = 266 ( intervalleneq PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 foo bar )); +DATA(insert OID = 266 ( intervalleneq PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 foo bar )); DESCR("length equals"); -DATA(insert OID = 267 ( intervallenne PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 foo bar )); +DATA(insert OID = 267 ( intervallenne PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 foo bar )); DESCR("length not equal to"); -DATA(insert OID = 268 ( intervallenlt PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 foo bar )); +DATA(insert OID = 268 ( intervallenlt PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 foo bar )); DESCR("length less-than"); -DATA(insert OID = 269 ( intervallengt PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 foo bar )); +DATA(insert OID = 269 ( intervallengt PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 foo bar )); DESCR("length greater-than"); -DATA(insert OID = 270 ( intervallenle PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 foo bar )); +DATA(insert OID = 270 ( intervallenle PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 foo bar )); DESCR("length less-than-or-equals"); -DATA(insert OID = 271 ( intervallenge PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 foo bar )); +DATA(insert OID = 271 ( intervallenge PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 foo bar )); DESCR("length greater-than-or-equals"); DATA(insert OID = 272 ( intervalstart PGUID 11 f t f 1 f 702 "704" 100 0 0 100 foo bar )); DESCR("start of interval"); @@ -588,15 +588,15 @@ DATA(insert OID = 273 ( intervalend PGUID 11 f t f 1 f 702 "704" 100 0 0 100 DESCR(""); DATA(insert OID = 274 ( timeofday PGUID 11 f t f 0 f 25 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); -DATA(insert OID = 275 ( abstime_finite PGUID 11 f t f 1 f 16 "702" 100 0 0 100 foo bar )); +DATA(insert OID = 275 ( abstime_finite PGUID 11 f t f 1 f 16 "702" 100 0 0 100 foo bar )); DESCR(""); DATA(insert OID = 276 ( int2fac PGUID 11 f t f 1 f 21 "21" 100 0 0 100 foo bar )); DESCR(""); -DATA(insert OID = 277 ( inter_sl PGUID 11 f t f 2 f 16 "601 628" 100 0 0 100 foo bar )); +DATA(insert OID = 277 ( inter_sl PGUID 11 f t f 2 f 16 "601 628" 100 0 0 100 foo bar )); DESCR(""); -DATA(insert OID = 278 ( inter_lb PGUID 11 f t f 2 f 16 "628 603" 100 0 0 100 foo bar )); +DATA(insert OID = 278 ( inter_lb PGUID 11 f t f 2 f 16 "628 603" 100 0 0 100 foo bar )); DESCR(""); DATA(insert OID = 279 ( float48mul PGUID 11 f t f 2 f 701 "700 701" 100 0 0 100 foo bar )); @@ -616,58 +616,58 @@ DESCR("addition"); DATA(insert OID = 286 ( float84mi PGUID 11 f t f 2 f 701 "701 700" 100 0 0 100 foo bar )); DESCR("subtract"); -DATA(insert OID = 287 ( float4eq PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100 foo bar )); +DATA(insert OID = 287 ( float4eq PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100 foo bar )); DESCR("equals"); -DATA(insert OID = 288 ( float4ne PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100 foo bar )); +DATA(insert OID = 288 ( float4ne PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 289 ( float4lt PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100 foo bar )); +DATA(insert OID = 289 ( float4lt PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 290 ( float4le PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100 foo bar )); +DATA(insert OID = 290 ( float4le PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 291 ( float4gt PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100 foo bar )); +DATA(insert OID = 291 ( float4gt PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100 foo bar )); DESCR("greater-than"); -DATA(insert OID = 292 ( float4ge PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100 foo bar )); +DATA(insert OID = 292 ( float4ge PGUID 11 f t f 2 f 16 "700 700" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); -DATA(insert OID = 293 ( float8eq PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100 foo bar )); +DATA(insert OID = 293 ( float8eq PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100 foo bar )); DESCR("equals"); -DATA(insert OID = 294 ( float8ne PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100 foo bar )); +DATA(insert OID = 294 ( float8ne PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 295 ( float8lt PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100 foo bar )); +DATA(insert OID = 295 ( float8lt PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 296 ( float8le PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100 foo bar )); +DATA(insert OID = 296 ( float8le PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 297 ( float8gt PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100 foo bar )); +DATA(insert OID = 297 ( float8gt PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100 foo bar )); DESCR("greater-than"); -DATA(insert OID = 298 ( float8ge PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100 foo bar )); +DATA(insert OID = 298 ( float8ge PGUID 11 f t f 2 f 16 "701 701" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); -DATA(insert OID = 299 ( float48eq PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100 foo bar )); +DATA(insert OID = 299 ( float48eq PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100 foo bar )); DESCR("equals"); /* OIDS 300 - 399 */ -DATA(insert OID = 300 ( float48ne PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100 foo bar )); +DATA(insert OID = 300 ( float48ne PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 301 ( float48lt PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100 foo bar )); +DATA(insert OID = 301 ( float48lt PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 302 ( float48le PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100 foo bar )); +DATA(insert OID = 302 ( float48le PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 303 ( float48gt PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100 foo bar )); +DATA(insert OID = 303 ( float48gt PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100 foo bar )); DESCR("greater-than"); -DATA(insert OID = 304 ( float48ge PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100 foo bar )); +DATA(insert OID = 304 ( float48ge PGUID 11 f t f 2 f 16 "700 701" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); -DATA(insert OID = 305 ( float84eq PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100 foo bar )); +DATA(insert OID = 305 ( float84eq PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100 foo bar )); DESCR("equals"); -DATA(insert OID = 306 ( float84ne PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100 foo bar )); +DATA(insert OID = 306 ( float84ne PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 307 ( float84lt PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100 foo bar )); +DATA(insert OID = 307 ( float84lt PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 308 ( float84le PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100 foo bar )); +DATA(insert OID = 308 ( float84le PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 309 ( float84gt PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100 foo bar )); +DATA(insert OID = 309 ( float84gt PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100 foo bar )); DESCR("greater-than"); -DATA(insert OID = 310 ( float84ge PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100 foo bar )); +DATA(insert OID = 310 ( float84ge PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); DATA(insert OID = 311 ( ftod PGUID 11 f t f 2 f 701 "700" 100 0 0 100 foo bar )); @@ -678,7 +678,7 @@ DATA(insert OID = 313 ( i2toi4 PGUID 11 f t f 1 f 23 "21" 100 0 0 100 f DESCR("convert"); DATA(insert OID = 314 ( i4toi2 PGUID 11 f t f 1 f 21 "23" 100 0 0 100 foo bar )); DESCR("convert"); -DATA(insert OID = 315 ( keyfirsteq PGUID 11 f t f 2 f 16 "0 21" 100 0 0 100 foo bar )); +DATA(insert OID = 315 ( keyfirsteq PGUID 11 f t f 2 f 16 "0 21" 100 0 0 100 foo bar )); DESCR(""); DATA(insert OID = 316 ( i4tod PGUID 11 f t f 1 f 701 "23" 100 0 0 100 foo bar )); DESCR("convert"); @@ -755,13 +755,13 @@ DATA(insert OID = 352 ( btint42cmp PGUID 11 f t f 2 f 23 "23 21" 100 0 0 10 DESCR("btree less-equal-greater"); DATA(insert OID = 353 ( btint24cmp PGUID 11 f t f 2 f 23 "21 23" 100 0 0 100 foo bar )); DESCR("btree less-equal-greater"); -DATA(insert OID = 354 ( btfloat4cmp PGUID 11 f t f 2 f 23 "700 700" 100 0 0 100 foo bar )); +DATA(insert OID = 354 ( btfloat4cmp PGUID 11 f t f 2 f 23 "700 700" 100 0 0 100 foo bar )); DESCR("btree less-equal-greater"); -DATA(insert OID = 355 ( btfloat8cmp PGUID 11 f t f 2 f 23 "701 701" 100 0 0 100 foo bar )); +DATA(insert OID = 355 ( btfloat8cmp PGUID 11 f t f 2 f 23 "701 701" 100 0 0 100 foo bar )); DESCR("btree less-equal-greater"); DATA(insert OID = 356 ( btoidcmp PGUID 11 f t f 2 f 23 "26 26" 100 0 0 100 foo bar )); DESCR("btree less-equal-greater"); -DATA(insert OID = 357 ( btabstimecmp PGUID 11 f t f 2 f 23 "702 702" 100 0 0 100 foo bar )); +DATA(insert OID = 357 ( btabstimecmp PGUID 11 f t f 2 f 23 "702 702" 100 0 0 100 foo bar )); DESCR("btree less-equal-greater"); DATA(insert OID = 358 ( btcharcmp PGUID 11 f t f 2 f 23 "18 18" 100 0 0 100 foo bar )); DESCR("btree less-equal-greater"); @@ -786,15 +786,15 @@ DATA(insert OID = 367 ( close_pb PGUID 11 f t f 2 f 600 "600 603" 100 0 0 1 DESCR("closest point on box"); DATA(insert OID = 368 ( close_sb PGUID 11 f t f 2 f 600 "601 603" 100 0 0 100 foo bar )); DESCR("closest point to line segment on box"); -DATA(insert OID = 369 ( on_ps PGUID 11 f t f 2 f 16 "600 601" 100 0 0 100 foo bar )); +DATA(insert OID = 369 ( on_ps PGUID 11 f t f 2 f 16 "600 601" 100 0 0 100 foo bar )); DESCR("contained in"); DATA(insert OID = 370 ( path_distance PGUID 11 f t f 2 f 701 "602 602" 100 0 1 0 foo bar )); DESCR("distance between"); DATA(insert OID = 371 ( dist_ppath PGUID 11 f t f 2 f 701 "600 602" 100 0 1 0 foo bar )); DESCR("distance between"); -DATA(insert OID = 372 ( on_sb PGUID 11 f t f 2 f 16 "601 603" 100 0 0 100 foo bar )); +DATA(insert OID = 372 ( on_sb PGUID 11 f t f 2 f 16 "601 603" 100 0 0 100 foo bar )); DESCR("contained in"); -DATA(insert OID = 373 ( inter_sb PGUID 11 f t f 2 f 16 "601 603" 100 0 0 100 foo bar )); +DATA(insert OID = 373 ( inter_sb PGUID 11 f t f 2 f 16 "601 603" 100 0 0 100 foo bar )); DESCR(""); DATA(insert OID = 1274 ( btchar16cmp PGUID 11 f t f 2 f 23 "19 19" 100 0 0 100 foo bar )); DESCR("btree less-equal-greater"); @@ -828,9 +828,9 @@ DATA(insert OID = 449 ( hashint2 PGUID 11 f t f 2 f 23 "21 21" 100 0 0 100 DESCR("hash"); DATA(insert OID = 450 ( hashint4 PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100 foo bar )); DESCR("hash"); -DATA(insert OID = 451 ( hashfloat4 PGUID 11 f t f 2 f 23 "700 700" 100 0 0 100 foo bar )); +DATA(insert OID = 451 ( hashfloat4 PGUID 11 f t f 2 f 23 "700 700" 100 0 0 100 foo bar )); DESCR("hash"); -DATA(insert OID = 452 ( hashfloat8 PGUID 11 f t f 2 f 23 "701 701" 100 0 0 100 foo bar )); +DATA(insert OID = 452 ( hashfloat8 PGUID 11 f t f 2 f 23 "701 701" 100 0 0 100 foo bar )); DESCR("hash"); DATA(insert OID = 453 ( hashoid PGUID 11 f t f 2 f 23 "26 26" 100 0 0 100 foo bar )); DESCR("hash"); @@ -852,31 +852,31 @@ DATA(insert OID = 470 ( char4out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo DESCR("(internal)"); DATA(insert OID = 471 ( char8out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); -DATA(insert OID = 472 ( char2eq PGUID 11 f t f 2 f 16 "409 409" 100 0 0 100 foo bar )); +DATA(insert OID = 472 ( char2eq PGUID 11 f t f 2 f 16 "409 409" 100 0 0 100 foo bar )); DESCR("equals"); -DATA(insert OID = 473 ( char4eq PGUID 11 f t f 2 f 16 "410 410" 100 0 0 100 foo bar )); +DATA(insert OID = 473 ( char4eq PGUID 11 f t f 2 f 16 "410 410" 100 0 0 100 foo bar )); DESCR("equals"); -DATA(insert OID = 474 ( char8eq PGUID 11 f t f 2 f 16 "411 411" 100 0 0 100 foo bar )); +DATA(insert OID = 474 ( char8eq PGUID 11 f t f 2 f 16 "411 411" 100 0 0 100 foo bar )); DESCR("equals"); -DATA(insert OID = 475 ( char2lt PGUID 11 f t f 2 f 16 "409 409" 100 0 0 100 foo bar )); +DATA(insert OID = 475 ( char2lt PGUID 11 f t f 2 f 16 "409 409" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 476 ( char4lt PGUID 11 f t f 2 f 16 "410 410" 100 0 0 100 foo bar )); +DATA(insert OID = 476 ( char4lt PGUID 11 f t f 2 f 16 "410 410" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 477 ( char8lt PGUID 11 f t f 2 f 16 "411 411" 100 0 0 100 foo bar )); +DATA(insert OID = 477 ( char8lt PGUID 11 f t f 2 f 16 "411 411" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 478 ( char2le PGUID 11 f t f 2 f 16 "409 409" 100 0 0 100 foo bar )); +DATA(insert OID = 478 ( char2le PGUID 11 f t f 2 f 16 "409 409" 100 0 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 479 ( char4le PGUID 11 f t f 2 f 16 "410 410" 100 0 0 100 foo bar )); +DATA(insert OID = 479 ( char4le PGUID 11 f t f 2 f 16 "410 410" 100 0 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 480 ( char8le PGUID 11 f t f 2 f 16 "411 411" 100 0 0 100 foo bar )); +DATA(insert OID = 480 ( char8le PGUID 11 f t f 2 f 16 "411 411" 100 0 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 481 ( char2gt PGUID 11 f t f 2 f 16 "409 409" 100 0 0 100 foo bar )); +DATA(insert OID = 481 ( char2gt PGUID 11 f t f 2 f 16 "409 409" 100 0 0 100 foo bar )); DESCR("greater-than"); -DATA(insert OID = 482 ( char4gt PGUID 11 f t f 2 f 16 "410 410" 100 0 0 100 foo bar )); +DATA(insert OID = 482 ( char4gt PGUID 11 f t f 2 f 16 "410 410" 100 0 0 100 foo bar )); DESCR("greater-than"); -DATA(insert OID = 483 ( char8gt PGUID 11 f t f 2 f 16 "411 411" 100 0 0 100 foo bar )); +DATA(insert OID = 483 ( char8gt PGUID 11 f t f 2 f 16 "411 411" 100 0 0 100 foo bar )); DESCR("greater-than"); -DATA(insert OID = 484 ( char2ge PGUID 11 f t f 2 f 16 "409 409" 100 0 0 100 foo bar )); +DATA(insert OID = 484 ( char2ge PGUID 11 f t f 2 f 16 "409 409" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); DATA(insert OID = 1275 ( char16eq PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100 foo bar )); DESCR("equals"); @@ -920,27 +920,27 @@ DATA(insert OID = 682 ( mktinterval PGUID 11 f t f 2 f 704 "702 702" 100 0 0 DESCR("convert to interval"); DATA(insert OID = 683 ( oid8eq PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100 foo bar )); DESCR("equals"); -DATA(insert OID = 684 ( char4ge PGUID 11 f t f 2 f 16 "410 410" 100 0 0 100 foo bar )); +DATA(insert OID = 684 ( char4ge PGUID 11 f t f 2 f 16 "410 410" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); -DATA(insert OID = 685 ( char8ge PGUID 11 f t f 2 f 16 "411 411" 100 0 0 100 foo bar )); +DATA(insert OID = 685 ( char8ge PGUID 11 f t f 2 f 16 "411 411" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); -DATA(insert OID = 686 ( char2ne PGUID 11 f t f 2 f 16 "409 409" 100 0 0 100 foo bar )); +DATA(insert OID = 686 ( char2ne PGUID 11 f t f 2 f 16 "409 409" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 687 ( char4ne PGUID 11 f t f 2 f 16 "410 410" 100 0 0 100 foo bar )); +DATA(insert OID = 687 ( char4ne PGUID 11 f t f 2 f 16 "410 410" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 688 ( char8ne PGUID 11 f t f 2 f 16 "411 411" 100 0 0 100 foo bar )); +DATA(insert OID = 688 ( char8ne PGUID 11 f t f 2 f 16 "411 411" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 689 ( btchar2cmp PGUID 11 f t f 2 f 23 "409 409" 100 0 0 100 foo bar )); +DATA(insert OID = 689 ( btchar2cmp PGUID 11 f t f 2 f 23 "409 409" 100 0 0 100 foo bar )); DESCR("btree less-equal-greater"); -DATA(insert OID = 690 ( btchar4cmp PGUID 11 f t f 2 f 23 "410 410" 100 0 0 100 foo bar )); +DATA(insert OID = 690 ( btchar4cmp PGUID 11 f t f 2 f 23 "410 410" 100 0 0 100 foo bar )); DESCR("btree less-equal-greater"); -DATA(insert OID = 691 ( btchar8cmp PGUID 11 f t f 2 f 23 "411 411" 100 0 0 100 foo bar )); +DATA(insert OID = 691 ( btchar8cmp PGUID 11 f t f 2 f 23 "411 411" 100 0 0 100 foo bar )); DESCR("btree less-equal-greater"); -DATA(insert OID = 692 ( hashchar2 PGUID 11 f t f 2 f 23 "409 409" 100 0 0 100 foo bar )); +DATA(insert OID = 692 ( hashchar2 PGUID 11 f t f 2 f 23 "409 409" 100 0 0 100 foo bar )); DESCR("hash"); -DATA(insert OID = 693 ( hashchar4 PGUID 11 f t f 2 f 23 "410 410" 100 0 0 100 foo bar )); +DATA(insert OID = 693 ( hashchar4 PGUID 11 f t f 2 f 23 "410 410" 100 0 0 100 foo bar )); DESCR("hash"); -DATA(insert OID = 694 ( hashchar8 PGUID 11 f t f 2 f 23 "411 411" 100 0 0 100 foo bar )); +DATA(insert OID = 694 ( hashchar8 PGUID 11 f t f 2 f 23 "411 411" 100 0 0 100 foo bar )); DESCR("hash"); DATA(insert OID = 695 ( char8regexeq PGUID 11 f t f 2 f 16 "411 25" 100 0 0 100 foo bar )); DESCR("matches regex., case-sensitive"); @@ -994,13 +994,13 @@ DESCR("distance between"); DATA(insert OID = 730 ( pqtest PGUID 11 f t f 1 f 23 "25" 100 0 0 100 foo bar )); DESCR(""); -DATA(insert OID = 740 ( text_lt PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0 foo bar )); +DATA(insert OID = 740 ( text_lt PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0 foo bar )); DESCR("less-than"); -DATA(insert OID = 741 ( text_le PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0 foo bar )); +DATA(insert OID = 741 ( text_le PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 742 ( text_gt PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0 foo bar )); +DATA(insert OID = 742 ( text_gt PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0 foo bar )); DESCR("greater-than"); -DATA(insert OID = 743 ( text_ge PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0 foo bar )); +DATA(insert OID = 743 ( text_ge PGUID 11 f t f 2 f 16 "25 25" 100 0 0 0 foo bar )); DESCR("greater-than-or-equals"); DATA(insert OID = 744 ( array_eq PGUID 11 f t f 2 f 16 "0 0" 100 0 0 100 foo bar)); @@ -1015,9 +1015,9 @@ DATA(insert OID = 748 ( array_set PGUID 11 f t f 8 f 23 "0 23 0 0 23 23 23 DESCR("array"); DATA(insert OID = 749 ( array_ref PGUID 11 f t f 7 f 23 "0 23 0 23 23 23 0" 100 0 0 100 foo bar)); DESCR("array"); -DATA(insert OID = 750 ( array_in PGUID 11 f t f 2 f 23 "0 0" 100 0 0 100 foo bar )); +DATA(insert OID = 750 ( array_in PGUID 11 f t f 2 f 23 "0 0" 100 0 0 100 foo bar )); DESCR("array"); -DATA(insert OID = 751 ( array_out PGUID 11 f t f 2 f 23 "0 0" 100 0 0 100 foo bar )); +DATA(insert OID = 751 ( array_out PGUID 11 f t f 2 f 23 "0 0" 100 0 0 100 foo bar )); DESCR("array"); DATA(insert OID = 752 ( filename_in PGUID 11 f t f 2 f 605 "0" 100 0 0 100 foo bar )); @@ -1029,9 +1029,9 @@ DATA(insert OID = 760 ( smgrin PGUID 11 f t f 1 f 210 "0" 100 0 0 100 foo DESCR("storage manager(internal)"); DATA(insert OID = 761 ( smgrout PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); DESCR("storage manager(internal)"); -DATA(insert OID = 762 ( smgreq PGUID 11 f t f 2 f 16 "210 210" 100 0 0 100 foo bar )); +DATA(insert OID = 762 ( smgreq PGUID 11 f t f 2 f 16 "210 210" 100 0 0 100 foo bar )); DESCR("storage manager"); -DATA(insert OID = 763 ( smgrne PGUID 11 f t f 2 f 16 "210 210" 100 0 0 100 foo bar )); +DATA(insert OID = 763 ( smgrne PGUID 11 f t f 2 f 16 "210 210" 100 0 0 100 foo bar )); DESCR("storage manager"); DATA(insert OID = 764 ( lo_import PGUID 11 f t f 1 f 26 "25" 100 0 0 100 foo bar )); @@ -1074,17 +1074,17 @@ DESCR("gist(internal)"); DATA(insert OID = 782 ( gistbuild PGUID 11 f t f 9 f 23 "0" 100 0 0 100 foo bar )); DESCR("gist(internal)"); -DATA(insert OID = 784 ( intervaleq PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); +DATA(insert OID = 784 ( intervaleq PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); DESCR("equals"); -DATA(insert OID = 785 ( intervalne PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); +DATA(insert OID = 785 ( intervalne PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 786 ( intervallt PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); +DATA(insert OID = 786 ( intervallt PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 787 ( intervalgt PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); +DATA(insert OID = 787 ( intervalgt PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); DESCR("greater-than"); -DATA(insert OID = 788 ( intervalle PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); +DATA(insert OID = 788 ( intervalle PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 789 ( intervalge PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); +DATA(insert OID = 789 ( intervalge PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); /* OIDS 800 - 899 */ @@ -1100,22 +1100,22 @@ DATA(insert OID = 820 ( oidint2in PGUID 11 f t f 1 f 810 "0" 100 0 0 100 f DESCR("(internal)"); DATA(insert OID = 821 ( oidint2out PGUID 11 f t f 1 f 19 "0" 100 0 0 100 foo bar)); DESCR("(internal)"); -DATA(insert OID = 822 ( oidint2lt PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100 foo bar)); +DATA(insert OID = 822 ( oidint2lt PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100 foo bar)); DESCR("less-than"); -DATA(insert OID = 823 ( oidint2le PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100 foo bar)); +DATA(insert OID = 823 ( oidint2le PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100 foo bar)); DESCR("less-than-or-equals"); -DATA(insert OID = 824 ( oidint2eq PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100 foo bar)); +DATA(insert OID = 824 ( oidint2eq PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100 foo bar)); DESCR("equals"); #define OidInt2EqRegProcedure 824 -DATA(insert OID = 825 ( oidint2ge PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100 foo bar)); +DATA(insert OID = 825 ( oidint2ge PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100 foo bar)); DESCR("greater-than-or-equals"); -DATA(insert OID = 826 ( oidint2gt PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100 foo bar)); +DATA(insert OID = 826 ( oidint2gt PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100 foo bar)); DESCR("greater-than"); -DATA(insert OID = 827 ( oidint2ne PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100 foo bar)); +DATA(insert OID = 827 ( oidint2ne PGUID 11 f t f 2 f 16 "810 810" 100 0 0 100 foo bar)); DESCR("not equal"); -DATA(insert OID = 828 ( oidint2cmp PGUID 11 f t f 2 f 21 "810 810" 100 0 0 100 foo bar)); +DATA(insert OID = 828 ( oidint2cmp PGUID 11 f t f 2 f 21 "810 810" 100 0 0 100 foo bar)); DESCR("less-equal-greater"); DATA(insert OID = 829 ( mkoidint2 PGUID 11 f t f 2 f 810 "26 21" 100 0 0 100 foo bar)); DESCR(""); @@ -1161,17 +1161,17 @@ DESCR("divide"); DATA(insert OID = 848 ( flt4_mul_cash PGUID 11 f t f 2 f 790 "700 790" 100 0 0 100 foo bar )); DESCR("multiply"); -DATA(insert OID = 862 ( int4_mul_cash PGUID 11 f t f 2 f 790 "23 790" 100 0 0 100 foo bar )); +DATA(insert OID = 862 ( int4_mul_cash PGUID 11 f t f 2 f 790 "23 790" 100 0 0 100 foo bar )); DESCR("multiply"); -DATA(insert OID = 863 ( int2_mul_cash PGUID 11 f t f 2 f 790 "21 790" 100 0 0 100 foo bar )); +DATA(insert OID = 863 ( int2_mul_cash PGUID 11 f t f 2 f 790 "21 790" 100 0 0 100 foo bar )); DESCR("multiply"); -DATA(insert OID = 864 ( cash_mul_int4 PGUID 11 f t f 2 f 790 "790 23" 100 0 0 100 foo bar )); +DATA(insert OID = 864 ( cash_mul_int4 PGUID 11 f t f 2 f 790 "790 23" 100 0 0 100 foo bar )); DESCR("multiply"); -DATA(insert OID = 865 ( cash_div_int4 PGUID 11 f t f 2 f 790 "790 23" 100 0 0 100 foo bar )); +DATA(insert OID = 865 ( cash_div_int4 PGUID 11 f t f 2 f 790 "790 23" 100 0 0 100 foo bar )); DESCR("divide"); -DATA(insert OID = 866 ( cash_mul_int2 PGUID 11 f t f 2 f 790 "790 21" 100 0 0 100 foo bar )); +DATA(insert OID = 866 ( cash_mul_int2 PGUID 11 f t f 2 f 790 "790 21" 100 0 0 100 foo bar )); DESCR("multiply"); -DATA(insert OID = 867 ( cash_div_int2 PGUID 11 f t f 2 f 790 "790 21" 100 0 0 100 foo bar )); +DATA(insert OID = 867 ( cash_div_int2 PGUID 11 f t f 2 f 790 "790 21" 100 0 0 100 foo bar )); DESCR("divide"); DATA(insert OID = 886 ( cash_in PGUID 11 f t f 1 f 790 "0" 100 0 0 100 foo bar )); @@ -1214,22 +1214,22 @@ DATA(insert OID = 920 ( oidint4in PGUID 11 f t f 1 f 910 "0" 100 0 0 100 f DESCR("(internal)"); DATA(insert OID = 921 ( oidint4out PGUID 11 f t f 1 f 19 "0" 100 0 0 100 foo bar)); DESCR("(internal)"); -DATA(insert OID = 922 ( oidint4lt PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100 foo bar)); +DATA(insert OID = 922 ( oidint4lt PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100 foo bar)); DESCR("less-than"); -DATA(insert OID = 923 ( oidint4le PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100 foo bar)); +DATA(insert OID = 923 ( oidint4le PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100 foo bar)); DESCR("less-than-or-equals"); -DATA(insert OID = 924 ( oidint4eq PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100 foo bar)); +DATA(insert OID = 924 ( oidint4eq PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100 foo bar)); DESCR("equals"); #define OidInt4EqRegProcedure 924 -DATA(insert OID = 925 ( oidint4ge PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100 foo bar)); +DATA(insert OID = 925 ( oidint4ge PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100 foo bar)); DESCR("greater-than-or-equals"); -DATA(insert OID = 926 ( oidint4gt PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100 foo bar)); +DATA(insert OID = 926 ( oidint4gt PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100 foo bar)); DESCR("greater-than"); -DATA(insert OID = 927 ( oidint4ne PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100 foo bar)); +DATA(insert OID = 927 ( oidint4ne PGUID 11 f t f 2 f 16 "910 910" 100 0 0 100 foo bar)); DESCR("not equal"); -DATA(insert OID = 928 ( oidint4cmp PGUID 11 f t f 2 f 23 "910 910" 100 0 0 100 foo bar)); +DATA(insert OID = 928 ( oidint4cmp PGUID 11 f t f 2 f 23 "910 910" 100 0 0 100 foo bar)); DESCR("less-equal-greater"); DATA(insert OID = 929 ( mkoidint4 PGUID 11 f t f 2 f 910 "26 23" 100 0 0 100 foo bar)); DESCR(""); @@ -1248,22 +1248,22 @@ DATA(insert OID = 940 ( oidnamein PGUID 11 f t f 1 f 911 "0" 100 0 0 100 f DESCR("(internal)"); DATA(insert OID = 941 ( oidnameout PGUID 11 f t f 1 f 19 "0" 100 0 0 100 foo bar)); DESCR("(internal)"); -DATA(insert OID = 942 ( oidnamelt PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100 foo bar)); +DATA(insert OID = 942 ( oidnamelt PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100 foo bar)); DESCR("less-than"); -DATA(insert OID = 943 ( oidnamele PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100 foo bar)); +DATA(insert OID = 943 ( oidnamele PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100 foo bar)); DESCR("less-than-or-equals"); -DATA(insert OID = 944 ( oidnameeq PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100 foo bar)); +DATA(insert OID = 944 ( oidnameeq PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100 foo bar)); DESCR("equals"); #define OidNameEqRegProcedure 944 -DATA(insert OID = 945 ( oidnamege PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100 foo bar)); +DATA(insert OID = 945 ( oidnamege PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100 foo bar)); DESCR("greater-than-or-equals"); -DATA(insert OID = 946 ( oidnamegt PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100 foo bar)); +DATA(insert OID = 946 ( oidnamegt PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100 foo bar)); DESCR("greater-than"); -DATA(insert OID = 947 ( oidnamene PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100 foo bar)); +DATA(insert OID = 947 ( oidnamene PGUID 11 f t f 2 f 16 "911 911" 100 0 0 100 foo bar)); DESCR("not equal"); -DATA(insert OID = 948 ( oidnamecmp PGUID 11 f t f 2 f 23 "911 911" 100 0 0 100 foo bar)); +DATA(insert OID = 948 ( oidnamecmp PGUID 11 f t f 2 f 23 "911 911" 100 0 0 100 foo bar)); DESCR("less-equal-greater"); DATA(insert OID = 949 ( mkoidname PGUID 11 f t f 2 f 911 "26 19" 100 0 0 100 foo bar)); DESCR(""); @@ -1299,9 +1299,9 @@ DESCR("closest point to line segment on line"); DATA(insert OID = 963 ( close_lb PGUID 11 f t f 2 f 600 "628 603" 100 0 10 100 foo bar )); DESCR("closest point to line on box"); -DATA(insert OID = 964 ( lo_unlink PGUID 11 f t f 1 f 23 "23" 100 0 0 100 foo bar )); +DATA(insert OID = 964 ( lo_unlink PGUID 11 f t f 1 f 23 "23" 100 0 0 100 foo bar )); DESCR("large object unlink(delete)"); -DATA(insert OID = 972 ( regproctooid PGUID 11 f t f 1 f 26 "24" 100 0 0 100 foo bar )); +DATA(insert OID = 972 ( regproctooid PGUID 11 f t f 1 f 26 "24" 100 0 0 100 foo bar )); DESCR("get oid for regproc"); DATA(insert OID = 973 ( path_inter PGUID 11 f t f 2 f 16 "602 602" 100 0 10 100 foo bar )); @@ -1318,23 +1318,23 @@ DATA(insert OID = 980 ( box_intersect PGUID 11 f t f 2 f 603 "603 603" 100 0 DESCR("intersects"); DATA(insert OID = 981 ( box_diagonal PGUID 11 f t f 1 f 601 "603" 100 0 0 100 foo bar )); DESCR("box diagonal"); -DATA(insert OID = 982 ( path_n_lt PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100 foo bar )); +DATA(insert OID = 982 ( path_n_lt PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 983 ( path_n_gt PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100 foo bar )); +DATA(insert OID = 983 ( path_n_gt PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100 foo bar )); DESCR("greater-than"); -DATA(insert OID = 984 ( path_n_eq PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100 foo bar )); +DATA(insert OID = 984 ( path_n_eq PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100 foo bar )); DESCR("equals"); -DATA(insert OID = 985 ( path_n_le PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100 foo bar )); +DATA(insert OID = 985 ( path_n_le PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 986 ( path_n_ge PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100 foo bar )); +DATA(insert OID = 986 ( path_n_ge PGUID 11 f t f 2 f 16 "602 602" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); DATA(insert OID = 987 ( path_length PGUID 11 f t f 1 f 701 "602" 100 0 1 0 foo bar )); DESCR("sum of path segments"); -DATA(insert OID = 988 ( point_ne PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); +DATA(insert OID = 988 ( point_ne PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 989 ( point_vert PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); +DATA(insert OID = 989 ( point_vert PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); DESCR("is vertical"); -DATA(insert OID = 990 ( point_horiz PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); +DATA(insert OID = 990 ( point_horiz PGUID 11 f t f 2 f 16 "600 600" 100 0 0 100 foo bar )); DESCR("is horizontal"); DATA(insert OID = 991 ( point_distance PGUID 11 f t f 2 f 701 "600 600" 100 0 0 100 foo bar )); DESCR("distance between"); @@ -1342,17 +1342,17 @@ DATA(insert OID = 992 ( point_slope PGUID 11 f t f 2 f 701 "600 600" 100 0 0 DESCR("slope between points"); DATA(insert OID = 993 ( lseg_construct PGUID 11 f t f 2 f 601 "600 600" 100 0 0 100 foo bar )); DESCR("convert points to line segment"); -DATA(insert OID = 994 ( lseg_intersect PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); +DATA(insert OID = 994 ( lseg_intersect PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); DESCR("intersects"); -DATA(insert OID = 995 ( lseg_parallel PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); +DATA(insert OID = 995 ( lseg_parallel PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); DESCR("is parallel to"); -DATA(insert OID = 996 ( lseg_perp PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); +DATA(insert OID = 996 ( lseg_perp PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); DESCR("is perpendicular to"); -DATA(insert OID = 997 ( lseg_vertical PGUID 11 f t f 1 f 16 "601" 100 0 0 100 foo bar )); +DATA(insert OID = 997 ( lseg_vertical PGUID 11 f t f 1 f 16 "601" 100 0 0 100 foo bar )); DESCR("is vertical"); -DATA(insert OID = 998 ( lseg_horizontal PGUID 11 f t f 1 f 16 "601" 100 0 0 100 foo bar )); +DATA(insert OID = 998 ( lseg_horizontal PGUID 11 f t f 1 f 16 "601" 100 0 0 100 foo bar )); DESCR("is horizontal"); -DATA(insert OID = 999 ( lseg_eq PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); +DATA(insert OID = 999 ( lseg_eq PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); DESCR("equals"); /* OIDS 1000 - 1999 */ @@ -1363,13 +1363,13 @@ DESCR("(internal)"); DATA(insert OID = 1030 ( nonnullvalue PGUID 11 f t f 1 f 16 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); #define NonNullValueRegProcedure 1030 -DATA(insert OID = 1031 ( aclitemin PGUID 11 f t f 1 f 1033 "0" 100 0 0 100 foo bar )); +DATA(insert OID = 1031 ( aclitemin PGUID 11 f t f 1 f 1033 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); DATA(insert OID = 1032 ( aclitemout PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); -DATA(insert OID = 1035 ( aclinsert PGUID 11 f t f 2 f 1034 "1034 1033" 100 0 0 100 foo bar )); +DATA(insert OID = 1035 ( aclinsert PGUID 11 f t f 2 f 1034 "1034 1033" 100 0 0 100 foo bar )); DESCR("addition"); -DATA(insert OID = 1036 ( aclremove PGUID 11 f t f 2 f 1034 "1034 1033" 100 0 0 100 foo bar )); +DATA(insert OID = 1036 ( aclremove PGUID 11 f t f 2 f 1034 "1034 1033" 100 0 0 100 foo bar )); DESCR("subtract"); DATA(insert OID = 1037 ( aclcontains PGUID 11 f t f 2 f 16 "1034 1033" 100 0 0 100 foo bar )); DESCR("matches regex., case-sensitive"); @@ -1377,11 +1377,11 @@ DATA(insert OID = 1038 ( seteval PGUID 11 f t f 1 f 23 "26" 100 0 0 100 fo DESCR(""); #define SetEvalRegProcedure 1038 -DATA(insert OID = 1044 ( bpcharin PGUID 11 f t f 3 f 1042 "0" 100 0 0 100 foo bar )); +DATA(insert OID = 1044 ( bpcharin PGUID 11 f t f 3 f 1042 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); DATA(insert OID = 1045 ( bpcharout PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); -DATA(insert OID = 1046 ( varcharin PGUID 11 f t f 3 f 1043 "0" 100 0 0 100 foo bar )); +DATA(insert OID = 1046 ( varcharin PGUID 11 f t f 3 f 1043 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); DATA(insert OID = 1047 ( varcharout PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); @@ -1418,7 +1418,7 @@ DESCR("hash"); DATA(insert OID = 1081 ( hashvarchar PGUID 11 f t f 1 f 23 "1043" 100 0 0 100 foo bar )); DESCR("hash"); -DATA(insert OID = 1084 ( date_in PGUID 11 f t f 1 f 1082 "0" 100 0 0 100 foo bar )); +DATA(insert OID = 1084 ( date_in PGUID 11 f t f 1 f 1082 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); DATA(insert OID = 1085 ( date_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); @@ -1451,9 +1451,9 @@ DATA(insert OID = 1106 ( time_ne PGUID 11 f t f 2 f 16 "1083 1083" 100 0 0 DESCR("not equal"); DATA(insert OID = 1107 ( time_cmp PGUID 11 f t f 2 f 23 "1083 1083" 100 0 0 100 foo bar )); DESCR("less-equal-greater"); -DATA(insert OID = 1138 ( date_larger PGUID 11 f t f 2 f 1082 "1082 1082" 100 0 0 100 foo bar )); +DATA(insert OID = 1138 ( date_larger PGUID 11 f t f 2 f 1082 "1082 1082" 100 0 0 100 foo bar )); DESCR(""); -DATA(insert OID = 1139 ( date_smaller PGUID 11 f t f 2 f 1082 "1082 1082" 100 0 0 100 foo bar )); +DATA(insert OID = 1139 ( date_smaller PGUID 11 f t f 2 f 1082 "1082 1082" 100 0 0 100 foo bar )); DESCR(""); DATA(insert OID = 1140 ( date_mi PGUID 11 f t f 2 f 23 "1082 1082" 100 0 0 100 foo bar )); DESCR("subtract"); @@ -1461,7 +1461,7 @@ DATA(insert OID = 1141 ( date_pli PGUID 11 f t f 2 f 1082 "1082 23" 100 0 0 DESCR("addition"); DATA(insert OID = 1142 ( date_mii PGUID 11 f t f 2 f 1082 "1082 23" 100 0 0 100 foo bar )); DESCR("subtract"); -DATA(insert OID = 1143 ( time_in PGUID 11 f t f 1 f 1083 "0" 100 0 0 100 foo bar )); +DATA(insert OID = 1143 ( time_in PGUID 11 f t f 1 f 1083 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); DATA(insert OID = 1144 ( time_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); @@ -1477,28 +1477,28 @@ DESCR("multiply"); DATA(insert OID = 1149 ( circle_div_pt PGUID 11 f t f 2 f 718 "718 600" 100 0 0 100 foo bar )); DESCR("divide"); -DATA(insert OID = 1150 ( datetime_in PGUID 11 f t f 1 f 1184 "0" 100 0 0 100 foo bar )); +DATA(insert OID = 1150 ( datetime_in PGUID 11 f t f 1 f 1184 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); -DATA(insert OID = 1151 ( datetime_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); +DATA(insert OID = 1151 ( datetime_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); -DATA(insert OID = 1152 ( datetime_eq PGUID 11 f t f 2 f 16 "1184 1184" 100 0 0 100 foo bar )); +DATA(insert OID = 1152 ( datetime_eq PGUID 11 f t f 2 f 16 "1184 1184" 100 0 0 100 foo bar )); DESCR("equals"); -DATA(insert OID = 1153 ( datetime_ne PGUID 11 f t f 2 f 16 "1184 1184" 100 0 0 100 foo bar )); +DATA(insert OID = 1153 ( datetime_ne PGUID 11 f t f 2 f 16 "1184 1184" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 1154 ( datetime_lt PGUID 11 f t f 2 f 16 "1184 1184" 100 0 0 100 foo bar )); +DATA(insert OID = 1154 ( datetime_lt PGUID 11 f t f 2 f 16 "1184 1184" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 1155 ( datetime_le PGUID 11 f t f 2 f 16 "1184 1184" 100 0 0 100 foo bar )); +DATA(insert OID = 1155 ( datetime_le PGUID 11 f t f 2 f 16 "1184 1184" 100 0 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 1156 ( datetime_ge PGUID 11 f t f 2 f 16 "1184 1184" 100 0 0 100 foo bar )); +DATA(insert OID = 1156 ( datetime_ge PGUID 11 f t f 2 f 16 "1184 1184" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); -DATA(insert OID = 1157 ( datetime_gt PGUID 11 f t f 2 f 16 "1184 1184" 100 0 0 100 foo bar )); +DATA(insert OID = 1157 ( datetime_gt PGUID 11 f t f 2 f 16 "1184 1184" 100 0 0 100 foo bar )); DESCR("greater-than"); DATA(insert OID = 1158 ( datetime_finite PGUID 11 f t f 1 f 16 "1184" 100 0 0 100 foo bar )); DESCR(""); DATA(insert OID = 1159 ( datetime_zone PGUID 11 f t f 2 f 25 "25 1184" 100 0 0 100 foo bar )); DESCR(""); -DATA(insert OID = 1160 ( timespan_in PGUID 11 f t f 1 f 1186 "0" 100 0 0 100 foo bar )); +DATA(insert OID = 1160 ( timespan_in PGUID 11 f t f 1 f 1186 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); DATA(insert OID = 1161 ( timespan_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); @@ -1581,21 +1581,21 @@ DATA(insert OID = 1236 ( char16icregexeq PGUID 11 f t f 2 f 16 "20 25" 100 0 0 DESCR("matches regex., case-insensitive"); DATA(insert OID = 1237 ( char16icregexne PGUID 11 f t f 2 f 16 "20 25" 100 0 0 100 foo bar )); DESCR("does not match regex., case-insensitive"); -DATA(insert OID = 1238 ( texticregexeq PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0 foo bar )); +DATA(insert OID = 1238 ( texticregexeq PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0 foo bar )); DESCR("matches regex., case-insensitive"); -DATA(insert OID = 1239 ( texticregexne PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0 foo bar )); +DATA(insert OID = 1239 ( texticregexne PGUID 11 f t f 2 f 16 "25 25" 100 0 1 0 foo bar )); DESCR("does not match regex., case-insensitive"); DATA(insert OID = 1240 ( nameicregexeq PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100 foo bar )); DESCR("matches regex., case-insensitive"); DATA(insert OID = 1241 ( nameicregexne PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100 foo bar )); DESCR("does not match regex., case-insensitive"); -DATA(insert OID = 1251 ( bpcharlen PGUID 11 f t f 1 f 23 "1042" 100 0 0 100 foo bar )); +DATA(insert OID = 1251 ( bpcharlen PGUID 11 f t f 1 f 23 "1042" 100 0 0 100 foo bar )); DESCR("octet length"); -DATA(insert OID = 1253 ( varcharlen PGUID 11 f t f 1 f 23 "1043" 100 0 0 100 foo bar )); +DATA(insert OID = 1253 ( varcharlen PGUID 11 f t f 1 f 23 "1043" 100 0 0 100 foo bar )); DESCR("octet length"); -DATA(insert OID = 1263 ( text_timespan PGUID 11 f t f 1 f 1186 "25" 100 0 0 100 foo bar )); +DATA(insert OID = 1263 ( text_timespan PGUID 11 f t f 1 f 1186 "25" 100 0 0 100 foo bar )); DESCR("convert"); DATA(insert OID = 1271 ( timespan_finite PGUID 11 f t f 1 f 16 "1186" 100 0 0 100 foo bar )); DESCR("boolean test"); @@ -1613,108 +1613,108 @@ DESCR("matches regex., case-insensitive"); DATA(insert OID = 1295 ( char8icregexne PGUID 11 f t f 2 f 16 "411 25" 100 0 0 100 foo bar )); DESCR("does not match regex., case-insensitive"); -DATA(insert OID = 1297 ( timestamp_in PGUID 11 f t f 1 f 1296 "0" 100 0 0 100 foo bar )); +DATA(insert OID = 1297 ( timestamp_in PGUID 11 f t f 1 f 1296 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); -DATA(insert OID = 1298 ( timestamp_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); +DATA(insert OID = 1298 ( timestamp_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); DESCR("(internal)"); -DATA(insert OID = 1299 ( now PGUID 11 f t f 0 f 1296 "0" 100 0 0 100 foo bar )); +DATA(insert OID = 1299 ( now PGUID 11 f t f 0 f 1296 "0" 100 0 0 100 foo bar )); DESCR("current transaction time"); /* OIDS 1300 - 1399 */ -DATA(insert OID = 1306 ( timestampeq PGUID 11 f t f 2 f 16 "1296 1296" 100 0 0 100 foo bar )); +DATA(insert OID = 1306 ( timestampeq PGUID 11 f t f 2 f 16 "1296 1296" 100 0 0 100 foo bar )); DESCR("equals"); -DATA(insert OID = 1307 ( timestampne PGUID 11 f t f 2 f 16 "1296 1296" 100 0 0 100 foo bar )); +DATA(insert OID = 1307 ( timestampne PGUID 11 f t f 2 f 16 "1296 1296" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 1308 ( timestamplt PGUID 11 f t f 2 f 16 "1296 1296" 100 0 0 100 foo bar )); +DATA(insert OID = 1308 ( timestamplt PGUID 11 f t f 2 f 16 "1296 1296" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 1309 ( timestampgt PGUID 11 f t f 2 f 16 "1296 1296" 100 0 0 100 foo bar )); +DATA(insert OID = 1309 ( timestampgt PGUID 11 f t f 2 f 16 "1296 1296" 100 0 0 100 foo bar )); DESCR("greater-than"); -DATA(insert OID = 1310 ( timestample PGUID 11 f t f 2 f 16 "1296 1296" 100 0 0 100 foo bar )); +DATA(insert OID = 1310 ( timestample PGUID 11 f t f 2 f 16 "1296 1296" 100 0 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 1311 ( timestampge PGUID 11 f t f 2 f 16 "1296 1296" 100 0 0 100 foo bar )); +DATA(insert OID = 1311 ( timestampge PGUID 11 f t f 2 f 16 "1296 1296" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); -DATA(insert OID = 1314 ( datetime_cmp PGUID 11 f t f 2 f 23 "1184 1184" 100 0 0 100 foo bar )); +DATA(insert OID = 1314 ( datetime_cmp PGUID 11 f t f 2 f 23 "1184 1184" 100 0 0 100 foo bar )); DESCR("less-equal-greater"); -DATA(insert OID = 1315 ( timespan_cmp PGUID 11 f t f 2 f 23 "1186 1186" 100 0 0 100 foo bar )); +DATA(insert OID = 1315 ( timespan_cmp PGUID 11 f t f 2 f 23 "1186 1186" 100 0 0 100 foo bar )); DESCR("less-equal-greater"); -DATA(insert OID = 1316 ( datetime_time PGUID 11 f t f 1 f 1083 "1184" 100 0 0 100 foo bar )); +DATA(insert OID = 1316 ( datetime_time PGUID 11 f t f 1 f 1083 "1184" 100 0 0 100 foo bar )); DESCR("convert"); DATA(insert OID = 1318 ( datetime_timestamp PGUID 11 f t f 1 f 1296 "1184" 100 0 0 100 foo bar )); DESCR("convert"); -DATA(insert OID = 1326 ( timespan_div PGUID 11 f t f 2 f 1186 "1186 701" 100 0 0 100 foo bar )); +DATA(insert OID = 1326 ( timespan_div PGUID 11 f t f 2 f 1186 "1186 701" 100 0 0 100 foo bar )); DESCR("divide"); -DATA(insert OID = 1339 ( date_zone PGUID 14 f t f 2 f 25 "25 1184" 100 0 0 100 "select datetime_zone($1, $2)" - )); +DATA(insert OID = 1339 ( date_zone PGUID 14 f t f 2 f 25 "25 1184" 100 0 0 100 "select datetime_zone($1, $2)" - )); DESCR(""); -DATA(insert OID = 1340 ( text PGUID 14 f t f 1 f 25 "1184" 100 0 0 100 "select datetime_text($1)" - )); +DATA(insert OID = 1340 ( text PGUID 14 f t f 1 f 25 "1184" 100 0 0 100 "select datetime_text($1)" - )); DESCR("convert"); -DATA(insert OID = 1341 ( text PGUID 14 f t f 1 f 25 "1186" 100 0 0 100 "select timespan_text($1)" - )); +DATA(insert OID = 1341 ( text PGUID 14 f t f 1 f 25 "1186" 100 0 0 100 "select timespan_text($1)" - )); DESCR("convert"); -DATA(insert OID = 1342 ( text PGUID 14 f t f 1 f 25 "23" 100 0 0 100 "select int4_text($1)" - )); +DATA(insert OID = 1342 ( text PGUID 14 f t f 1 f 25 "23" 100 0 0 100 "select int4_text($1)" - )); DESCR("convert"); -DATA(insert OID = 1343 ( text PGUID 14 f t f 1 f 25 "21" 100 0 0 100 "select int2_text($1)" - )); +DATA(insert OID = 1343 ( text PGUID 14 f t f 1 f 25 "21" 100 0 0 100 "select int2_text($1)" - )); DESCR("convert"); -DATA(insert OID = 1344 ( text PGUID 14 f t f 1 f 25 "26" 100 0 0 100 "select oid_text($1)" - )); +DATA(insert OID = 1344 ( text PGUID 14 f t f 1 f 25 "26" 100 0 0 100 "select oid_text($1)" - )); DESCR("convert"); -DATA(insert OID = 1345 ( oid PGUID 14 f t f 1 f 26 "25" 100 0 0 100 "select text_oid($1)" - )); +DATA(insert OID = 1345 ( oid PGUID 14 f t f 1 f 26 "25" 100 0 0 100 "select text_oid($1)" - )); DESCR("convert"); -DATA(insert OID = 1346 ( int2 PGUID 14 f t f 1 f 21 "25" 100 0 0 100 "select text_int2($1)" - )); +DATA(insert OID = 1346 ( int2 PGUID 14 f t f 1 f 21 "25" 100 0 0 100 "select text_int2($1)" - )); DESCR("convert"); -DATA(insert OID = 1347 ( int4 PGUID 14 f t f 1 f 23 "25" 100 0 0 100 "select text_int4($1)" - )); +DATA(insert OID = 1347 ( int4 PGUID 14 f t f 1 f 23 "25" 100 0 0 100 "select text_int4($1)" - )); DESCR("convert"); -DATA(insert OID = 1348 ( obj_description PGUID 14 f t f 1 f 25 "26" 100 0 0 100 "select description from pg_description where objoid = $1" - )); +DATA(insert OID = 1348 ( obj_description PGUID 14 f t f 1 f 25 "26" 100 0 0 100 "select description from pg_description where objoid = $1" - )); DESCR("get description for object id"); -DATA(insert OID = 1349 ( oid8types PGUID 11 f t f 1 f 25 "30" 100 0 0 100 foo bar )); +DATA(insert OID = 1349 ( oid8types PGUID 11 f t f 1 f 25 "30" 100 0 0 100 foo bar )); DESCR("print type names of oid8 field"); -DATA(insert OID = 1350 ( datetime PGUID 14 f t f 1 f 1184 "1184" 100 0 0 100 "select $1" - )); +DATA(insert OID = 1350 ( datetime PGUID 14 f t f 1 f 1184 "1184" 100 0 0 100 "select $1" - )); DESCR("convert"); -DATA(insert OID = 1351 ( datetime PGUID 14 f t f 1 f 1184 "25" 100 0 0 100 "select text_datetime($1)" - )); +DATA(insert OID = 1351 ( datetime PGUID 14 f t f 1 f 1184 "25" 100 0 0 100 "select text_datetime($1)" - )); DESCR("convert"); -DATA(insert OID = 1352 ( datetime PGUID 14 f t f 1 f 1184 "702" 100 0 0 100 "select abstime_datetime($1)" - )); +DATA(insert OID = 1352 ( datetime PGUID 14 f t f 1 f 1184 "702" 100 0 0 100 "select abstime_datetime($1)" - )); DESCR("convert"); -DATA(insert OID = 1353 ( datetime PGUID 14 f t f 1 f 1184 "1082" 100 0 0 100 "select date_datetime($1)" - )); +DATA(insert OID = 1353 ( datetime PGUID 14 f t f 1 f 1184 "1082" 100 0 0 100 "select date_datetime($1)" - )); DESCR("convert"); -DATA(insert OID = 1354 ( datetime PGUID 14 f t f 1 f 1184 "1296" 100 0 0 100 "select timestamp_datetime($1)" - )); +DATA(insert OID = 1354 ( datetime PGUID 14 f t f 1 f 1184 "1296" 100 0 0 100 "select timestamp_datetime($1)" - )); DESCR("convert"); -DATA(insert OID = 1355 ( datetime PGUID 14 f t f 2 f 1184 "1082 1083" 100 0 0 100 "select datetime_datetime($1, $2)" - )); +DATA(insert OID = 1355 ( datetime PGUID 14 f t f 2 f 1184 "1082 1083" 100 0 0 100 "select datetime_datetime($1, $2)" - )); DESCR("convert"); -DATA(insert OID = 1356 ( timespan PGUID 14 f t f 1 f 1186 "1186" 100 0 0 100 "select $1" - )); +DATA(insert OID = 1356 ( timespan PGUID 14 f t f 1 f 1186 "1186" 100 0 0 100 "select $1" - )); DESCR("convert"); -DATA(insert OID = 1357 ( timespan PGUID 14 f t f 1 f 1186 "703" 100 0 0 100 "select reltime_timespan($1)" - )); +DATA(insert OID = 1357 ( timespan PGUID 14 f t f 1 f 1186 "703" 100 0 0 100 "select reltime_timespan($1)" - )); DESCR("convert"); -DATA(insert OID = 1358 ( timespan PGUID 14 f t f 1 f 1186 "1083" 100 0 0 100 "select time_timespan($1)" - )); +DATA(insert OID = 1358 ( timespan PGUID 14 f t f 1 f 1186 "1083" 100 0 0 100 "select time_timespan($1)" - )); DESCR("convert"); -DATA(insert OID = 1359 ( date PGUID 14 f t f 1 f 1082 "1082" 100 0 0 100 "select $1" - )); +DATA(insert OID = 1359 ( date PGUID 14 f t f 1 f 1082 "1082" 100 0 0 100 "select $1" - )); DESCR("convert"); -DATA(insert OID = 1360 ( date PGUID 14 f t f 1 f 1082 "1184" 100 0 0 100 "select datetime_date($1)" - )); +DATA(insert OID = 1360 ( date PGUID 14 f t f 1 f 1082 "1184" 100 0 0 100 "select datetime_date($1)" - )); DESCR("convert"); -DATA(insert OID = 1361 ( date PGUID 14 f t f 1 f 1082 "702" 100 0 0 100 "select abstime_date($1)" - )); +DATA(insert OID = 1361 ( date PGUID 14 f t f 1 f 1082 "702" 100 0 0 100 "select abstime_date($1)" - )); DESCR("convert"); -DATA(insert OID = 1362 ( time PGUID 14 f t f 1 f 1083 "1083" 100 0 0 100 "select $1" - )); +DATA(insert OID = 1362 ( time PGUID 14 f t f 1 f 1083 "1083" 100 0 0 100 "select $1" - )); DESCR("convert"); -DATA(insert OID = 1363 ( time PGUID 14 f t f 1 f 1083 "1184" 100 0 0 100 "select datetime_time($1)" - )); +DATA(insert OID = 1363 ( time PGUID 14 f t f 1 f 1083 "1184" 100 0 0 100 "select datetime_time($1)" - )); DESCR("convert"); -DATA(insert OID = 1364 ( time PGUID 14 f t f 1 f 1083 "702" 100 0 0 100 "select abstime_time($1)" - )); +DATA(insert OID = 1364 ( time PGUID 14 f t f 1 f 1083 "702" 100 0 0 100 "select abstime_time($1)" - )); DESCR("convert"); -DATA(insert OID = 1365 ( abstime PGUID 14 f t f 1 f 702 "702" 100 0 0 100 "select $1" - )); +DATA(insert OID = 1365 ( abstime PGUID 14 f t f 1 f 702 "702" 100 0 0 100 "select $1" - )); DESCR("convert"); -DATA(insert OID = 1366 ( abstime PGUID 14 f t f 1 f 702 "1184" 100 0 0 100 "select datetime_abstime($1)" - )); +DATA(insert OID = 1366 ( abstime PGUID 14 f t f 1 f 702 "1184" 100 0 0 100 "select datetime_abstime($1)" - )); DESCR("convert"); -DATA(insert OID = 1367 ( reltime PGUID 14 f t f 1 f 703 "703" 100 0 0 100 "select $1" - )); +DATA(insert OID = 1367 ( reltime PGUID 14 f t f 1 f 703 "703" 100 0 0 100 "select $1" - )); DESCR("convert"); -DATA(insert OID = 1368 ( reltime PGUID 14 f t f 1 f 703 "1186" 100 0 0 100 "select timespan_reltime($1)" - )); +DATA(insert OID = 1368 ( reltime PGUID 14 f t f 1 f 703 "1186" 100 0 0 100 "select timespan_reltime($1)" - )); DESCR("convert"); -DATA(insert OID = 1369 ( timestamp PGUID 14 f t f 1 f 1296 "1296" 100 0 0 100 "select $1" - )); +DATA(insert OID = 1369 ( timestamp PGUID 14 f t f 1 f 1296 "1296" 100 0 0 100 "select $1" - )); DESCR("convert"); -DATA(insert OID = 1370 ( timestamp PGUID 14 f t f 1 f 1296 "1184" 100 0 0 100 "select datetime_stamp($1)" - )); +DATA(insert OID = 1370 ( timestamp PGUID 14 f t f 1 f 1296 "1184" 100 0 0 100 "select datetime_stamp($1)" - )); DESCR("convert"); -DATA(insert OID = 1371 ( length PGUID 14 f t f 1 f 23 "25" 100 0 0 100 "select textlen($1)" - )); +DATA(insert OID = 1371 ( length PGUID 14 f t f 1 f 23 "25" 100 0 0 100 "select textlen($1)" - )); DESCR("octet length"); -DATA(insert OID = 1372 ( length PGUID 14 f t f 1 f 23 "1042" 100 0 0 100 "select bpcharlen($1)" - )); +DATA(insert OID = 1372 ( length PGUID 14 f t f 1 f 23 "1042" 100 0 0 100 "select bpcharlen($1)" - )); DESCR("octet length"); -DATA(insert OID = 1373 ( length PGUID 14 f t f 1 f 23 "1043" 100 0 0 100 "select varcharlen($1)" - )); +DATA(insert OID = 1373 ( length PGUID 14 f t f 1 f 23 "1043" 100 0 0 100 "select varcharlen($1)" - )); DESCR("octet length"); DATA(insert OID = 1380 ( date_part PGUID 14 f t f 2 f 701 "25 1184" 100 0 0 100 "select datetime_part($1, $2)" - )); @@ -1733,19 +1733,19 @@ DATA(insert OID = 1386 ( date_trunc PGUID 14 f t f 2 f 1184 "25 1184" 100 0 0 DESCR("truncate datetime to field"); DATA(insert OID = 1387 ( date_trunc PGUID 14 f t f 2 f 1186 "25 1186" 100 0 0 100 "select timespan_trunc($1, $2)" - )); DESCR("truncate timespan to field"); -DATA(insert OID = 1388 ( age PGUID 14 f t f 2 f 1186 "1184 1184" 100 0 0 100 "select datetime_age($1, $2)" - )); +DATA(insert OID = 1388 ( age PGUID 14 f t f 2 f 1186 "1184 1184" 100 0 0 100 "select datetime_age($1, $2)" - )); DESCR("difference between datetimes but leave years and months unresolved"); -DATA(insert OID = 1389 ( age PGUID 14 f t f 1 f 1186 "1184" 100 0 0 100 "select datetime_age(\'today\', $1)" - )); +DATA(insert OID = 1389 ( age PGUID 14 f t f 1 f 1186 "1184" 100 0 0 100 "select datetime_age(\'today\', $1)" - )); DESCR("difference between datetime and today but leave years and months unresolved"); -DATA(insert OID = 1390 ( isfinite PGUID 14 f t f 1 f 16 "1184" 100 0 0 100 "select datetime_finite($1)" - )); +DATA(insert OID = 1390 ( isfinite PGUID 14 f t f 1 f 16 "1184" 100 0 0 100 "select datetime_finite($1)" - )); DESCR("boolean test"); -DATA(insert OID = 1391 ( isfinite PGUID 14 f t f 1 f 16 "1186" 100 0 0 100 "select timespan_finite($1)" - )); +DATA(insert OID = 1391 ( isfinite PGUID 14 f t f 1 f 16 "1186" 100 0 0 100 "select timespan_finite($1)" - )); DESCR("boolean test"); -DATA(insert OID = 1392 ( isfinite PGUID 14 f t f 1 f 16 "702" 100 0 0 100 "select abstime_finite($1)" - )); +DATA(insert OID = 1392 ( isfinite PGUID 14 f t f 1 f 16 "702" 100 0 0 100 "select abstime_finite($1)" - )); DESCR("boolean test"); -DATA(insert OID = 1393 ( timespan PGUID 14 f t f 1 f 1186 "25" 100 0 0 100 "select text_timespan($1)" - )); +DATA(insert OID = 1393 ( timespan PGUID 14 f t f 1 f 1186 "25" 100 0 0 100 "select text_timespan($1)" - )); DESCR("convert"); /* reserve OIDs 1370-1399 for additional date/time conversion routines! tgl 97/04/01 */ @@ -1860,79 +1860,79 @@ DATA(insert OID = 1450 ( circle_in PGUID 11 f t f 1 f 718 "0" 100 0 1 0 foo DESCR("(internal)"); DATA(insert OID = 1451 ( circle_out PGUID 11 f t f 1 f 23 "0" 100 0 1 0 foo bar )); DESCR("(internal)"); -DATA(insert OID = 1452 ( circle_same PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1452 ( circle_same PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR("same as"); -DATA(insert OID = 1453 ( circle_contain PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1453 ( circle_contain PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR("contains"); -DATA(insert OID = 1454 ( circle_left PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1454 ( circle_left PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR("is left of"); -DATA(insert OID = 1455 ( circle_overleft PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1455 ( circle_overleft PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR("overlaps, but does not extend to right of"); -DATA(insert OID = 1456 ( circle_overright PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1456 ( circle_overright PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR(""); -DATA(insert OID = 1457 ( circle_right PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1457 ( circle_right PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR("is left of"); -DATA(insert OID = 1458 ( circle_contained PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1458 ( circle_contained PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR(""); -DATA(insert OID = 1459 ( circle_overlap PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1459 ( circle_overlap PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR("overlaps"); -DATA(insert OID = 1460 ( circle_below PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1460 ( circle_below PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR("is below"); -DATA(insert OID = 1461 ( circle_above PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1461 ( circle_above PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR("is above"); -DATA(insert OID = 1462 ( circle_eq PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1462 ( circle_eq PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR("equals"); -DATA(insert OID = 1463 ( circle_ne PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1463 ( circle_ne PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR("not equal"); -DATA(insert OID = 1464 ( circle_lt PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1464 ( circle_lt PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR("less-than"); -DATA(insert OID = 1465 ( circle_gt PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1465 ( circle_gt PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR("greater-than"); -DATA(insert OID = 1466 ( circle_le PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1466 ( circle_le PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 1467 ( circle_ge PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1467 ( circle_ge PGUID 11 f t f 2 f 16 "718 718" 100 0 1 0 foo bar )); DESCR("greater-than-or-equals"); -DATA(insert OID = 1468 ( circle_area PGUID 11 f t f 1 f 701 "718" 100 0 1 0 foo bar )); +DATA(insert OID = 1468 ( circle_area PGUID 11 f t f 1 f 701 "718" 100 0 1 0 foo bar )); DESCR("area"); -DATA(insert OID = 1469 ( circle_diameter PGUID 11 f t f 1 f 701 "718" 100 0 1 0 foo bar )); +DATA(insert OID = 1469 ( circle_diameter PGUID 11 f t f 1 f 701 "718" 100 0 1 0 foo bar )); DESCR("diameter"); -DATA(insert OID = 1470 ( circle_radius PGUID 11 f t f 1 f 701 "718" 100 0 1 0 foo bar )); +DATA(insert OID = 1470 ( circle_radius PGUID 11 f t f 1 f 701 "718" 100 0 1 0 foo bar )); DESCR("radius"); -DATA(insert OID = 1471 ( circle_distance PGUID 11 f t f 2 f 701 "718 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1471 ( circle_distance PGUID 11 f t f 2 f 701 "718 718" 100 0 1 0 foo bar )); DESCR("distance between"); -DATA(insert OID = 1472 ( circle_center PGUID 11 f t f 1 f 600 "718" 100 0 1 0 foo bar )); +DATA(insert OID = 1472 ( circle_center PGUID 11 f t f 1 f 600 "718" 100 0 1 0 foo bar )); DESCR("center of"); -DATA(insert OID = 1473 ( circle PGUID 11 f t f 2 f 718 "600 701" 100 0 1 0 foo bar )); +DATA(insert OID = 1473 ( circle PGUID 11 f t f 2 f 718 "600 701" 100 0 1 0 foo bar )); DESCR("convert"); -DATA(insert OID = 1474 ( poly_circle PGUID 11 f t f 1 f 718 "604" 100 0 1 0 foo bar )); +DATA(insert OID = 1474 ( poly_circle PGUID 11 f t f 1 f 718 "604" 100 0 1 0 foo bar )); DESCR("convert"); DATA(insert OID = 1475 ( circle_poly PGUID 11 f t f 2 f 604 "23 718" 100 0 1 0 foo bar )); DESCR("convert"); -DATA(insert OID = 1476 ( dist_pc PGUID 11 f t f 2 f 604 "600 718" 100 0 1 0 foo bar )); +DATA(insert OID = 1476 ( dist_pc PGUID 11 f t f 2 f 604 "600 718" 100 0 1 0 foo bar )); DESCR("distance between"); -DATA(insert OID = 1477 ( circle_contain_pt PGUID 11 f t f 2 f 16 "718 600" 100 0 0 100 foo bar )); +DATA(insert OID = 1477 ( circle_contain_pt PGUID 11 f t f 2 f 16 "718 600" 100 0 0 100 foo bar )); DESCR(""); -DATA(insert OID = 1478 ( pt_contained_circle PGUID 11 f t f 2 f 16 "600 718" 100 0 0 100 foo bar )); +DATA(insert OID = 1478 ( pt_contained_circle PGUID 11 f t f 2 f 16 "600 718" 100 0 0 100 foo bar )); DESCR(""); -DATA(insert OID = 1479 ( box_circle PGUID 11 f t f 1 f 718 "603" 100 0 1 0 foo bar )); +DATA(insert OID = 1479 ( box_circle PGUID 11 f t f 1 f 718 "603" 100 0 1 0 foo bar )); DESCR("convert"); -DATA(insert OID = 1480 ( circle_box PGUID 11 f t f 1 f 603 "718" 100 0 1 0 foo bar )); +DATA(insert OID = 1480 ( circle_box PGUID 11 f t f 1 f 603 "718" 100 0 1 0 foo bar )); DESCR("convert"); DATA(insert OID = 1481 ( text_substr PGUID 11 f t f 3 f 25 "25 23 23" 100 0 0 100 foo bar )); DESCR("return portion of string"); -DATA(insert OID = 1482 ( lseg_ne PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); +DATA(insert OID = 1482 ( lseg_ne PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); DESCR("not equal"); -DATA(insert OID = 1483 ( lseg_lt PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); +DATA(insert OID = 1483 ( lseg_lt PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); DESCR("less-than"); -DATA(insert OID = 1484 ( lseg_le PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); +DATA(insert OID = 1484 ( lseg_le PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); DESCR("less-than-or-equals"); -DATA(insert OID = 1485 ( lseg_gt PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); +DATA(insert OID = 1485 ( lseg_gt PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); DESCR("greater-than"); -DATA(insert OID = 1486 ( lseg_ge PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); +DATA(insert OID = 1486 ( lseg_ge PGUID 11 f t f 2 f 16 "601 601" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); -DATA(insert OID = 1487 ( lseg_length PGUID 11 f t f 1 f 701 "601" 100 0 1 0 foo bar )); +DATA(insert OID = 1487 ( lseg_length PGUID 11 f t f 1 f 701 "601" 100 0 1 0 foo bar )); DESCR("distance between endpoints"); DATA(insert OID = 1488 ( close_ls PGUID 11 f t f 2 f 600 "628 601" 100 0 10 100 foo bar )); DESCR("closest point to line on line segment"); @@ -2075,7 +2075,8 @@ DESCR("sequence current value"); /* * prototypes for functions pg_proc.c */ -extern Oid ProcedureCreate(char *procedureName, +extern Oid +ProcedureCreate(char *procedureName, bool returnsSet, char *returnTypeName, char *languageName, diff --git a/src/include/catalog/pg_shadow.h b/src/include/catalog/pg_shadow.h index 67c0191a91..fbe03775cd 100644 --- a/src/include/catalog/pg_shadow.h +++ b/src/include/catalog/pg_shadow.h @@ -3,19 +3,19 @@ * pg_shadow.h-- * definition of the system "shadow" relation (pg_shadow) * along with the relation's initial contents. - * pg_user is now a public accessible view on pg_shadow. + * pg_user is now a public accessible view on pg_shadow. * * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_shadow.h,v 1.1 1998/02/25 13:09:26 scrappy Exp $ + * $Id: pg_shadow.h,v 1.2 1998/02/26 04:41:00 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki * information from the DATA() statements. * - * WHENEVER the definition for pg_shadow changes, the - * view creation of pg_user must be changed in initdb.sh! + * WHENEVER the definition for pg_shadow changes, the + * view creation of pg_user must be changed in initdb.sh! * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index 49f8b10094..bc6b8c0551 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.34 1998/02/25 13:09:27 scrappy Exp $ + * $Id: pg_type.h,v 1.35 1998/02/26 04:41:01 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -374,7 +374,8 @@ DESCR("limited-range ISO-format date and time"); */ extern Oid TypeGet(char *typeName, bool *defined); extern Oid TypeShellMake(char *typeName); -extern Oid TypeCreate(char *typeName, +extern Oid +TypeCreate(char *typeName, Oid relationOid, int16 internalSize, int16 externalSize, diff --git a/src/include/commands/command.h b/src/include/commands/command.h index fd191f68a3..c10807668d 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.8 1998/01/24 22:48:44 momjian Exp $ + * $Id: command.h,v 1.9 1998/02/26 04:41:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,8 @@ extern MemoryContext PortalExecutorHeapMemory; * BadArg if forward invalid. * "WARN" if portal not found. */ -extern void PerformPortalFetch(char *name, bool forward, int count, +extern void +PerformPortalFetch(char *name, bool forward, int count, char *tag, CommandDest dest); /* @@ -41,7 +42,8 @@ extern void PortalCleanup(Portal portal); * PerformAddAttribute -- * Performs the POSTQUEL function ADD. */ -extern void PerformAddAttribute(char *relationName, char *userName, +extern void +PerformAddAttribute(char *relationName, char *userName, bool inh, ColumnDef *colDef); #endif /* COMMAND_H */ diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h index adab627504..9a78b32942 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.11 1998/01/24 22:48:45 momjian Exp $ + * $Id: defrem.h,v 1.12 1998/02/26 04:41:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,8 @@ /* * prototypes in defind.c */ -extern void DefineIndex(char *heapRelationName, +extern void +DefineIndex(char *heapRelationName, char *indexRelationName, char *accessMethodName, List *attributeList, @@ -27,7 +28,8 @@ extern void DefineIndex(char *heapRelationName, bool unique, Expr *predicate, List *rangetable); -extern void ExtendIndex(char *indexRelationName, +extern void +ExtendIndex(char *indexRelationName, Expr *predicate, List *rangetable); extern void RemoveIndex(char *name); @@ -45,7 +47,8 @@ extern void CreateFunction(ProcedureStmt *stmt, CommandDest dest); * prototypes in remove.c */ extern void RemoveFunction(char *functionName, int nargs, List *argNameList); -extern void RemoveOperator(char *operatorName, +extern void +RemoveOperator(char *operatorName, char *typeName1, char *typeName2); extern void RemoveType(char *typeName); extern void RemoveAggregate(char *aggName, char *aggType); diff --git a/src/include/commands/proclang.h b/src/include/commands/proclang.h index af6182ccca..7b9fdf34da 100644 --- a/src/include/commands/proclang.h +++ b/src/include/commands/proclang.h @@ -11,7 +11,7 @@ #include <nodes/parsenodes.h> -extern void CreateProceduralLanguage(CreatePLangStmt * stmt); -extern void DropProceduralLanguage(DropPLangStmt * stmt); +extern void CreateProceduralLanguage(CreatePLangStmt *stmt); +extern void DropProceduralLanguage(DropPLangStmt *stmt); #endif /* PROCLANG_H */ diff --git a/src/include/commands/rename.h b/src/include/commands/rename.h index b091cd5a40..49c42b6b33 100644 --- a/src/include/commands/rename.h +++ b/src/include/commands/rename.h @@ -6,19 +6,21 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rename.h,v 1.3 1998/01/24 22:48:46 momjian Exp $ + * $Id: rename.h,v 1.4 1998/02/26 04:41:08 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef RENAME_H #define RENAME_H -extern void renameatt(char *relname, +extern void +renameatt(char *relname, char *oldattname, char *newattname, char *userName, int recurse); -extern void renamerel(char *oldrelname, +extern void +renamerel(char *oldrelname, char *newrelname); #endif /* RENAME_H */ diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h index 28ae082d68..1ed6b61d1d 100644 --- a/src/include/commands/trigger.h +++ b/src/include/commands/trigger.h @@ -23,7 +23,7 @@ typedef struct TriggerData HeapTuple tg_trigtuple; HeapTuple tg_newtuple; Trigger *tg_trigger; -} TriggerData; +} TriggerData; extern TriggerData *CurrentTriggerData; @@ -59,8 +59,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/user.h b/src/include/commands/user.h index 1994b0bcd1..d75478403d 100644 --- a/src/include/commands/user.h +++ b/src/include/commands/user.h @@ -12,6 +12,6 @@ extern void DefineUser(CreateUserStmt *stmt); extern void AlterUser(AlterUserStmt *stmt); -extern void RemoveUser(char* user); +extern void RemoveUser(char *user); #endif /* USER_H */ diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index 250e8952dd..05e737f734 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.12 1998/01/15 19:46:24 pgsql Exp $ + * $Id: vacuum.h,v 1.13 1998/02/26 04:41:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ #include "nodes/pg_list.h" #include "storage/block.h" #include "storage/off.h" - + typedef struct VAttListData { diff --git a/src/include/commands/variable.h b/src/include/commands/variable.h index 772e9981d9..920536e50f 100644 --- a/src/include/commands/variable.h +++ b/src/include/commands/variable.h @@ -2,7 +2,7 @@ * Headers for handling of 'SET var TO', 'SHOW var' and 'RESET var' * statements * - * $Id: variable.h,v 1.1 1998/01/05 18:53:08 momjian Exp $ + * $Id: variable.h,v 1.2 1998/02/26 04:41:13 momjian Exp $ * */ #ifndef VARIABLE_H @@ -55,4 +55,4 @@ extern bool show_geqo(void); extern bool reset_geqo(void); extern bool parse_geqo(const char *); -#endif /* VARIABLE_H */ +#endif /* VARIABLE_H */ diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index 503df7a536..b7d71250ea 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.7 1998/01/24 22:48:50 momjian Exp $ + * $Id: execdesc.h,v 1.8 1998/02/26 04:41:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,7 +33,8 @@ typedef struct QueryDesc } QueryDesc; /* in pquery.c */ -extern QueryDesc * CreateQueryDesc(Query *parsetree, Plan *plantree, +extern QueryDesc * +CreateQueryDesc(Query *parsetree, Plan *plantree, CommandDest dest); #endif /* EXECDESC_H */ diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 6769c5df76..0ce8dc3fc9 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.20 1998/02/13 03:43:33 vadim Exp $ + * $Id: executor.h,v 1.21 1998/02/26 04:41:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,12 +21,14 @@ /* * prototypes from functions in execAmi.c */ -extern void ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex, +extern void +ExecOpenScanR(Oid relOid, int nkeys, ScanKey skeys, bool isindex, ScanDirection dir, Relation *returnRelation, Pointer *returnScanDesc); extern void ExecCloseR(Plan *node); extern void ExecReScan(Plan *node, ExprContext *exprCtxt, Plan *parent); -extern HeapScanDesc ExecReScanR(Relation relDesc, HeapScanDesc scanDesc, +extern HeapScanDesc +ExecReScanR(Relation relDesc, HeapScanDesc scanDesc, ScanDirection direction, int nkeys, ScanKey skeys); extern void ExecMarkPos(Plan *node); extern void ExecRestrPos(Plan *node); @@ -36,7 +38,8 @@ extern Relation ExecCreatR(TupleDesc tupType, Oid relationOid); * prototypes from functions in execJunk.c */ extern JunkFilter *ExecInitJunkFilter(List *targetList); -extern bool ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot, +extern bool +ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot, char *attrName, Datum *value, bool *isNull); extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot); @@ -63,16 +66,20 @@ extern void ExecEndNode(Plan *node, Plan *parent); extern bool execConstByVal; extern int execConstLen; -extern Datum ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum, +extern Datum +ExecExtractResult(TupleTableSlot *slot, AttrNumber attnum, bool *isNull); -extern Datum ExecEvalParam(Param *expression, ExprContext *econtext, +extern Datum +ExecEvalParam(Param *expression, ExprContext *econtext, bool *isNull); /* stop here */ -extern char *GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno, - bool *isNull); +extern char * +GetAttributeByNum(TupleTableSlot *slot, AttrNumber attrno, + bool *isNull); extern char *GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull); -extern Datum ExecEvalExpr(Node *expression, ExprContext *econtext, bool *isNull, +extern Datum +ExecEvalExpr(Node *expression, ExprContext *econtext, bool *isNull, bool *isDone); extern bool ExecQual(List *qual, ExprContext *econtext); extern int ExecTargetListLength(List *targetlist); @@ -89,53 +96,63 @@ extern TupleTableSlot *ExecScan(Scan *node, TupleTableSlot *(*accessMtd) ()); extern TupleTable ExecCreateTupleTable(int initialSize); extern void ExecDestroyTupleTable(TupleTable table, bool shouldFree); extern TupleTableSlot *ExecAllocTableSlot(TupleTable table); -extern TupleTableSlot *ExecStoreTuple(HeapTuple tuple, +extern TupleTableSlot * +ExecStoreTuple(HeapTuple tuple, TupleTableSlot *slot, Buffer buffer, bool shouldFree); extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot); extern bool ExecSetSlotPolicy(TupleTableSlot *slot, bool shouldFree); -extern TupleDesc ExecSetSlotDescriptor(TupleTableSlot *slot, +extern TupleDesc +ExecSetSlotDescriptor(TupleTableSlot *slot, TupleDesc tupdesc); extern void ExecSetSlotDescriptorIsNew(TupleTableSlot *slot, bool isNew); extern void ExecIncrSlotBufferRefcnt(TupleTableSlot *slot); extern bool TupIsNull(TupleTableSlot *slot); extern void ExecInitResultTupleSlot(EState *estate, CommonState *commonstate); -extern void ExecInitScanTupleSlot(EState *estate, +extern void +ExecInitScanTupleSlot(EState *estate, CommonScanState *commonscanstate); extern void ExecInitMarkedTupleSlot(EState *estate, MergeJoinState *mergestate); extern void ExecInitOuterTupleSlot(EState *estate, HashJoinState *hashstate); extern TupleDesc ExecGetTupType(Plan *node); extern TupleDesc ExecTypeFromTL(List *targetList); -extern void SetChangedParamList (Plan *node, List *newchg); +extern void SetChangedParamList(Plan *node, List *newchg); /* * prototypes from functions in execTuples.c */ extern void ResetTupleCount(void); -extern void ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode, +extern void +ExecAssignNodeBaseInfo(EState *estate, CommonState *basenode, Plan *parent); extern void ExecAssignExprContext(EState *estate, CommonState *commonstate); -extern void ExecAssignResultType(CommonState *commonstate, +extern void +ExecAssignResultType(CommonState *commonstate, TupleDesc tupDesc); -extern void ExecAssignResultTypeFromOuterPlan(Plan *node, +extern void +ExecAssignResultTypeFromOuterPlan(Plan *node, CommonState *commonstate); extern void ExecAssignResultTypeFromTL(Plan *node, CommonState *commonstate); extern TupleDesc ExecGetResultType(CommonState *commonstate); extern void ExecAssignProjectionInfo(Plan *node, CommonState *commonstate); extern void ExecFreeProjectionInfo(CommonState *commonstate); extern TupleDesc ExecGetScanType(CommonScanState *csstate); -extern void ExecAssignScanType(CommonScanState *csstate, +extern void +ExecAssignScanType(CommonScanState *csstate, TupleDesc tupDesc); -extern void ExecAssignScanTypeFromOuterPlan(Plan *node, +extern void +ExecAssignScanTypeFromOuterPlan(Plan *node, CommonScanState *csstate); extern AttributeTupleForm ExecGetTypeInfo(Relation relDesc); -extern void ExecOpenIndices(Oid resultRelationOid, +extern void +ExecOpenIndices(Oid resultRelationOid, RelationInfo *resultRelationInfo); extern void ExecCloseIndices(RelationInfo *resultRelationInfo); -extern void ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid, +extern void +ExecInsertIndexTuples(TupleTableSlot *slot, ItemPointer tupleid, EState *estate, bool is_update); #endif /* EXECUTOR_H */ diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h index d54afe99a3..209d4b34e9 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: functions.h,v 1.6 1998/01/24 22:48:55 momjian Exp $ + * $Id: functions.h,v 1.7 1998/02/26 04:41:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,10 +18,12 @@ #include "nodes/primnodes.h" #include "utils/syscache.h" -extern Datum ProjectAttribute(TupleDesc TD, TargetEntry *tlist, +extern Datum +ProjectAttribute(TupleDesc TD, TargetEntry *tlist, HeapTuple tup, bool *isnullP); -extern Datum postquel_function(Func *funcNode, char **args, +extern Datum +postquel_function(Func *funcNode, char **args, bool *isNull, bool *isDone); #endif /* FUNCTIONS_H */ diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index a814c61ed6..720fcf8067 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHash.h,v 1.8 1998/02/13 03:43:35 vadim Exp $ + * $Id: nodeHash.h,v 1.9 1998/02/26 04:41:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,18 +20,21 @@ #include "nodes/plannodes.h" #include "storage/fd.h" #include "utils/syscache.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 void ExecHashTableInsert(HashJoinTable hashtable, ExprContext *econtext, +extern void +ExecHashTableInsert(HashJoinTable hashtable, ExprContext *econtext, Var *hashkey, File *batches); extern void ExecHashTableDestroy(HashJoinTable hashtable); -extern int ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext, +extern int +ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext, Var *hashkey); -extern HeapTuple ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket, +extern HeapTuple +ExecScanHashBucket(HashJoinState *hjstate, HashBucket bucket, HeapTuple curtuple, List *hjclauses, ExprContext *econtext); extern void ExecHashTableReset(HashJoinTable hashtable, int ntuples); diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index e88e1a67cf..08827cec07 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHashjoin.h,v 1.8 1998/02/13 03:43:36 vadim Exp $ + * $Id: nodeHashjoin.h,v 1.9 1998/02/26 04:41:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,8 @@ extern TupleTableSlot *ExecHashJoin(HashJoin *node); extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent); extern int ExecCountSlotsHashJoin(HashJoin *node); extern void ExecEndHashJoin(HashJoin *node); -extern char * ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer, +extern char * +ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer, File file, char *position); extern void ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent); diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h index 1c612ea4fa..c52e06ec98 100644 --- a/src/include/executor/nodeMaterial.h +++ b/src/include/executor/nodeMaterial.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMaterial.h,v 1.6 1998/02/13 03:43:37 vadim Exp $ + * $Id: nodeMaterial.h,v 1.7 1998/02/26 04:41:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,8 +22,10 @@ extern bool ExecInitMaterial(Material *node, EState *estate, Plan *parent); extern int ExecCountSlotsMaterial(Material *node); extern void ExecEndMaterial(Material *node); extern void ExecMaterialReScan(Material *node, ExprContext *exprCtxt, Plan *parent); + #if 0 extern List ExecMaterialMarkPos(Material *node); extern void ExecMaterialRestrPos(Material *node); + #endif #endif /* NODEMATERIAL_H */ diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h index 6fa8945482..dc25902a79 100644 --- a/src/include/executor/nodeSubplan.h +++ b/src/include/executor/nodeSubplan.h @@ -13,8 +13,8 @@ extern Datum ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext); extern bool ExecInitSubPlan(SubPlan *node, EState *estate, Plan *parent); -extern void ExecReScanSetParamPlan (SubPlan *node, Plan *parent); -extern void ExecSetParamPlan (SubPlan *node); +extern void ExecReScanSetParamPlan(SubPlan *node, Plan *parent); +extern void ExecSetParamPlan(SubPlan *node); extern void ExecEndSubPlan(SubPlan *node); #endif /* NODESUBPLAN_H */ diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index ef8b268faa..d547900708 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -41,7 +41,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,22 +73,23 @@ extern int SPI_result; extern int SPI_connect(void); extern int SPI_finish(void); extern int SPI_exec(char *src, int tcount); -extern int SPI_execp(void *plan, Datum * values, char *Nulls, int tcount); -extern void *SPI_prepare(char *src, int nargs, Oid * argtypes); +extern int SPI_execp(void *plan, Datum *values, char *Nulls, int tcount); +extern void *SPI_prepare(char *src, int nargs, Oid *argtypes); extern void *SPI_saveplan(void *plan); extern HeapTuple SPI_copytuple(HeapTuple tuple); -extern HeapTuple SPI_modifytuple(Relation rel, HeapTuple tuple, int natts, - int *attnum, Datum * Values, char *Nulls); +extern HeapTuple +SPI_modifytuple(Relation rel, HeapTuple tuple, int natts, + int *attnum, Datum *Values, char *Nulls); extern int SPI_fnumber(TupleDesc tupdesc, char *fname); extern char *SPI_fname(TupleDesc tupdesc, int fnumber); extern char *SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber); -extern Datum SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull); +extern Datum 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); -extern void *SPI_palloc (Size size); -extern void *SPI_repalloc(void *pointer, Size size); -extern void SPI_pfree(void *pointer); +extern void *SPI_palloc(Size size); +extern void *SPI_repalloc(void *pointer, Size size); +extern void SPI_pfree(void *pointer); #endif /* SPI_H */ diff --git a/src/include/lib/qsort.h b/src/include/lib/qsort.h index 5ec39ee7a0..9bf57408d4 100644 --- a/src/include/lib/qsort.h +++ b/src/include/lib/qsort.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: qsort.h,v 1.4 1998/01/24 22:49:12 momjian Exp $ + * $Id: qsort.h,v 1.5 1998/02/26 04:41:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,7 +14,8 @@ #define QSORT_H -extern void pg_qsort(void *bot, +extern void +pg_qsort(void *bot, size_t nmemb, size_t size, int (*compar) (void *, void *)); diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h index bf85ee5996..0adc4d4658 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.8 1998/01/26 01:42:05 scrappy Exp $ + * $Id: auth.h,v 1.9 1998/02/26 04:41:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,8 +20,8 @@ *---------------------------------------------------------------- */ -void be_recvauth(Port *port); -void auth_failed(Port *port); +void be_recvauth(Port *port); +void auth_failed(Port *port); #define PG_KRB4_VERSION "PGVER4.1" /* at most KRB_SENDAUTH_VLEN chars */ #define PG_KRB5_VERSION "PGVER5.1" diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h index b1da83ac60..4c0117d616 100644 --- a/src/include/libpq/crypt.h +++ b/src/include/libpq/crypt.h @@ -15,15 +15,17 @@ #define CRYPT_PWD_FILE_SEPCHAR "'\\t'" #define CRYPT_PWD_FILE_SEPSTR "\t" #define CRYPT_PWD_RELOAD_SUFX ".reload" - -extern char** pwd_cache; -extern int pwd_cache_count; -extern char* crypt_getpwdfilename(void); -extern char* crypt_getpwdreloadfilename(void); +extern char **pwd_cache; +extern int pwd_cache_count; + +extern char *crypt_getpwdfilename(void); +extern char *crypt_getpwdreloadfilename(void); + #if 0 -extern MsgType crypt_salt(const char* user); +extern MsgType crypt_salt(const char *user); + #endif -extern int crypt_verify(Port* port, const char* user, const char* pgpass); +extern int crypt_verify(Port *port, const char *user, const char *pgpass); #endif diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index fdadfc0d85..8900c6f34f 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.7 1998/01/26 01:42:15 scrappy Exp $ + * $Id: hba.h,v 1.8 1998/02/26 04:41:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,7 @@ #define MAX_TOKEN 80 /* Maximum size of one token in the configuration file */ -#define MAX_AUTH_ARG 80 /* Max size of an authentication arg */ +#define MAX_AUTH_ARG 80 /* Max size of an authentication arg */ #define IDENT_PORT 113 /* Standard TCP port number for Ident service. Assigned by IANA */ @@ -39,7 +39,8 @@ #define IDENT_USERNAME_MAX 512 /* Max size of username ident server can return */ -typedef enum UserAuth { +typedef enum UserAuth +{ uaReject, uaKrb4, uaKrb5, @@ -49,9 +50,11 @@ typedef enum UserAuth { uaCrypt } UserAuth; -int hba_getauthmethod(SockAddr *raddr, char *database, char *auth_arg, - UserAuth *auth_method); -int authident(struct sockaddr_in *raddr, struct sockaddr_in *laddr, - const char postgres_username[], const char auth_arg[]); +int +hba_getauthmethod(SockAddr *raddr, char *database, char *auth_arg, + UserAuth *auth_method); +int +authident(struct sockaddr_in * raddr, struct sockaddr_in * laddr, + const char postgres_username[], const char auth_arg[]); #endif diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 4d0e186198..7058eec246 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.9 1998/01/26 01:42:17 scrappy Exp $ + * $Id: libpq-be.h,v 1.10 1998/02/26 04:41:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,7 +23,8 @@ /* Protocol v0 password packet. */ -typedef struct PasswordPacketV0 { +typedef struct PasswordPacketV0 +{ uint32 unused; char data[288]; /* User and password as strings. */ } PasswordPacketV0; @@ -33,68 +34,76 @@ typedef struct PasswordPacketV0 { * Password packet. The length of the password can be changed without * affecting anything. */ - -typedef struct PasswordPacket { - char passwd[100]; /* The password. */ + +typedef struct PasswordPacket +{ + char passwd[100]; /* The password. */ } PasswordPacket; /* Error message packet. */ -typedef struct ErrorMessagePacket { - char data[1 + 100]; /* 'E' + the message. */ +typedef struct ErrorMessagePacket +{ + char data[1 + 100]; /* 'E' + the message. */ } ErrorMessagePacket; /* Authentication request packet. */ -typedef struct AuthRequestPacket { - char data[1 + sizeof (AuthRequest) + 2]; /* 'R' + the request + optional salt. */ +typedef struct AuthRequestPacket +{ + char data[1 + sizeof(AuthRequest) + 2]; /* 'R' + the request + + * optional salt. */ } AuthRequestPacket; - + /* These are used by the packet handling routines. */ -typedef enum { +typedef enum +{ Idle, ReadingPacketLength, ReadingPacket, WritingPacket } PacketState; -typedef struct Packet { - PacketState state; /* What's in progress. */ +typedef struct Packet +{ + PacketState state; /* What's in progress. */ PacketLen len; /* Actual length */ - int nrtodo; /* Bytes still to transfer */ - char *ptr; /* Buffer pointer */ - void (*iodone)(); /* I/O complete callback */ - char *arg; /* Argument to callback */ + int nrtodo; /* Bytes still to transfer */ + char *ptr; /* Buffer pointer */ + void (*iodone) (); /* I/O complete callback */ + char *arg; /* Argument to callback */ /* A union of all the different packets. */ - union { + union + { /* These are outgoing so have no packet length prepended. */ - ErrorMessagePacket em; - AuthRequestPacket ar; + ErrorMessagePacket em; + AuthRequestPacket ar; /* These are incoming and have a packet length prepended. */ - StartupPacket si; - PasswordPacketV0 pwv0; - PasswordPacket pw; - } pkt; + StartupPacket si; + PasswordPacketV0 pwv0; + PasswordPacket pw; + } pkt; } Packet; /* - * This is used by the postmaster in its communication with frontends. It is + * This is used by the postmaster in its communication with frontends. It is * contains all state information needed during this communication before the * backend is run. */ - -typedef struct Port { - int sock; /* File descriptor */ + +typedef struct Port +{ + int sock; /* File descriptor */ Packet pktInfo; /* For the packet handlers */ SockAddr laddr; /* local addr (us) */ SockAddr raddr; /* remote addr (them) */ @@ -105,7 +114,7 @@ typedef struct Port { * handshake. */ - ProtocolVersion proto; + ProtocolVersion proto; char database[SM_DATABASE + 1]; char user[SM_USER + 1]; char options[SM_OPTIONS + 1]; @@ -115,18 +124,19 @@ typedef struct Port { } Port; -extern FILE *Pfout, *Pfin; -extern int PQAsyncNotifyWaiting; +extern FILE *Pfout, + *Pfin; +extern int PQAsyncNotifyWaiting; extern ProtocolVersion FrontendProtocol; /* * prototypes for functions in pqpacket.c */ -void PacketReceiveSetup(Packet *pkt, void (*iodone)(), char *arg); -int PacketReceiveFragment(Packet *pkt, int sock); -void PacketSendSetup(Packet *pkt, int nbytes, void (*iodone)(), char *arg); -int PacketSendFragment(Packet *pkt, int sock); -void PacketSendError(Packet *pkt, char *errormsg); - +void PacketReceiveSetup(Packet *pkt, void (*iodone) (), char *arg); +int PacketReceiveFragment(Packet *pkt, int sock); +void PacketSendSetup(Packet *pkt, int nbytes, void (*iodone) (), char *arg); +int PacketSendFragment(Packet *pkt, int sock); +void PacketSendError(Packet *pkt, char *errormsg); + #endif /* LIBPQ_BE_H */ diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index b4d7407f12..57ec39576d 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.11 1998/01/26 01:49:19 scrappy Exp $ + * $Id: libpq.h,v 1.12 1998/02/26 04:41:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -180,9 +180,11 @@ extern int PQninstancesGroup(PortalBuffer *portal, int group_index); extern int PQnfieldsGroup(PortalBuffer *portal, int group_index); extern int PQfnumberGroup(PortalBuffer *portal, int group_index, char *field_name); extern char *PQfnameGroup(PortalBuffer *portal, int group_index, int field_number); -extern int PQftypeGroup(PortalBuffer *portal, int group_index, +extern int +PQftypeGroup(PortalBuffer *portal, int group_index, int field_number); -extern int PQfsizeGroup(PortalBuffer *portal, int group_index, +extern int +PQfsizeGroup(PortalBuffer *portal, int group_index, int field_number); extern GroupBuffer *PQgroup(PortalBuffer *portal, int tuple_index); extern int PQgetgroup(PortalBuffer *portal, int tuple_index); @@ -270,7 +272,8 @@ extern int pq_sendoob(char *msg, int len); extern int pq_recvoob(char *msgPtr, int *lenPtr); extern int pq_getinaddr(struct sockaddr_in * sin, char *host, int port); extern int pq_getinserv(struct sockaddr_in * sin, char *host, char *serv); -extern int pq_connect(char *dbname, char *user, char *args, char *hostName, +extern int +pq_connect(char *dbname, char *user, char *args, char *hostName, char *debugTty, char *execFile, short portName); extern int StreamOpen(char *hostName, short portName, Port *port); extern void pq_regoob(void (*fptr) ()); diff --git a/src/include/libpq/password.h b/src/include/libpq/password.h index f0c24794c3..9c7421d893 100644 --- a/src/include/libpq/password.h +++ b/src/include/libpq/password.h @@ -1,6 +1,6 @@ #ifndef PASSWORD_H #define PASSWORD_H -int verify_password(char *auth_arg, char *user, char *password); +int verify_password(char *auth_arg, char *user, char *password); #endif diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h index 0145f26270..0b06de0df1 100644 --- a/src/include/libpq/pqcomm.h +++ b/src/include/libpq/pqcomm.h @@ -1,12 +1,12 @@ /*------------------------------------------------------------------------- * * pqcomm.h-- - * Definitions common to frontends and backends. + * Definitions common to frontends and backends. * * * Copyright (c) 1994, Regents of the University of California * - * $Id: pqcomm.h,v 1.22 1998/01/28 02:29:40 momjian Exp $ + * $Id: pqcomm.h,v 1.23 1998/02/26 04:41:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,16 +24,17 @@ /* Define a generic socket address type. */ -typedef union SockAddr { - struct sockaddr sa; - struct sockaddr_in in; - struct sockaddr_un un; +typedef union SockAddr +{ + struct sockaddr sa; + struct sockaddr_in in; + struct sockaddr_un un; } SockAddr; /* Configure the UNIX socket address for the well known port. */ -#define UNIXSOCK_PATH(sun,port) \ +#define UNIXSOCK_PATH(sun,port) \ (sprintf((sun).sun_path, "/tmp/.s.PGSQL.%d", (port)) + \ offsetof(struct sockaddr_un, sun_path)) /* @@ -57,14 +58,14 @@ typedef union SockAddr { * version. */ -#define PG_PROTOCOL_MAJOR(v) ((v) >> 16) -#define PG_PROTOCOL_MINOR(v) ((v) & 0x0000ffff) -#define PG_PROTOCOL(m,n) (((m) << 16) | (n)) +#define PG_PROTOCOL_MAJOR(v) ((v) >> 16) +#define PG_PROTOCOL_MINOR(v) ((v) & 0x0000ffff) +#define PG_PROTOCOL(m,n) (((m) << 16) | (n)) /* The earliest and latest frontend/backend protocol version supported. */ -#define PG_PROTOCOL_EARLIEST PG_PROTOCOL(0,0) -#define PG_PROTOCOL_LATEST PG_PROTOCOL(1,0) +#define PG_PROTOCOL_EARLIEST PG_PROTOCOL(0,0) +#define PG_PROTOCOL_LATEST PG_PROTOCOL(1,0) /* * All packets sent to the postmaster start with the length. This is omitted @@ -73,48 +74,49 @@ typedef union SockAddr { typedef uint32 PacketLen; - + /* * Startup message parameters sizes. These must not be changed without changing * the protcol version. These are all strings that are '\0' terminated only if * there is room. */ -#define SM_DATABASE 64 -#define SM_USER 32 -#define SM_OPTIONS 64 -#define SM_UNUSED 64 -#define SM_TTY 64 +#define SM_DATABASE 64 +#define SM_USER 32 +#define SM_OPTIONS 64 +#define SM_UNUSED 64 +#define SM_TTY 64 -typedef uint32 ProtocolVersion; /* Fe/Be protocol version nr. */ +typedef uint32 ProtocolVersion; /* Fe/Be protocol version nr. */ -typedef struct StartupPacket { - ProtocolVersion protoVersion; /* Protocol version */ +typedef struct StartupPacket +{ + ProtocolVersion protoVersion; /* Protocol version */ char database[SM_DATABASE]; /* Database name */ - char user[SM_USER]; /* User name */ + char user[SM_USER]; /* User name */ char options[SM_OPTIONS]; /* Optional additional args */ - char unused[SM_UNUSED]; /* Unused */ - char tty[SM_TTY]; /* Tty for debug output */ + char unused[SM_UNUSED]; /* Unused */ + char tty[SM_TTY]; /* Tty for debug output */ } StartupPacket; /* These are the authentication requests sent by the backend. */ -#define AUTH_REQ_OK 0 /* User is authenticated */ -#define AUTH_REQ_KRB4 1 /* Kerberos V4 */ -#define AUTH_REQ_KRB5 2 /* Kerberos V5 */ -#define AUTH_REQ_PASSWORD 3 /* Password */ -#define AUTH_REQ_CRYPT 4 /* Encrypted password */ +#define AUTH_REQ_OK 0 /* User is authenticated */ +#define AUTH_REQ_KRB4 1 /* Kerberos V4 */ +#define AUTH_REQ_KRB5 2 /* Kerberos V5 */ +#define AUTH_REQ_PASSWORD 3 /* Password */ +#define AUTH_REQ_CRYPT 4 /* Encrypted password */ typedef uint32 AuthRequest; /* This next section is to maintain compatibility with protocol v0.0. */ -#define STARTUP_MSG 7 /* Initialise a connection */ -#define STARTUP_KRB4_MSG 10 /* krb4 session follows */ -#define STARTUP_KRB5_MSG 11 /* krb5 session follows */ -#define STARTUP_PASSWORD_MSG 14 /* Password follows */ +#define STARTUP_MSG 7 /* Initialise a connection */ +#define STARTUP_KRB4_MSG 10 /* krb4 session follows */ +#define STARTUP_KRB5_MSG 11 /* krb5 session follows */ +#define STARTUP_PASSWORD_MSG 14 /* Password follows */ typedef ProtocolVersion MsgType; diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index 774ff0f34d..9b7749323a 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.19 1998/01/25 05:15:01 momjian Exp $ + * $Id: miscadmin.h,v 1.20 1998/02/26 04:39:48 momjian Exp $ * * NOTES * some of the information in this file will be moved to @@ -64,7 +64,7 @@ extern short DebugLvl; * USE_POSTGRES_DATES specifies traditional postgres format for output. * USE_ISO_DATES specifies ISO-compliant format for output. * USE_SQL_DATES specified Oracle/Ingres-compliant format for output. - * USE_GERMAN_DATES specifies German-style dd.mm/yyyy date format. + * USE_GERMAN_DATES specifies German-style dd.mm/yyyy date format. * * DateStyle specifies preference for date formatting for output. * EuroDates if client prefers dates interpreted and written w/European conventions. @@ -112,7 +112,7 @@ extern Oid LastOidProcessed; /* for query rewrite */ /* in utils/misc/database.c */ extern void GetRawDatabaseInfo(char *name, Oid *owner, Oid *db_id, char *path); -extern int GetDatabaseInfo(char *name, Oid *owner, char *path); +extern int GetDatabaseInfo(char *name, Oid *owner, char *path); extern char *ExpandDatabasePath(char *path); /* now in utils/init/miscinit.c */ diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index f3e60bcc09..7decc99e29 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.14 1998/02/18 12:41:36 vadim Exp $ + * $Id: execnodes.h,v 1.15 1998/02/26 04:41:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -80,17 +80,17 @@ typedef struct RelationInfo */ typedef struct ExprContext { - NodeTag type; - TupleTableSlot *ecxt_scantuple; - TupleTableSlot *ecxt_innertuple; - TupleTableSlot *ecxt_outertuple; - Relation ecxt_relation; - Index ecxt_relid; - ParamListInfo ecxt_param_list_info; - ParamExecData *ecxt_param_exec_vals; /* this is for subselects */ - List *ecxt_range_table; - Datum *ecxt_values; /* precomputed values for aggreg */ - char *ecxt_nulls; /* null flags for aggreg values */ + NodeTag type; + TupleTableSlot *ecxt_scantuple; + TupleTableSlot *ecxt_innertuple; + TupleTableSlot *ecxt_outertuple; + Relation ecxt_relation; + Index ecxt_relid; + ParamListInfo ecxt_param_list_info; + ParamExecData *ecxt_param_exec_vals; /* this is for subselects */ + List *ecxt_range_table; + Datum *ecxt_values; /* precomputed values for aggreg */ + char *ecxt_nulls; /* null flags for aggreg values */ } ExprContext; /* ---------------- @@ -194,19 +194,19 @@ typedef struct JunkFilter */ typedef struct EState { - NodeTag type; - ScanDirection es_direction; - List *es_range_table; - RelationInfo *es_result_relation_info; - Relation es_into_relation_descriptor; - ParamListInfo es_param_list_info; - ParamExecData *es_param_exec_vals; /* this is for subselects */ - int es_BaseId; - TupleTable es_tupleTable; - JunkFilter *es_junkFilter; - int *es_refcount; - uint32 es_processed; /* # of tuples processed */ - Oid es_lastoid; /* last oid processed (by INSERT) */ + NodeTag type; + ScanDirection es_direction; + List *es_range_table; + RelationInfo *es_result_relation_info; + Relation es_into_relation_descriptor; + ParamListInfo es_param_list_info; + ParamExecData *es_param_exec_vals; /* this is for subselects */ + int es_BaseId; + TupleTable es_tupleTable; + JunkFilter *es_junkFilter; + int *es_refcount; + uint32 es_processed; /* # of tuples processed */ + Oid es_lastoid; /* last oid processed (by INSERT) */ } EState; /* ---------------- @@ -586,8 +586,8 @@ typedef struct AggState */ typedef struct GroupState { - CommonScanState csstate; /* its first field is NodeTag */ - bool grp_useFirstTuple; /* first tuple not processed yet */ + CommonScanState csstate; /* its first field is NodeTag */ + bool grp_useFirstTuple; /* first tuple not processed yet */ bool grp_done; HeapTuple grp_firstTuple; } GroupState; diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index 569c70f15d..9ab40e1a2d 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: makefuncs.h,v 1.10 1998/02/21 16:58:45 momjian Exp $ + * $Id: makefuncs.h,v 1.11 1998/02/26 04:41:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,13 +16,15 @@ #include <nodes/primnodes.h> #include <utils/fcache.h> -extern Oper * makeOper(Oid opno, +extern Oper * +makeOper(Oid opno, Oid opid, Oid opresulttype, int opsize, FunctionCachePtr op_fcache); -extern Var * makeVar(Index varno, +extern Var * +makeVar(Index varno, AttrNumber varattno, Oid vartype, int16 vartypmod, @@ -30,7 +32,8 @@ extern Var * makeVar(Index varno, Index varnoold, AttrNumber varoattno); -extern Resdom * makeResdom(AttrNumber resno, +extern Resdom * +makeResdom(AttrNumber resno, Oid restype, int16 restypmod, char *resname, @@ -38,7 +41,8 @@ extern Resdom * makeResdom(AttrNumber resno, Oid reskeyop, int resjunk); -extern Const * makeConst(Oid consttype, +extern Const * +makeConst(Oid consttype, int constlen, Datum constvalue, bool constisnull, diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index 7a70a888b4..aaa5657208 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.7 1998/02/13 03:45:24 vadim Exp $ + * $Id: params.h,v 1.8 1998/02/26 04:41:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,7 +45,7 @@ #define PARAM_NUM 12 #define PARAM_NEW 13 #define PARAM_OLD 14 -#define PARAM_EXEC 15 +#define PARAM_EXEC 15 #define PARAM_INVALID 100 @@ -93,7 +93,8 @@ typedef ParamListInfoData *ParamListInfo; typedef struct ParamExecData { - void *execPlan; /* plan must be executed to get param value */ + void *execPlan; /* plan must be executed to get param + * value */ Datum value; bool isnull; } ParamExecData; diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index f91e115373..1513773139 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.48 1998/02/21 06:32:02 scrappy Exp $ + * $Id: parsenodes.h,v 1.49 1998/02/26 04:41:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,7 @@ typedef struct Query bool unionall; /* union without unique sort */ bool hasAggs; /* has aggregates in target list */ bool hasSubLinks; /* has subquery SubLink */ - + char *uniqueFlag; /* NULL, '*', or Unique attribute name */ List *sortClause; /* a list of SortClause's */ @@ -58,7 +58,8 @@ typedef struct Query * BY */ Node *havingQual; /* qualification of each group */ - List *unionClause; /* unions are linked under the previous query */ + List *unionClause; /* unions are linked under the previous + * query */ /* internal to planner */ List *base_relation_list_; /* base relation list */ @@ -202,26 +203,26 @@ typedef struct DropPLangStmt /* ---------------------- - * Create/Alter/Drop User Statements + * Create/Alter/Drop User Statements * ---------------------- */ typedef struct CreateUserStmt { - NodeTag type; - char* user; /* PostgreSQL user login */ - char* password; /* PostgreSQL user password */ - bool* createdb; /* Can the user create databases? */ - bool* createuser; /* Can this user create users? */ - List* groupElts; /* The groups the user is a member of */ - char* validUntil; /* The time the login is valid until */ + NodeTag type; + char *user; /* PostgreSQL user login */ + char *password; /* PostgreSQL user password */ + bool *createdb; /* Can the user create databases? */ + bool *createuser; /* Can this user create users? */ + List *groupElts; /* The groups the user is a member of */ + char *validUntil; /* The time the login is valid until */ } CreateUserStmt; -typedef CreateUserStmt AlterUserStmt; +typedef CreateUserStmt AlterUserStmt; typedef struct DropUserStmt { - NodeTag type; - char* user; /* PostgreSQL user login */ + NodeTag type; + char *user; /* PostgreSQL user login */ } DropUserStmt; diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 0091891aae..fabed6cf90 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.14 1998/02/13 03:45:25 vadim Exp $ + * $Id: plannodes.h,v 1.15 1998/02/26 04:42:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -74,20 +74,22 @@ typedef struct Plan List *qual; /* Node* or List* ?? */ struct Plan *lefttree; struct Plan *righttree; - List *extParam; /* indices of _all_ _external_ PARAM_EXEC for - * this plan in global es_param_exec_vals. - * Params from setParam from initPlan-s - * are not included, but their execParam-s - * are here!!! */ + List *extParam; /* indices of _all_ _external_ PARAM_EXEC + * for this plan in global + * es_param_exec_vals. Params from + * setParam from initPlan-s are not + * included, but their execParam-s are + * here!!! */ List *locParam; /* someones from setParam-s */ List *chgParam; /* list of changed ones from the above */ - List *initPlan; /* Init Plan nodes (un-correlated expr subselects) */ + List *initPlan; /* Init Plan nodes (un-correlated expr + * subselects) */ List *subPlan; /* Other SubPlan nodes */ - - /* + + /* * We really need in some TopPlan node to store range table and - * resultRelation from Query there and get rid of Query itself - * from Executor. Some other stuff like below could be put there, too. + * resultRelation from Query there and get rid of Query itself from + * Executor. Some other stuff like below could be put there, too. */ int nParamExec; /* Number of them in entire query. This is * to get Executor know about how many @@ -232,7 +234,7 @@ typedef struct HashJoin typedef struct Agg { Plan plan; - List *aggs; + List *aggs; AggState *aggstate; } Agg; @@ -359,18 +361,19 @@ typedef struct Tee */ typedef struct SubPlan { - NodeTag type; - Plan *plan; /* subselect plan itself */ - int plan_id; /* dummy thing because of we haven't - * equal funcs for plan nodes... actually, - * we could put *plan itself somewhere else + NodeTag type; + Plan *plan; /* subselect plan itself */ + int plan_id; /* dummy thing because of we haven't equal + * funcs for plan nodes... actually, we + * could put *plan itself somewhere else * (TopPlan node ?)... */ - List *rtable; /* range table */ - List *setParam; /* non-correlated EXPR & EXISTS subqueries + List *rtable; /* range table */ + List *setParam; /* non-correlated EXPR & EXISTS subqueries * have to set some Params for paren Plan */ - List *parParam; /* indices of corr. Vars from parent plan */ - SubLink *sublink; /* SubLink node for subselects in WHERE and HAVING */ - bool shutdown; /* shutdown plan if TRUE */ + List *parParam; /* indices of corr. Vars from parent plan */ + SubLink *sublink; /* SubLink node for subselects in WHERE + * and HAVING */ + bool shutdown; /* shutdown plan if TRUE */ } SubPlan; #endif /* PLANNODES_H */ diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index e49d789871..e8c7a95747 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.20 1998/02/21 16:58:49 momjian Exp $ + * $Id: primnodes.h,v 1.21 1998/02/26 04:42:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -269,7 +269,7 @@ typedef struct Aggreg char *aggname; Oid basetype; Oid aggtype; - Node *target; + Node *target; int aggno; bool usenulls; } Aggreg; @@ -292,11 +292,11 @@ typedef enum SubLinkType typedef struct SubLink { NodeTag type; - SubLinkType subLinkType; + SubLinkType subLinkType; bool useor; - List *lefthand; - List *oper; - Node *subselect; + List *lefthand; + List *oper; + Node *subselect; } SubLink; /* ---------------- diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h index 66ee2f7561..308c2d9363 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.6 1998/01/24 22:49:28 momjian Exp $ + * $Id: print.h,v 1.7 1998/02/26 04:42:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,8 @@ extern void print_expr(Node *expr, List *rtable); extern void print_keys(List *keys, List *rtable); extern void print_tl(List *tlist, List *rtable); extern void print_slot(TupleTableSlot *slot); -extern void print_plan_recursive(Plan *p, Query *parsetree, +extern void +print_plan_recursive(Plan *p, Query *parsetree, int indentLevel, char *label); extern void print_plan(Plan *p, Query *parsetree); diff --git a/src/include/optimizer/clauseinfo.h b/src/include/optimizer/clauseinfo.h index c688d9020a..db8fffe4d2 100644 --- a/src/include/optimizer/clauseinfo.h +++ b/src/include/optimizer/clauseinfo.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: clauseinfo.h,v 1.6 1998/01/24 22:49:34 momjian Exp $ + * $Id: clauseinfo.h,v 1.7 1998/02/26 04:42:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,9 +18,11 @@ extern bool valid_or_clause(CInfo *clauseinfo); extern List *get_actual_clauses(List *clauseinfo_list); -extern void get_relattvals(List *clauseinfo_list, List **attnos, +extern void +get_relattvals(List *clauseinfo_list, List **attnos, List **values, List **flags); -extern void get_joinvars(Oid relid, List *clauseinfo_list, +extern void +get_joinvars(Oid relid, List *clauseinfo_list, List **attnos, List **values, List **flags); extern List *get_opnos(List *clauseinfo_list); diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index 60ca943fb5..5c92930f40 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.9 1998/02/13 03:46:54 vadim Exp $ + * $Id: clauses.h,v 1.10 1998/02/26 04:42:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,13 +42,15 @@ 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, +extern void +get_relattval(Node *clause, int *relid, AttrNumber *attno, Datum *constval, int *flag); -extern void get_rels_atts(Node *clause, int *relid1, +extern void +get_rels_atts(Node *clause, int *relid1, AttrNumber *attno1, int *relid2, AttrNumber *attno2); extern void CommuteClause(Node *clause); -#define is_subplan(clause) ((Node*) clause != NULL && \ +#define is_subplan(clause) ((Node*) clause != NULL && \ nodeTag((Node*) clause) == T_Expr && \ ((Expr *) clause)->opType == SUBPLAN_EXPR) diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index 149c75a29f..05bc19fec8 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.7 1998/01/24 22:49:41 momjian Exp $ + * $Id: cost.h,v 1.8 1998/02/26 04:42:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,16 +31,20 @@ extern bool _enable_mergesort_; extern bool _enable_hashjoin_; extern Cost cost_seqscan(int relid, int relpages, int reltuples); -extern Cost cost_index(Oid indexid, int expected_indexpages, Cost selec, +extern Cost +cost_index(Oid indexid, int expected_indexpages, Cost selec, int relpages, int reltuples, int indexpages, int indextuples, bool is_injoin); extern Cost cost_sort(List *keys, int tuples, int width, bool noread); -extern Cost cost_nestloop(Cost outercost, Cost innercost, int outertuples, +extern Cost +cost_nestloop(Cost outercost, Cost innercost, int outertuples, int innertuples, int outerpages, bool is_indexjoin); -extern Cost cost_mergesort(Cost outercost, Cost innercost, +extern Cost +cost_mergesort(Cost outercost, Cost innercost, List *outersortkeys, List *innersortkeys, int outersize, int innersize, int outerwidth, int innerwidth); -extern Cost cost_hashjoin(Cost outercost, Cost innercost, List *outerkeys, +extern Cost +cost_hashjoin(Cost outercost, Cost innercost, List *outerkeys, List *innerkeys, int outersize, int innersize, int outerwidth, int innerwidth); extern int compute_rel_size(Rel *rel); @@ -56,7 +60,8 @@ extern void set_clause_selectivities(List *clauseinfo_list, Cost new_selectivity extern Cost product_selec(List *clauseinfo_list); extern void set_rest_relselec(Query *root, List *rel_list); extern void set_rest_selec(Query *root, List *clauseinfo_list); -extern Cost compute_clause_selec(Query *root, +extern Cost +compute_clause_selec(Query *root, Node *clause, List *or_selectivities); #endif /* COST_H */ diff --git a/src/include/optimizer/ordering.h b/src/include/optimizer/ordering.h index 5209f029f7..f06487b447 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.7 1998/01/24 22:49:43 momjian Exp $ + * $Id: ordering.h,v 1.8 1998/02/26 04:42:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,11 +15,14 @@ #include <nodes/relation.h> -extern bool equal_path_path_ordering(PathOrder *path_ordering1, +extern bool +equal_path_path_ordering(PathOrder *path_ordering1, PathOrder *path_ordering2); -extern bool equal_path_merge_ordering(Oid *path_ordering, +extern bool +equal_path_merge_ordering(Oid *path_ordering, MergeOrder *merge_ordering); -extern bool equal_merge_merge_ordering(MergeOrder *merge_ordering1, +extern bool +equal_merge_merge_ordering(MergeOrder *merge_ordering1, MergeOrder *merge_ordering2); #endif /* ORDERING_H */ diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index d73ebaf76c..b71512cad7 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.6 1998/01/24 22:49:46 momjian Exp $ + * $Id: pathnode.h,v 1.7 1998/02/26 04:42:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,19 +22,24 @@ */ 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, +extern List * +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, +extern IndexPath * +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, +extern JoinPath * +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, +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); -extern HashPath * create_hashjoin_path(Rel *joinrel, int outersize, +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); diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index 0e2d532bf2..741204dfe8 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.7 1998/01/24 22:49:48 momjian Exp $ + * $Id: paths.h,v 1.8 1998/02/26 04:42:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,8 @@ 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, +extern List * +find_index_paths(Query *root, Rel *rel, List *indices, List *clauseinfo_list, List *joininfo_list); @@ -47,30 +48,37 @@ 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, +extern List * +group_clauses_by_hashop(List *clauseinfo_list, int inner_relid); /* * joinutils.h * generic join method key/clause routines */ -extern List * match_pathkeys_joinkeys(List *pathkeys, +extern List * +match_pathkeys_joinkeys(List *pathkeys, List *joinkeys, List *joinclauses, int which_subkey, List **matchedJoinClausesPtr); -extern List * extract_path_keys(List *joinkeys, List *tlist, +extern List * +extract_path_keys(List *joinkeys, List *tlist, int which_subkey); -extern Path * match_paths_joinkeys(List *joinkeys, PathOrder *ordering, +extern Path * +match_paths_joinkeys(List *joinkeys, PathOrder *ordering, List *paths, int which_subkey); -extern List * new_join_pathkeys(List *outer_pathkeys, +extern List * +new_join_pathkeys(List *outer_pathkeys, List *join_rel_tlist, List *joinclauses); /* * mergeutils.h * routines to deal with merge keys and clauses */ -extern List * group_clauses_by_order(List *clauseinfo_list, +extern List * +group_clauses_by_order(List *clauseinfo_list, int inner_relid); -extern MInfo * match_order_mergeinfo(PathOrder *ordering, +extern MInfo * +match_order_mergeinfo(PathOrder *ordering, List *mergeinfo_list); /* diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index a52effd632..5eab2c653d 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.7 1998/01/24 22:49:50 momjian Exp $ + * $Id: plancat.h,v 1.8 1998/02/26 04:42:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,26 +34,31 @@ typedef struct IdxInfoRetval } IdxInfoRetval; -extern void relation_info(Query *root, +extern void +relation_info(Query *root, Oid relid, bool *hashindex, int *pages, int *tuples); -extern bool index_info(Query *root, +extern bool +index_info(Query *root, bool first, int relid, IdxInfoRetval *info); -extern Cost restriction_selectivity(Oid functionObjectId, +extern Cost +restriction_selectivity(Oid functionObjectId, Oid operatorObjectId, Oid relationObjectId, AttrNumber attributeNumber, char *constValue, int32 constFlag); -extern void index_selectivity(Oid indid, Oid *classes, List *opnos, +extern void +index_selectivity(Oid indid, Oid *classes, List *opnos, Oid relid, List *attnos, List *values, List *flags, int32 nkeys, float *idxPages, float *idxSelec); -extern Cost join_selectivity(Oid functionObjectId, Oid operatorObjectId, +extern Cost +join_selectivity(Oid functionObjectId, Oid operatorObjectId, Oid relationObjectId1, AttrNumber attributeNumber1, Oid relationObjectId2, AttrNumber attributeNumber2); diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 041a48b612..0e7708c60e 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.10 1998/01/15 19:00:15 momjian Exp $ + * $Id: planmain.h,v 1.11 1998/02/26 04:42:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,8 @@ /* * prototypes for plan/planmain.c */ -extern Plan *query_planner(Query *root, +extern Plan * +query_planner(Query *root, int command_type, List *tlist, List *qual); @@ -29,12 +30,15 @@ extern Plan *query_planner(Query *root, * prototypes for plan/createplan.c */ extern Plan *create_plan(Path *best_path); -extern SeqScan *make_seqscan(List *qptlist, List *qpqual, Index scanrelid, +extern SeqScan * +make_seqscan(List *qptlist, List *qpqual, Index scanrelid, Plan *lefttree); -extern Sort *make_sort(List *tlist, Oid tempid, Plan *lefttree, +extern Sort * +make_sort(List *tlist, Oid tempid, Plan *lefttree, int keycount); extern Agg *make_agg(List *tlist, Plan *lefttree); -extern Group *make_group(List *tlist, bool tuplePerGroup, int ngrp, +extern Group * +make_group(List *tlist, bool tuplePerGroup, int ngrp, AttrNumber *grpColIdx, Sort *lefttree); extern Unique *make_unique(List *tlist, Plan *lefttree, char *uniqueAttr); @@ -50,9 +54,11 @@ 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 List *join_references(List *clauses, List *outer_tlist, +extern List * +join_references(List *clauses, List *outer_tlist, List *inner_tlist); -extern List *index_outerjoin_references(List *inner_indxqual, +extern List * +index_outerjoin_references(List *inner_indxqual, List *outer_tlist, Index inner_relid); extern void set_result_tlist_references(Result *resultNode); extern List *set_agg_tlist_references(Agg *aggNode); diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index 91e6d18993..7776e5be1e 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.11 1997/12/29 01:13:23 momjian Exp $ + * $Id: prep.h,v 1.12 1998/02/26 04:42:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,10 +24,12 @@ extern List *cnfify(Expr *qual, bool removeAndFlag); /* * prototypes for preptlist.h */ -extern List *preprocess_targetlist(List *tlist, int command_type, +extern List * +preprocess_targetlist(List *tlist, int command_type, Index result_relation, List *range_table); -extern List *find_all_inheritors(List *unexamined_relids, +extern List * +find_all_inheritors(List *unexamined_relids, List *examined_relids); extern int first_inherit_rt_entry(List *rangetable); extern Append *plan_union_queries(Query *parse); diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h index 64f9851909..833750c960 100644 --- a/src/include/optimizer/subselect.h +++ b/src/include/optimizer/subselect.h @@ -7,14 +7,14 @@ #ifndef SUBSELECT_H #define SUBSELECT_H -extern int PlannerQueryLevel; /* level of current query */ -extern List *PlannerVarParam; /* correlation Vars to Param mapper */ -extern List *PlannerParamVar; /* to get Var from Param->paramid */ -extern List *PlannerInitPlan; /* init subplans for current query */ -extern int PlannerPlanId; /* to assigne unique ID to subquery plans */ +extern int PlannerQueryLevel; /* level of current query */ +extern List *PlannerVarParam; /* correlation Vars to Param mapper */ +extern List *PlannerParamVar; /* to get Var from Param->paramid */ +extern List *PlannerInitPlan; /* init subplans for current query */ +extern int PlannerPlanId; /* to assigne unique ID to subquery plans */ -extern List *SS_finalize_plan (Plan *plan); -extern Node *SS_replace_correlation_vars (Node *expr); -extern Node *SS_process_sublinks (Node *expr); +extern List *SS_finalize_plan(Plan *plan); +extern Node *SS_replace_correlation_vars(Node *expr); +extern Node *SS_process_sublinks(Node *expr); #endif /* SUBSELECT_H */ diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index d29535908c..76dd57439e 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tlist.h,v 1.7 1998/01/24 22:49:51 momjian Exp $ + * $Id: tlist.h,v 1.8 1998/02/26 04:42:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,7 +33,8 @@ 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, +extern List * +flatten_tlist_vars(List *full_tlist, List *flat_tlist); #endif /* TLIST_H */ diff --git a/src/include/optimizer/xfunc.h b/src/include/optimizer/xfunc.h index 0d13e7b00e..c3888cdc3b 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.6 1998/01/24 22:49:52 momjian Exp $ + * $Id: xfunc.h,v 1.7 1998/02/26 04:42:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -50,9 +50,11 @@ extern int XfuncMode; /* defined in tcop/postgres.c */ /* function prototypes from planner/path/xfunc.c */ extern void xfunc_trypullup(Rel *rel); -extern int xfunc_shouldpull(Path *childpath, JoinPath *parentpath, +extern int +xfunc_shouldpull(Path *childpath, JoinPath *parentpath, int whichchild, CInfo *maxcinfopt); -extern CInfo * xfunc_pullup(Path *childpath, JoinPath *parentpath, CInfo *cinfo, +extern 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); diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h index db400cb416..bb650d3f27 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.6 1997/11/26 03:43:05 momjian Exp $ + * $Id: gramparse.h,v 1.7 1998/02/26 04:42:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ extern void init_io(void); /* from gram.y */ -extern Oid param_type(int t); +extern Oid param_type(int t); extern void parser_init(Oid *typev, int nargs); extern int yyparse(void); diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index 1381f14f8c..5f6987253b 100644 --- a/src/include/parser/parse_agg.h +++ b/src/include/parser/parse_agg.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_agg.h,v 1.5 1998/01/20 05:04:41 momjian Exp $ + * $Id: parse_agg.h,v 1.6 1998/02/26 04:42:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,9 +20,9 @@ extern void AddAggToParseState(ParseState *pstate, Aggreg *aggreg); extern void parseCheckAggregates(ParseState *pstate, Query *qry); -extern Aggreg *ParseAgg(ParseState *pstate, char *aggname, Oid basetype, - List *target, int precedence); +extern Aggreg * +ParseAgg(ParseState *pstate, char *aggname, Oid basetype, + List *target, int precedence); extern void agg_error(char *caller, char *aggname, Oid basetypeID); #endif /* PARSE_AGG_H */ - diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h index 4c04a41cb3..0a232fecd0 100644 --- a/src/include/parser/parse_clause.h +++ b/src/include/parser/parse_clause.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_clause.h,v 1.5 1997/12/29 04:31:50 momjian Exp $ + * $Id: parse_clause.h,v 1.6 1998/02/26 04:42:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,12 +21,13 @@ extern void makeRangeTable(ParseState *pstate, char *relname, List *frmList); extern Node *transformWhereClause(ParseState *pstate, Node *a_expr); -extern List *transformGroupClause(ParseState *pstate, List *grouplist, - List *targetlist); -extern List *transformSortClause(ParseState *pstate, +extern List * +transformGroupClause(ParseState *pstate, List *grouplist, + List *targetlist); +extern List * +transformSortClause(ParseState *pstate, List *orderlist, List *sortClause, List *targetlist, char *uniqueFlag); extern List *transformUnionClause(List *unionClause, List *targetlist); #endif /* PARSE_CLAUSE_H */ - diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h index e533741ec2..1a990e4518 100644 --- a/src/include/parser/parse_expr.h +++ b/src/include/parser/parse_expr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_expr.h,v 1.7 1998/02/10 16:04:30 momjian Exp $ + * $Id: parse_expr.h,v 1.8 1998/02/26 04:42:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,8 +20,7 @@ extern Node *transformExpr(ParseState *pstate, Node *expr, int precedence); extern Node *transformIdent(ParseState *pstate, Node *expr, int precedence); -extern Oid exprType(Node *expr); +extern Oid exprType(Node *expr); extern Node *parser_typecast2(Node *expr, Oid exprType, Type tp, int16 attypmod); #endif /* PARSE_EXPR_H */ - diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index 4b03e0ced5..8b59613363 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_func.h,v 1.7 1998/02/05 04:08:44 scrappy Exp $ + * $Id: parse_func.h,v 1.8 1998/02/26 04:42:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,12 +42,13 @@ typedef struct _CandidateList struct _CandidateList *next; } *CandidateList; -extern Node *ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, - int *curr_resno, int precedence); -extern Node *ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, - int *curr_resno, int precedence); +extern Node * +ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, + int *curr_resno, int precedence); +extern Node * +ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, + int *curr_resno, int precedence); extern void func_error(char *caller, char *funcname, int nargs, Oid *argtypes); #endif /* PARSE_FUNC_H */ - diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index 5300db1e86..e77b3789b0 100644 --- a/src/include/parser/parse_node.h +++ b/src/include/parser/parse_node.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_node.h,v 1.9 1998/02/10 04:02:47 momjian Exp $ + * $Id: parse_node.h,v 1.10 1998/02/26 04:42:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -44,14 +44,17 @@ typedef struct ParseState extern ParseState *make_parsestate(ParseState *parentParseState); extern Expr *make_op(char *opname, Node *ltree, Node *rtree); -extern Var *make_var(ParseState *pstate, Oid relid, char *refname, - char *attrname); -extern ArrayRef *make_array_ref(Node *expr, +extern Var * +make_var(ParseState *pstate, Oid relid, char *refname, + char *attrname); +extern ArrayRef * +make_array_ref(Node *expr, List *indirection); -extern ArrayRef *make_array_set(Expr *target_expr, - List *upperIndexpr, - List *lowerIndexpr, - Expr *expr); +extern ArrayRef * +make_array_set(Expr *target_expr, + List *upperIndexpr, + List *lowerIndexpr, + Expr *expr); extern Const *make_const(Value *value); - + #endif /* PARSE_NODE_H */ diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h index 972f0991df..01f21adc1e 100644 --- a/src/include/parser/parse_oper.h +++ b/src/include/parser/parse_oper.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_oper.h,v 1.3 1997/11/26 03:43:14 momjian Exp $ + * $Id: parse_oper.h,v 1.4 1998/02/26 04:42:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,8 +18,8 @@ typedef HeapTuple Operator; -extern Oid any_ordering_op(int restype); -extern Oid oprid(Operator op); +extern Oid any_ordering_op(int restype); +extern Oid oprid(Operator op); extern Operator oper(char *op, Oid arg1, Oid arg2, bool noWarnings); extern Operator right_oper(char *op, Oid arg); extern Operator left_oper(char *op, Oid arg); diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 506fdad46b..5fc882e75d 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_relation.h,v 1.6 1998/01/20 22:12:17 momjian Exp $ + * $Id: parse_relation.h,v 1.7 1998/02/26 04:42:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,21 +21,25 @@ #include <utils/rel.h> extern RangeTblEntry *refnameRangeTableEntry(ParseState *pstate, char *refname); -extern int refnameRangeTablePosn(ParseState *pstate, - char *refname, int *sublevels_up); +extern int +refnameRangeTablePosn(ParseState *pstate, + char *refname, int *sublevels_up); extern RangeTblEntry *colnameRangeTableEntry(ParseState *pstate, char *colname); -extern RangeTblEntry *addRangeTableEntry(ParseState *pstate, - char *relname, - char *refname, - bool inh, - bool inFromCl); -extern List *expandAll(ParseState *pstate, char *relname, char *refname, - int *this_resno); -extern int attnameAttNum(Relation rd, char *a); +extern RangeTblEntry * +addRangeTableEntry(ParseState *pstate, + char *relname, + char *refname, + bool inh, + bool inFromCl); +extern List * +expandAll(ParseState *pstate, char *relname, char *refname, + int *this_resno); +extern int attnameAttNum(Relation rd, char *a); extern bool attnameIsSet(Relation rd, char *name); -extern int attnumAttNelems(Relation rd, int attid); -extern Oid attnumTypeId(Relation rd, int attid); -extern void handleTargetColname(ParseState *pstate, char **resname, +extern int attnumAttNelems(Relation rd, int attid); +extern Oid attnumTypeId(Relation rd, int attid); +extern void +handleTargetColname(ParseState *pstate, char **resname, char *refname, char *colname); #endif /* PARSE_RANGE_H */ diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h index 31b2c1594d..98dd31f68c 100644 --- a/src/include/parser/parse_target.h +++ b/src/include/parser/parse_target.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_target.h,v 1.3 1997/11/26 03:43:18 momjian Exp $ + * $Id: parse_target.h,v 1.4 1998/02/26 04:42:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,10 +20,9 @@ #include <parser/parse_node.h> #define EXPR_COLUMN_FIRST 1 -#define EXPR_RELATION_FIRST 2 +#define EXPR_RELATION_FIRST 2 extern List *transformTargetList(ParseState *pstate, List *targetlist); extern List *makeTargetNames(ParseState *pstate, List *cols); #endif /* PARSE_TARGET_H */ - diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h index da92efe984..12b489839a 100644 --- a/src/include/parser/parse_type.h +++ b/src/include/parser/parse_type.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_type.h,v 1.5 1998/02/13 19:46:18 momjian Exp $ + * $Id: parse_type.h,v 1.6 1998/02/26 04:42:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,17 +21,17 @@ extern bool typeidIsValid(Oid id); extern Type typeidType(Oid id); extern Type typenameType(char *s); extern char *typeidTypeName(Oid id); -extern Oid typeTypeId(Type tp); +extern Oid typeTypeId(Type tp); extern int16 typeLen(Type t); extern bool typeByVal(Type t); extern char *typeTypeName(Type t); extern char typeTypeFlag(Type t); extern char *stringTypeString(Type tp, char *string, int16 atttypmod); -extern Oid typeidOutfunc(Oid type_id); -extern Oid typeidTypeRelid(Oid type_id); -extern Oid typeTypeRelid(Type typ); -extern Oid typeidTypElem(Oid type_id); -extern Oid GetArrayElementType(Oid typearray); -extern Oid typeidInfunc(Oid type_id); +extern Oid typeidOutfunc(Oid type_id); +extern Oid typeidTypeRelid(Oid type_id); +extern Oid typeTypeRelid(Type typ); +extern Oid typeidTypElem(Oid type_id); +extern Oid GetArrayElementType(Oid typearray); +extern Oid typeidInfunc(Oid type_id); #endif /* PARSE_TYPE_H */ diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h index 820d7f960a..17867623e0 100644 --- a/src/include/parser/parser.h +++ b/src/include/parser/parser.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parser.h,v 1.2 1997/11/26 01:14:17 momjian Exp $ + * $Id: parser.h,v 1.3 1998/02/26 04:42:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,4 +18,3 @@ extern QueryTreeList *parser(char *str, Oid *typev, int nargs); #endif /* PARSER_H */ - diff --git a/src/include/port/bsd.h b/src/include/port/bsd.h index f64ea09456..03c99acd87 100644 --- a/src/include/port/bsd.h +++ b/src/include/port/bsd.h @@ -25,6 +25,6 @@ #endif #if defined(__mips__) -/* # undef HAS_TEST_AND_SET */ +/* # undef HAS_TEST_AND_SET */ #endif typedef unsigned char slock_t; diff --git a/src/include/port/linux.h b/src/include/port/linux.h index 727260a6d6..1a7f74b8b9 100644 --- a/src/include/port/linux.h +++ b/src/include/port/linux.h @@ -12,18 +12,24 @@ #if defined(PPC) typedef unsigned int slock_t; + #elif defined(__alpha__) typedef long int slock_t; + #else typedef unsigned char slock_t; + #endif #if (__GLIBC__ >= 2) -# ifdef HAVE_INT_TIMEZONE -# undef HAVE_INT_TIMEZONE -# endif - /* currently undefined as I (teunis@computersupportcentre.com) have not - checked this yet */ +#ifdef HAVE_INT_TIMEZONE +#undef HAVE_INT_TIMEZONE +#endif + + /* + * currently undefined as I (teunis@computersupportcentre.com) have not + * checked this yet + */ /* #define HAVE_SIGSETJMP 1 */ #endif diff --git a/src/include/port/univel.h b/src/include/port/univel.h index 028c8859bf..a7daf59460 100644 --- a/src/include/port/univel.h +++ b/src/include/port/univel.h @@ -7,14 +7,15 @@ #define NEED_I386_TAS_ASM /*************************************** * Define this if you are compiling with - * the native UNIXWARE C compiler. + * the native UNIXWARE C compiler. ***************************************/ -#define USE_UNIVEL_CC_ASM +#define USE_UNIVEL_CC_ASM typedef unsigned char slock_t; + /*************************************************************** - * strcasecmp() is in c89, but is not in any include file :-( + * strcasecmp() is in c89, but is not in any include file :-( ***************************************************************/ -int strcasecmp(char *, char *); +int strcasecmp(char *, char *); #ifndef BIG_ENDIAN #define BIG_ENDIAN 4321 diff --git a/src/include/postgres.h b/src/include/postgres.h index f1d4704e46..896e8239db 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.12 1998/02/24 15:27:04 scrappy Exp $ + * $Id: postgres.h,v 1.13 1998/02/26 04:39:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -219,7 +219,8 @@ typedef uint32 CommandId; * --------------- */ #ifdef CYR_RECODE -void SetCharSet(); -#endif /* CYR_RECODE */ +void SetCharSet(); + +#endif /* CYR_RECODE */ #endif /* POSTGRES_H */ diff --git a/src/include/rewrite/locks.h b/src/include/rewrite/locks.h index 6622070710..88ff592139 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.7 1998/01/24 22:49:55 momjian Exp $ + * $Id: locks.h,v 1.8 1998/02/26 04:43:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,8 @@ #include "nodes/parsenodes.h" #include "rewrite/prs2lock.h" -extern List * matchLocks(CmdType event, RuleLock *rulelocks, int varno, +extern List * +matchLocks(CmdType event, RuleLock *rulelocks, int varno, Query *parsetree); #endif /* LOCKS_H */ diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h index c564dbf1d3..9dbd73d2ef 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.6 1998/01/21 04:24:46 momjian Exp $ + * $Id: rewriteManip.h,v 1.7 1998/02/26 04:43:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,8 +19,9 @@ /* RewriteManip.c */ void OffsetVarNodes(Node *node, int offset); -void ChangeVarNodes(Node *node, int old_varno, int new_varno, - int sublevels_up); +void +ChangeVarNodes(Node *node, int old_varno, int new_varno, + int sublevels_up); void AddQual(Query *parsetree, Node *qual); void AddNotQual(Query *parsetree, Node *qual); void FixResdomTypes(List *user_tlist); diff --git a/src/include/rewrite/rewriteSupport.h b/src/include/rewrite/rewriteSupport.h index 274db5a98e..098443144d 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.7 1998/01/24 22:49:55 momjian Exp $ + * $Id: rewriteSupport.h,v 1.8 1998/02/26 04:43:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,8 @@ extern int IsDefinedRewriteRule(char *ruleName); -extern void prs2_addToRelation(Oid relid, Oid ruleId, CmdType event_type, +extern void +prs2_addToRelation(Oid relid, Oid ruleId, CmdType event_type, AttrNumber attno, bool isInstead, Node *qual, List *actions); extern void prs2_deleteFromRelation(Oid relid, Oid ruleId); diff --git a/src/include/rusagestub.h b/src/include/rusagestub.h index 0d55c1f928..794d5bed66 100644 --- a/src/include/rusagestub.h +++ b/src/include/rusagestub.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rusagestub.h,v 1.1 1998/02/20 13:10:03 scrappy Exp $ + * $Id: rusagestub.h,v 1.2 1998/02/26 04:39:50 momjian Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h index c9b7d36cef..e3ccfb9288 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.20 1998/01/24 22:50:00 momjian Exp $ + * $Id: buf_internals.h,v 1.21 1998/02/26 04:43:21 momjian Exp $ * * NOTE * If BUFFERPAGE0 is defined, then 0 will be used as a @@ -227,7 +227,8 @@ extern long *LocalRefCount; extern BufferDesc *LocalBufferDescriptors; extern int NLocBuffer; -extern BufferDesc * LocalBufferAlloc(Relation reln, BlockNumber blockNum, +extern BufferDesc * +LocalBufferAlloc(Relation reln, BlockNumber blockNum, bool *foundPtr); extern int WriteLocalBuffer(Buffer buffer, bool release); extern int FlushLocalBuffer(Buffer buffer, bool release); diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index d5f6d475ff..fdc3abcee4 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.17 1998/01/24 22:50:03 momjian Exp $ + * $Id: bufmgr.h,v 1.18 1998/02/26 04:43:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,12 +75,14 @@ extern int ShowPinTrace; /* * prototypes for functions in bufmgr.c */ -extern Buffer RelationGetBufferWithBuffer(Relation relation, +extern Buffer +RelationGetBufferWithBuffer(Relation relation, BlockNumber blockNumber, Buffer buffer); extern Buffer ReadBuffer(Relation reln, BlockNumber blockNum); extern int WriteBuffer(Buffer buffer); extern int WriteNoReleaseBuffer(Buffer buffer); -extern Buffer ReleaseAndReadBuffer(Buffer buffer, Relation relation, +extern Buffer +ReleaseAndReadBuffer(Buffer buffer, Relation relation, BlockNumber blockNum); extern void InitBufferPool(IPCKey key); diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h index 873d58caca..2be7093e4c 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.16 1998/01/24 22:50:05 momjian Exp $ + * $Id: bufpage.h,v 1.17 1998/02/26 04:43:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -198,7 +198,7 @@ typedef enum * XXX currently all page sizes are "valid" but we only actually * use BLCKSZ. * - * 01/06/98 Now does something useful. darrenk + * 01/06/98 Now does something useful. darrenk * */ #define PageSizeIsValid(pageSize) ((pageSize) == BLCKSZ) @@ -287,7 +287,8 @@ typedef enum */ extern void PageInit(Page page, Size pageSize, Size specialSize); -extern OffsetNumber PageAddItem(Page page, Item item, Size size, +extern OffsetNumber +PageAddItem(Page page, Item item, Size size, OffsetNumber offsetNumber, ItemIdFlags flags); extern Page PageGetTempPage(Page page, Size specialSize); extern void PageRestoreTempPage(Page tempPage, Page oldPage); diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h index d1023e48f8..cbd649234a 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.23 1998/01/24 22:50:08 momjian Exp $ + * $Id: ipc.h,v 1.24 1998/02/26 04:43:26 momjian Exp $ * * NOTES * This file is very architecture-specific. This stuff should actually @@ -75,7 +75,8 @@ extern void exitpg(int code); extern void quasi_exitpg(void); extern int on_exitpg(void (*function) (), caddr_t arg); -extern IpcSemaphoreId IpcSemaphoreCreate(IpcSemaphoreKey semKey, +extern IpcSemaphoreId +IpcSemaphoreCreate(IpcSemaphoreKey semKey, int semNum, int permission, int semStartValue, int removeOnExit, int *status); extern void IpcSemaphoreKill(IpcSemaphoreKey key); @@ -83,7 +84,8 @@ extern void IpcSemaphoreLock(IpcSemaphoreId semId, int sem, int lock); extern void IpcSemaphoreUnlock(IpcSemaphoreId semId, int sem, int lock); extern int IpcSemaphoreGetCount(IpcSemaphoreId semId, int sem); extern int IpcSemaphoreGetValue(IpcSemaphoreId semId, int sem); -extern IpcMemoryId IpcMemoryCreate(IpcMemoryKey memKey, uint32 size, +extern IpcMemoryId +IpcMemoryCreate(IpcMemoryKey memKey, uint32 size, int permission); extern IpcMemoryId IpcMemoryIdGet(IpcMemoryKey memKey, uint32 size); extern char *IpcMemoryAttach(IpcMemoryId memId); diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h index 1d53dd9632..8fecda3840 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.9 1998/01/24 22:50:09 momjian Exp $ + * $Id: lmgr.h,v 1.10 1998/02/26 04:43:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,17 +49,22 @@ extern void RelationSetLockForWrite(Relation relation); extern void RelationUnsetLockForWrite(Relation relation); /* used in vaccum.c */ -extern void RelationSetLockForWritePage(Relation relation, +extern void +RelationSetLockForWritePage(Relation relation, ItemPointer itemPointer); /* used in nbtpage.c, hashpage.c */ -extern void RelationSetSingleWLockPage(Relation relation, +extern void +RelationSetSingleWLockPage(Relation relation, ItemPointer itemPointer); -extern void RelationUnsetSingleWLockPage(Relation relation, +extern void +RelationUnsetSingleWLockPage(Relation relation, ItemPointer itemPointer); -extern void RelationSetSingleRLockPage(Relation relation, +extern void +RelationSetSingleRLockPage(Relation relation, ItemPointer itemPointer); -extern void RelationUnsetSingleRLockPage(Relation relation, +extern void +RelationUnsetSingleRLockPage(Relation relation, ItemPointer itemPointer); extern void RelationSetRIntentLock(Relation relation); extern void RelationUnsetRIntentLock(Relation relation); @@ -68,7 +73,8 @@ extern void RelationUnsetWIntentLock(Relation relation); /* single.c */ extern bool SingleLockReln(LockInfo linfo, LOCKT lockt, int action); -extern bool SingleLockPage(LockInfo linfo, ItemPointer tidPtr, +extern bool +SingleLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKT lockt, int action); /* proc.c */ diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 98804eb1f0..0cbca115e9 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.10 1998/01/27 03:00:43 momjian Exp $ + * $Id: lock.h,v 1.11 1998/02/26 04:43:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -204,10 +204,12 @@ 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 int LockResolveConflicts(LOCKTAB *ltable, LOCK *lock, LOCKT lockt, +extern int +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); @@ -215,6 +217,7 @@ extern bool LockReleaseAll(LockTableId tableId, SHM_QUEUE *lockQueue); extern int LockShmemSize(void); extern bool LockingDisabled(void); extern bool DeadLockCheck(SHM_QUEUE *lockQueue, LOCK *findlock, bool skip_check); + #ifdef DEADLOCK_DEBUG extern void DumpLocks(void); diff --git a/src/include/storage/multilev.h b/src/include/storage/multilev.h index 0f8218e175..92a47e479f 100644 --- a/src/include/storage/multilev.h +++ b/src/include/storage/multilev.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: multilev.h,v 1.6 1998/01/23 19:53:44 scrappy Exp $ + * $Id: multilev.h,v 1.7 1998/02/26 04:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,7 +39,7 @@ #define RELN_LEVEL 0 #define PAGE_LEVEL 1 #define TUPLE_LEVEL 2 -typedef int PG_LOCK_LEVEL; +typedef int PG_LOCK_LEVEL; /* multi.c */ diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index e1e582e47e..c41df70e89 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.10 1998/01/25 05:15:15 momjian Exp $ + * $Id: proc.h,v 1.11 1998/02/26 04:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -97,7 +97,8 @@ extern bool ProcRemove(int pid); /* make static in storage/lmgr/proc.c -- jolly */ extern void ProcQueueInit(PROC_QUEUE *queue); -extern int ProcSleep(PROC_QUEUE *queue, SPINLOCK spinlock, int token, +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); diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h index f90afed5de..f63a37193c 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.26 1998/02/13 17:11:55 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.27 1998/02/26 04:43:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,15 +49,15 @@ * NEXTSTEP (mach) * slock_t is defined as a struct mutex. */ -#define S_LOCK(lock) mutex_lock(lock) +#define S_LOCK(lock) mutex_lock(lock) -#define S_UNLOCK(lock) mutex_unlock(lock) +#define S_UNLOCK(lock) mutex_unlock(lock) -#define S_INIT_LOCK(lock) mutex_init(lock) +#define S_INIT_LOCK(lock) mutex_init(lock) /* S_LOCK_FREE should return 1 if lock is free; 0 if lock is locked */ /* For Mach, we have to delve inside the entrails of `struct mutex'. Ick! */ -#define S_LOCK_FREE(alock) ((alock)->lock == 0) +#define S_LOCK_FREE(alock) ((alock)->lock == 0) #endif /* next */ @@ -73,7 +73,7 @@ * assembly from his NECEWS SVR4 port, but we probably ought to retain this * for the R3000 chips out there. */ -#define S_LOCK(lock) do \ +#define S_LOCK(lock) do \ { \ while (!acquire_lock(lock)) \ ; \ @@ -81,11 +81,11 @@ #define S_UNLOCK(lock) release_lock(lock) -#define S_INIT_LOCK(lock) init_lock(lock) +#define S_INIT_LOCK(lock) init_lock(lock) /* S_LOCK_FREE should return 1 if lock is free; 0 if lock is locked */ -#define S_LOCK_FREE(lock) (stat_lock(lock) == UNLOCKED) +#define S_LOCK_FREE(lock) (stat_lock(lock) == UNLOCKED) #endif /* __sgi */ @@ -99,17 +99,17 @@ #if (defined(__alpha__) || defined(__alpha)) && !defined(linux) -#define S_LOCK(lock) do \ +#define S_LOCK(lock) do \ { \ while (msem_lock((lock), MSEM_IF_NOWAIT) < 0) \ ; \ } while (0) -#define S_UNLOCK(lock) msem_unlock((lock), 0) +#define S_UNLOCK(lock) msem_unlock((lock), 0) -#define S_INIT_LOCK(lock) msem_init((lock), MSEM_UNLOCKED) +#define S_INIT_LOCK(lock) msem_init((lock), MSEM_UNLOCKED) -#define S_LOCK_FREE(lock) (!(lock)->msem_state) +#define S_LOCK_FREE(lock) (!(lock)->msem_state) #endif /* alpha */ @@ -122,15 +122,15 @@ static int tas(slock_t *lock); -#define S_LOCK(lock) do \ +#define S_LOCK(lock) do \ { \ while (tas(lock)) \ ; \ } while (0) -#define S_UNLOCK(lock) (*(lock) = 0) +#define S_UNLOCK(lock) (*(lock) = 0) -#define S_INIT_LOCK(lock) S_UNLOCK(lock) +#define S_INIT_LOCK(lock) S_UNLOCK(lock) #endif /* i86pc_solaris || sparc_solaris */ @@ -143,15 +143,15 @@ static int tas(slock_t *lock); #if defined(_AIX) -#define S_LOCK(lock) do \ +#define S_LOCK(lock) do \ { \ while (cs((int *) (lock), 0, 1)) \ ; \ } while (0) -#define S_UNLOCK(lock) (*(lock) = 0) +#define S_UNLOCK(lock) (*(lock) = 0) -#define S_INIT_LOCK(lock) S_UNLOCK(lock) +#define S_INIT_LOCK(lock) S_UNLOCK(lock) #endif /* _AIX */ @@ -172,17 +172,17 @@ static slock_t clear_lock = {-1, -1, -1, -1}; static int tas(slock_t *lock); -#define S_LOCK(lock) do \ +#define S_LOCK(lock) do \ { \ while (tas(lock)) \ ; \ } while (0) -#define S_UNLOCK(lock) (*(lock) = clear_lock) /* struct assignment */ +#define S_UNLOCK(lock) (*(lock) = clear_lock) /* struct assignment */ -#define S_INIT_LOCK(lock) S_UNLOCK(lock) +#define S_INIT_LOCK(lock) S_UNLOCK(lock) -#define S_LOCK_FREE(lock) ( *(int *) (((long) (lock) + 15) & ~15) != 0) +#define S_LOCK_FREE(lock) ( *(int *) (((long) (lock) + 15) & ~15) != 0) #endif /* __hpux */ @@ -200,9 +200,9 @@ static int tas(slock_t *lock); ; \ } while (0) -#define S_UNLOCK(lock) (*(lock) = 0) +#define S_UNLOCK(lock) (*(lock) = 0) -#define S_INIT_LOCK(lock) S_UNLOCK(lock) +#define S_INIT_LOCK(lock) S_UNLOCK(lock) static int tas_dummy() @@ -272,7 +272,7 @@ tas_dummy() asm("nop"); } -#define S_LOCK(addr) do \ +#define S_LOCK(addr) do \ { \ while (tas(addr)) \ ; \ @@ -281,9 +281,9 @@ tas_dummy() /* * addr should be as in the above S_LOCK routine */ -#define S_UNLOCK(addr) (*(addr) = 0) +#define S_UNLOCK(addr) (*(addr) = 0) -#define S_INIT_LOCK(addr) (*(addr) = 0) +#define S_INIT_LOCK(addr) (*(addr) = 0) #endif /* NEED_SPARC_TAS_ASM */ @@ -306,22 +306,24 @@ tas_dummy() #if defined(NEED_I386_TAS_ASM) #if defined(USE_UNIVEL_CC_ASM) -asm void S_LOCK(char *lval) +asm void +S_LOCK(char *lval) { -% lab again; + %lab again; /* Upon entry, %eax will contain the pointer to the lock byte */ - pushl %ebx - xchgl %eax,%ebx - movb $-1,%al + pushl % ebx + xchgl % eax, %ebx + movb $ - 1, %al again: lock - xchgb %al,(%ebx) - cmpb $0,%al - jne again - popl %ebx + xchgb % al, (%ebx) + cmpb $0, %al + jne again + popl % ebx } + #else -#define S_LOCK(lock) do \ +#define S_LOCK(lock) do \ { \ slock_t _res; \ do \ @@ -331,20 +333,20 @@ again: } while (0) #endif -#define S_UNLOCK(lock) (*(lock) = 0) +#define S_UNLOCK(lock) (*(lock) = 0) -#define S_INIT_LOCK(lock) S_UNLOCK(lock) +#define S_INIT_LOCK(lock) S_UNLOCK(lock) #endif /* NEED_I386_TAS_ASM */ #if defined(__alpha__) && defined(linux) -void S_LOCK(slock_t* lock); +void S_LOCK(slock_t *lock); #define S_UNLOCK(lock) { __asm__("mb"); *(lock) = 0; } -#define S_INIT_LOCK(lock) S_UNLOCK(lock) +#define S_INIT_LOCK(lock) S_UNLOCK(lock) #endif /* defined(__alpha__) && defined(linux) */ @@ -362,9 +364,9 @@ void S_LOCK(slock_t* lock); } while (_res != 0); \ } while (0) -#define S_UNLOCK(lock) (*(lock) = 0) +#define S_UNLOCK(lock) (*(lock) = 0) -#define S_INIT_LOCK(lock) S_UNLOCK(lock) +#define S_INIT_LOCK(lock) S_UNLOCK(lock) #endif /* defined(linux) && defined(sparc) */ @@ -389,22 +391,23 @@ success: \n\ "); } -#define S_LOCK(lock) do \ +#define S_LOCK(lock) do \ { \ while (tas(lock)) \ ; \ } while (0) -#define S_UNLOCK(lock) (*(lock) = 0) +#define S_UNLOCK(lock) (*(lock) = 0) -#define S_INIT_LOCK(lock) S_UNLOCK(lock) +#define S_INIT_LOCK(lock) S_UNLOCK(lock) #endif /* defined(linux) && defined(PPC) */ -#ifndef S_LOCK_FREE /* for those who have not already defined it */ +#ifndef S_LOCK_FREE /* for those who have not already defined + * it */ #define S_LOCK_FREE(lock) ((*lock) == 0) #endif #endif /* HAS_TEST_AND_SET */ -#endif /* S_LOCK_H */ +#endif /* S_LOCK_H */ diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h index e895e75522..af72b7c098 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.10 1998/01/24 22:50:13 momjian Exp $ + * $Id: shmem.h,v 1.11 1998/02/26 04:43:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,11 +64,13 @@ extern void ShmemCreate(unsigned int key, unsigned int size); extern int InitShmem(unsigned int key, unsigned int size); extern long *ShmemAlloc(unsigned long size); extern int ShmemIsValid(unsigned long addr); -extern HTAB * ShmemInitHash(char *name, long init_size, long max_size, +extern HTAB * +ShmemInitHash(char *name, long init_size, long max_size, HASHCTL *infoP, int hash_flags); extern bool ShmemPIDLookup(int pid, SHMEM_OFFSET *locationPtr); extern SHMEM_OFFSET ShmemPIDDestroy(int pid); -extern long * ShmemInitStruct(char *name, unsigned long size, +extern long * +ShmemInitStruct(char *name, unsigned long size, bool *foundPtr); extern bool TransactionIdIsInProgress(TransactionId xid); @@ -98,7 +100,8 @@ extern void SHMQueueInit(SHM_QUEUE *queue); extern void SHMQueueElemInit(SHM_QUEUE *queue); extern void SHMQueueDelete(SHM_QUEUE *queue); extern void SHMQueueInsertTL(SHM_QUEUE *queue, SHM_QUEUE *elem); -extern void SHMQueueFirst(SHM_QUEUE *queue, Pointer *nextPtrPtr, +extern void +SHMQueueFirst(SHM_QUEUE *queue, Pointer *nextPtrPtr, SHM_QUEUE *nextQueue); extern bool SHMQueueEmpty(SHM_QUEUE *queue); diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h index 2548d5c929..2b9939516f 100644 --- a/src/include/storage/sinval.h +++ b/src/include/storage/sinval.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: sinval.h,v 1.7 1998/01/24 22:50:15 momjian Exp $ + * $Id: sinval.h,v 1.8 1998/02/26 04:43:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,8 @@ extern SPINLOCK SInvalLock; extern void CreateSharedInvalidationState(IPCKey key); extern void AttachSharedInvalidationState(IPCKey key); extern void InitSharedInvalidationState(void); -extern void RegisterSharedInvalid(int cacheId, Index hashIndex, +extern void +RegisterSharedInvalid(int cacheId, Index hashIndex, ItemPointer pointer); extern void InvalidateSharedInvalid(void (*invalFunction) (), void (*resetFunction) ()); diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index e1d5dd8ed2..de24ce9e25 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.7 1998/01/24 22:50:17 momjian Exp $ + * $Id: sinvaladt.h,v 1.8 1998/02/26 04:43:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -125,7 +125,8 @@ extern int SISegmentInit(bool killExistingSegment, IPCKey key); extern bool SISetDataEntry(SISeg *segP, SharedInvalidData *data); extern void SISetProcStateInvalid(SISeg *segP); extern bool SIDelDataEntry(SISeg *segP); -extern void SIReadEntryData(SISeg *segP, int backendId, +extern void +SIReadEntryData(SISeg *segP, int backendId, void (*invalFunction) (), void (*resetFunction) ()); extern void SIDelExpiredDataEntries(SISeg *segP); diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h index cf785c0aec..0f7087d646 100644 --- a/src/include/storage/smgr.h +++ b/src/include/storage/smgr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: smgr.h,v 1.10 1998/01/24 22:50:18 momjian Exp $ + * $Id: smgr.h,v 1.11 1998/02/26 04:43:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,13 +28,17 @@ extern int smgrunlink(int16 which, Relation reln); extern int smgrextend(int16 which, Relation reln, char *buffer); extern int smgropen(int16 which, Relation reln); extern int smgrclose(int16 which, Relation reln); -extern int smgrread(int16 which, Relation reln, BlockNumber blocknum, +extern int +smgrread(int16 which, Relation reln, BlockNumber blocknum, char *buffer); -extern int smgrwrite(int16 which, Relation reln, BlockNumber blocknum, +extern int +smgrwrite(int16 which, Relation reln, BlockNumber blocknum, char *buffer); -extern int smgrflush(int16 which, Relation reln, BlockNumber blocknum, +extern int +smgrflush(int16 which, Relation reln, BlockNumber blocknum, char *buffer); -extern int smgrblindwrt(int16 which, char *dbname, char *relname, Oid dbid, +extern int +smgrblindwrt(int16 which, char *dbname, char *relname, Oid dbid, Oid relid, BlockNumber blkno, char *buffer); extern int smgrnblocks(int16 which, Relation reln); extern int smgrtruncate(int16 which, Relation reln, int nblocks); @@ -55,7 +59,8 @@ extern int mdclose(Relation reln); extern int mdread(Relation reln, BlockNumber blocknum, char *buffer); extern int mdwrite(Relation reln, BlockNumber blocknum, char *buffer); extern int mdflush(Relation reln, BlockNumber blocknum, char *buffer); -extern int mdblindwrt(char *dbstr, char *relstr, Oid dbid, Oid relid, +extern int +mdblindwrt(char *dbstr, char *relstr, Oid dbid, Oid relid, BlockNumber blkno, char *buffer); extern int mdnblocks(Relation reln); extern int mdtruncate(Relation reln, int nblocks); @@ -75,7 +80,8 @@ extern int mmclose(Relation reln); extern int mmread(Relation reln, BlockNumber blocknum, char *buffer); extern int mmwrite(Relation reln, BlockNumber blocknum, char *buffer); extern int mmflush(Relation reln, BlockNumber blocknum, char *buffer); -extern int mmblindwrt(char *dbstr, char *relstr, Oid dbid, Oid relid, +extern int +mmblindwrt(char *dbstr, char *relstr, Oid dbid, Oid relid, BlockNumber blkno, char *buffer); extern int mmnblocks(Relation reln); extern int mmcommit(void); diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h index 0209370d8f..3f3dd71b12 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.12 1998/01/24 22:50:22 momjian Exp $ + * $Id: dest.h,v 1.13 1998/02/26 04:43:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -70,7 +70,8 @@ extern void EndCommand(char *commandTag, CommandDest dest); extern void SendCopyBegin(void); extern void ReceiveCopyBegin(void); extern void NullCommand(CommandDest dest); -extern void BeginCommand(char *pname, int operation, TupleDesc attinfo, +extern void +BeginCommand(char *pname, int operation, TupleDesc attinfo, bool isIntoRel, bool isIntoPortal, char *tag, CommandDest dest); extern void UpdateCommandInfo(int operation, Oid lastoid, uint32 tuples); diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h index 359d673ac4..10935ae63e 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.8 1998/01/24 22:50:24 momjian Exp $ + * $Id: pquery.h,v 1.9 1998/02/26 04:43:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,11 +23,13 @@ extern QueryDesc *CreateQueryDesc(Query *parsetree, Plan *plantree, extern EState *CreateExecutorState(void); -extern void ProcessPortal(char *portalName, Query *parseTree, +extern void +ProcessPortal(char *portalName, Query *parseTree, Plan *plan, EState *state, TupleDesc attinfo, CommandDest dest); -extern void ProcessQuery(Query *parsetree, Plan *plan, char *argv[], +extern void +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 93604b4e80..0e2706f05d 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.10 1998/01/24 22:50:26 momjian Exp $ + * $Id: tcopprot.h,v 1.11 1998/02/26 04:43:41 momjian Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -22,11 +22,13 @@ #include <parser/parse_node.h> #ifndef BOOTSTRAP_INCLUDE -extern List * pg_parse_and_plan(char *query_string, Oid *typev, int nargs, - QueryTreeList **queryListP, CommandDest dest); +extern List * +pg_parse_and_plan(char *query_string, Oid *typev, int nargs, + QueryTreeList **queryListP, CommandDest dest); extern void pg_exec_query(char *query_string, char **argv, Oid *typev, int nargs); -extern void pg_exec_query_dest(char *query_string, char **argv, Oid *typev, - int nargs, CommandDest dest); +extern void +pg_exec_query_dest(char *query_string, char **argv, Oid *typev, + int nargs, CommandDest dest); #endif /* BOOTSTRAP_HEADER */ diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index d4dd628613..6ebd5baf71 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.16 1998/02/25 13:09:49 scrappy Exp $ + * $Id: acl.h,v 1.17 1998/02/26 04:43:43 momjian Exp $ * * NOTES * For backward-compatability purposes we have to allow there @@ -141,7 +141,8 @@ extern Acl *aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg); extern char *aclmakepriv(char *old_privlist, char new_priv); extern char *aclmakeuser(char *user_type, char *user); -extern ChangeACLStmt * makeAclStmt(char *privs, List *rel_list, char *grantee, +extern ChangeACLStmt * +makeAclStmt(char *privs, List *rel_list, char *grantee, char grant_or_revoke); /* @@ -163,9 +164,11 @@ extern char *get_groname(AclId grosysid); extern int32 pg_aclcheck(char *relname, char *usename, AclMode mode); extern int32 pg_ownercheck(char *usename, char *value, int cacheid); -extern int32 pg_func_ownercheck(char *usename, char *funcname, +extern int32 +pg_func_ownercheck(char *usename, char *funcname, int nargs, Oid *arglist); -extern int32 pg_aggr_ownercheck(char *usename, char *aggname, +extern int32 +pg_aggr_ownercheck(char *usename, char *aggname, Oid basetypeID); #endif /* ACL_H */ diff --git a/src/include/utils/array.h b/src/include/utils/array.h index d5c1b8e515..86603cd453 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.10 1998/02/13 19:46:22 momjian Exp $ + * $Id: array.h,v 1.11 1998/02/26 04:43:45 momjian Exp $ * * NOTES * XXX the data array should be LONGALIGN'd -- notice that the array @@ -117,17 +117,22 @@ typedef struct extern char *array_in(char *string, Oid element_type, int16 typmod); extern char *array_out(ArrayType *v, Oid element_type); extern char *array_dims(ArrayType *v, bool *isNull); -extern Datum array_ref(ArrayType *array, int n, int indx[], int reftype, +extern Datum +array_ref(ArrayType *array, int n, int indx[], int reftype, int elmlen, int arraylen, bool *isNull); -extern Datum array_clip(ArrayType *array, int n, int upperIndx[], +extern Datum +array_clip(ArrayType *array, int n, int upperIndx[], int lowerIndx[], int reftype, int len, bool *isNull); -extern char * array_set(ArrayType *array, int n, int indx[], char *dataPtr, +extern char * +array_set(ArrayType *array, int n, int indx[], char *dataPtr, int reftype, int elmlen, int arraylen, bool *isNull); -extern char * array_assgn(ArrayType *array, int n, int upperIndx[], +extern char * +array_assgn(ArrayType *array, int n, int upperIndx[], int lowerIndx[], ArrayType *newArr, int reftype, int len, bool *isNull); extern int array_eq(ArrayType *array1, ArrayType *array2); -extern int _LOtransfer(char **destfd, int size, int nitems, char **srcfd, +extern int +_LOtransfer(char **destfd, int size, int nitems, char **srcfd, int isSrcLO, int isDestLO); extern char *_array_newLO(int *fd, int flag); @@ -151,11 +156,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, +extern char * +_ChunkArray(int fd, FILE *afd, int ndim, int dim[], int baseSize, int *nbytes, char *chunkfile); -extern int _ReadChunkArray(int st[], int endp[], int bsize, int fp, +extern int +_ReadChunkArray(int st[], int endp[], int bsize, int fp, char *destfp, ArrayType *array, int isDestLO, bool *isNull); -extern struct varlena * _ReadChunkArray1El(int st[], int bsize, int fp, +extern struct varlena * +_ReadChunkArray1El(int st[], int bsize, int fp, ArrayType *array, bool *isNull); diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 7ff819940b..e7541d49e8 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.36 1998/02/10 16:04:36 momjian Exp $ + * $Id: builtins.h,v 1.37 1998/02/26 04:43:48 momjian Exp $ * * NOTES * This should normally only be included by fmgr.h. @@ -371,7 +371,7 @@ extern bool oid8eq(Oid arg1[], Oid arg2[]); extern bool oideqint4(Oid arg1, int32 arg2); extern bool int4eqoid(int32 arg1, Oid arg2); extern text *oid_text(Oid arg1); -extern Oid text_oid(text *arg1); +extern Oid text_oid(text *arg1); /* regexp.c */ extern bool char2regexeq(uint16 arg1, struct varlena * p); @@ -484,7 +484,7 @@ extern int32 textpos(text *arg1, text *arg2); extern text *text_substr(text *string, int32 m, int32 n); extern struct varlena *byteain(char *inputText); -extern char *byteaout(struct varlena *vlena); +extern char *byteaout(struct varlena * vlena); extern int32 byteaGetSize(struct varlena * v); extern int32 byteaGetByte(struct varlena * v, int32 n); extern int32 byteaGetBit(struct varlena * v, int32 n); diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index e32035b749..c759416ab0 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.10 1998/02/23 17:44:22 scrappy Exp $ + * $Id: catcache.h,v 1.11 1998/02/26 04:43:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,15 +63,19 @@ typedef struct catcache extern struct catcache *Caches; extern GlobalMemory CacheCxt; -extern void CatalogCacheIdInvalidate(int cacheId, Index hashIndex, +extern void +CatalogCacheIdInvalidate(int cacheId, Index hashIndex, ItemPointer pointer); extern void ResetSystemCache(void); extern void SystemCacheRelationFlushed(Oid relId); -extern CatCache * InitSysCache(char *relname, char *indname, int id, int nkeys, +extern CatCache * +InitSysCache(char *relname, char *indname, int id, int nkeys, int key[], HeapTuple (*iScanfuncP) ()); -extern HeapTuple SearchSysCache(struct catcache * cache, Datum v1, Datum v2, +extern HeapTuple +SearchSysCache(struct catcache * cache, Datum v1, Datum v2, Datum v3, Datum v4); -extern void RelationInvalidateCatalogCacheTuple(Relation relation, +extern void +RelationInvalidateCatalogCacheTuple(Relation relation, HeapTuple tuple, void (*function) ()); #endif /* CATCACHE_H */ diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h index 04a48099ec..ab394e7fcd 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.6 1998/01/24 22:50:36 momjian Exp $ + * $Id: datum.h,v 1.7 1998/02/26 04:43:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,7 +57,8 @@ extern void datumFree(Datum value, Oid type, bool byVal, Size len); * return true if thwo datums are equal, false otherwise. * XXX : See comments in the code for restrictions! */ -extern bool datumIsEqual(Datum value1, Datum value2, Oid type, +extern bool +datumIsEqual(Datum value1, Datum value2, Oid type, bool byVal, Size len); #endif /* DATUM_H */ diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h index fe583b8641..c027e7e424 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.27 1998/02/13 17:12:07 scrappy Exp $ + * $Id: dt.h,v 1.28 1998/02/26 04:43:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -128,7 +128,7 @@ typedef struct * so actually restrict them to within [0,31] for now. * - thomas 97/06/19 * Not all of these fields are used for masks in DecodeDateDelta - * so allow some larger than 31. - thomas 1997-11-17 + * so allow some larger than 31. - thomas 1997-11-17 */ #define DTK_NUMBER 0 @@ -271,7 +271,7 @@ 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 int datetime_cmp(DateTime *dt1, DateTime *dt2); extern DateTime *datetime_smaller(DateTime *dt1, DateTime *dt2); extern DateTime *datetime_larger(DateTime *dt1, DateTime *dt2); @@ -284,7 +284,7 @@ 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 bool timespan_finite(TimeSpan *span); -extern int timespan_cmp(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); @@ -310,30 +310,34 @@ 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 datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn); -extern int timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec); -extern int tm2timespan(struct tm * tm, double fsec, TimeSpan *span); +extern int tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *dt); +extern int datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn); +extern int timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec); +extern int tm2timespan(struct tm * tm, double fsec, TimeSpan *span); extern void j2date(int jd, int *year, int *month, int *day); -extern int date2j(int year, int month, int day); +extern int date2j(int year, int month, int day); extern double time2t(const int hour, const int min, const double sec); -extern int ParseDateTime(char *timestr, char *lowstr, +extern int +ParseDateTime(char *timestr, char *lowstr, char *field[], int ftype[], int maxfields, int *numfields); -extern int DecodeDateTime(char *field[], int ftype[], +extern int +DecodeDateTime(char *field[], int ftype[], int nf, int *dtype, struct tm * tm, double *fsec, int *tzp); -extern int DecodeTimeOnly(char *field[], int ftype[], int nf, +extern int +DecodeTimeOnly(char *field[], int ftype[], int nf, int *dtype, struct tm * tm, double *fsec); -extern int DecodeDateDelta(char *field[], int ftype[], +extern int +DecodeDateDelta(char *field[], int ftype[], int nf, int *dtype, struct tm * tm, double *fsec); -extern int EncodeDateOnly(struct tm * tm, int style, char *str); -extern int EncodeTimeOnly(struct tm * tm, double fsec, int style, char *str); -extern int EncodeDateTime(struct tm * tm, double fsec, int *tzp, char **tzn, int style, char *str); -extern int EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str); +extern int EncodeDateOnly(struct tm * tm, int style, char *str); +extern int EncodeTimeOnly(struct tm * tm, double fsec, int style, char *str); +extern int EncodeDateTime(struct tm * tm, double fsec, int *tzp, char **tzn, int style, char *str); +extern int EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str); -#endif /* DT_H */ +#endif /* DT_H */ diff --git a/src/include/utils/exc.h b/src/include/utils/exc.h index dd53d9f911..7400f9ce03 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.11 1998/01/24 22:50:41 momjian Exp $ + * $Id: exc.h,v 1.12 1998/02/26 04:43:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -78,7 +78,8 @@ typedef void ExcProc (Exception *, ExcDetail, ExcData, ExcMessage); * prototypes for functions in exc.c */ extern void EnableExceptionHandling(bool on); -extern void ExcRaise(Exception *excP, +extern void +ExcRaise(Exception *excP, ExcDetail detail, ExcData data, ExcMessage message); @@ -87,7 +88,8 @@ extern void ExcRaise(Exception *excP, /* * prototypes for functions in excabort.c */ -extern void ExcAbort(const Exception *excP, ExcDetail detail, ExcData data, +extern void +ExcAbort(const Exception *excP, ExcDetail detail, ExcData data, ExcMessage message); #endif /* EXC_H */ diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h index 14163f1217..18529c06cb 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.18 1998/02/03 16:01:06 thomas Exp $ + * $Id: geo_decls.h,v 1.19 1998/02/26 04:44:00 momjian Exp $ * * NOTE * These routines do *not* use the float types from adt/. @@ -348,9 +348,11 @@ extern double *circle_area(CIRCLE *circle); extern double circle_dt(CIRCLE *circle1, CIRCLE *circle2); /* geo_selfuncs.c */ -extern float64 areasel(Oid opid, Oid relid, AttrNumber attno, +extern float64 +areasel(Oid opid, Oid relid, AttrNumber attno, char *value, int32 flag); -extern float64 areajoinsel(Oid opid, Oid relid, AttrNumber attno, +extern float64 +areajoinsel(Oid opid, Oid relid, AttrNumber attno, char *value, int32 flag); #endif /* GEO_DECLS_H */ diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h index bf9ca2128c..977a843a13 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.7 1998/01/24 22:50:45 momjian Exp $ + * $Id: hsearch.h,v 1.8 1998/02/26 04:44:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -133,7 +133,8 @@ typedef enum extern HTAB *hash_create(int nelem, HASHCTL *info, int flags); extern void hash_destroy(HTAB *hashp); extern void hash_stats(char *where, HTAB *hashp); -extern long * hash_search(HTAB *hashp, char *keyPtr, HASHACTION action, +extern long * +hash_search(HTAB *hashp, char *keyPtr, HASHACTION action, bool *foundPtr); extern long *hash_seq(HTAB *hashp); diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h index 35d8483d5b..40e8d2ba51 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.9 1998/01/24 22:50:46 momjian Exp $ + * $Id: lselect.h,v 1.10 1998/02/26 04:44:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,11 +39,14 @@ typedef struct } LeftistContextData; typedef LeftistContextData *LeftistContext; -extern struct leftist * lmerge(struct leftist * pt, struct leftist * qt, +extern struct leftist * +lmerge(struct leftist * pt, struct leftist * qt, LeftistContext context); -extern HeapTuple gettuple(struct leftist ** treep, short *devnum, +extern HeapTuple +gettuple(struct leftist ** treep, short *devnum, LeftistContext context); -extern void puttuple(struct leftist ** treep, HeapTuple newtuple, short devnum, +extern void +puttuple(struct leftist ** treep, HeapTuple newtuple, short devnum, LeftistContext context); extern int tuplecmp(HeapTuple ltup, HeapTuple rtup, LeftistContext context); diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index b1b402d897..6bc94a874c 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.9 1998/02/10 16:04:38 momjian Exp $ + * $Id: lsyscache.h,v 1.10 1998/02/26 04:44:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,8 @@ extern bool get_attisset(Oid relid, char *attname); extern int16 get_atttypmod(Oid relid, AttrNumber attnum); extern RegProcedure get_opcode(Oid opid); extern char *get_opname(Oid opid); -extern bool op_mergesortable(Oid opid, Oid ltype, Oid rtype, +extern bool +op_mergesortable(Oid opid, Oid ltype, Oid rtype, Oid *leftOp, Oid *rightOp); extern Oid op_hashjoinable(Oid opid, Oid ltype, Oid rtype); extern Oid get_commutator(Oid opid); diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h index 092501a193..44427d65b6 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.9 1998/01/24 22:50:50 momjian Exp $ + * $Id: mcxt.h,v 1.10 1998/02/26 04:44:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,7 +39,8 @@ extern MemoryContext TopMemoryContext; */ extern void EnableMemoryContext(bool on); extern Pointer MemoryContextAlloc(MemoryContext context, Size size); -extern Pointer MemoryContextRealloc(MemoryContext context, +extern Pointer +MemoryContextRealloc(MemoryContext context, Pointer pointer, Size size); extern void MemoryContextFree(MemoryContext context, Pointer pointer); diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index 2afcfdebe2..fdfde10ffe 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -15,7 +15,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: memutils.h,v 1.13 1998/01/24 22:50:51 momjian Exp $ + * $Id: memutils.h,v 1.14 1998/02/26 04:44:08 momjian Exp $ * * NOTES * some of the information in this file will be moved to @@ -90,7 +90,7 @@ s...) (((long)(LEN) + (sizeof (double) - 1)) & ~(sizeof (double) -1)) #else #define DOUBLEALIGN(LEN) INTALIGN(LEN) -#define MAXALIGN(LEN) INTALIGN(LEN) +#define MAXALIGN(LEN) INTALIGN(LEN) #endif /***************************************************************************** @@ -233,7 +233,8 @@ extern void AllocSetReset(AllocSet set); extern bool AllocSetContains(AllocSet set, AllocPointer pointer); extern AllocPointer AllocSetAlloc(AllocSet set, Size size); extern void AllocSetFree(AllocSet set, AllocPointer pointer); -extern AllocPointer AllocSetRealloc(AllocSet set, AllocPointer pointer, +extern AllocPointer +AllocSetRealloc(AllocSet set, AllocPointer pointer, Size size); extern void AllocSetDump(AllocSet set); diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index cedc3cfe31..2a99e2381d 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.8 1998/01/24 22:50:52 momjian Exp $ + * $Id: portal.h,v 1.9 1998/02/26 04:44:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,7 +68,8 @@ extern void AtEOXact_portals(void); extern void EnablePortalManager(bool on); extern Portal GetPortalByName(char *name); extern Portal BlankPortalAssignName(char *name); -extern void PortalSetQuery(Portal portal, QueryDesc *queryDesc, +extern void +PortalSetQuery(Portal portal, QueryDesc *queryDesc, TupleDesc attinfo, EState *state, void (*cleanup) (Portal portal)); extern QueryDesc *PortalGetQueryDesc(Portal portal); diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index fd846cc73d..8b1d45edb1 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.16 1998/01/24 22:50:54 momjian Exp $ + * $Id: rel.h,v 1.17 1998/02/26 04:44:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -186,7 +186,8 @@ typedef Relation *RelationPtr; extern IndexStrategy RelationGetIndexStrategy(Relation relation); -extern void RelationSetIndexSupport(Relation relation, IndexStrategy strategy, +extern void +RelationSetIndexSupport(Relation relation, IndexStrategy strategy, RegProcedure *support); #endif /* REL_H */ diff --git a/src/include/utils/rel2.h b/src/include/utils/rel2.h index afe8246a04..4440e508e4 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.5 1998/01/24 22:50:55 momjian Exp $ + * $Id: rel2.h,v 1.6 1998/02/26 04:44:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,8 @@ extern IndexStrategy RelationGetIndexStrategy(Relation relation); -extern void RelationSetIndexSupport(Relation relation, IndexStrategy strategy, +extern void +RelationSetIndexSupport(Relation relation, IndexStrategy strategy, RegProcedure *support); #endif /* TMP_REL2_H */ diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h index f363d66e1d..712345614b 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.9 1998/01/24 22:50:57 momjian Exp $ + * $Id: syscache.h,v 1.10 1998/02/26 04:44:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,11 +79,14 @@ struct cachedesc extern void zerocaches(void); extern void InitCatalogCache(void); -extern HeapTuple SearchSysCacheTuple(int cacheId, Datum key1, Datum key2, +extern HeapTuple +SearchSysCacheTuple(int cacheId, Datum key1, Datum key2, Datum key3, Datum key4); -extern int32 SearchSysCacheStruct(int cacheId, char *returnStruct, +extern int32 +SearchSysCacheStruct(int cacheId, char *returnStruct, Datum key1, Datum key2, Datum key3, Datum key4); -extern void * SearchSysCacheGetAttribute(int cacheId, +extern void * +SearchSysCacheGetAttribute(int cacheId, AttrNumber attributeNumber, Datum key1, Datum key2, |