diff options
Diffstat (limited to 'src/include')
116 files changed, 1269 insertions, 1172 deletions
diff --git a/src/include/access/gist.h b/src/include/access/gist.h index dd0aa92e40d..8c3c7a75fd4 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -152,7 +152,7 @@ typedef struct GISTENTRY ** macro to initialize a GISTENTRY */ #define gistentryinit(e, pr, r, pg, o, b, l)\ - {(e).pred = pr; (e).rel = r; (e).page = pg; (e).offset = o; (e).bytes = b; (e).leafkey = l;} + do {(e).pred = pr; (e).rel = r; (e).page = pg; (e).offset = o; (e).bytes = b; (e).leafkey = l;} while (0) /* defined in gist.c */ #define TRLOWER(tr) (((tr)->bytes)) diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index d5d7a3c5ace..dae57528c71 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.51 2000/01/26 05:57:50 momjian Exp $ + * $Id: heapam.h,v 1.52 2000/04/12 17:16:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -261,7 +261,7 @@ extern ItemPointer heap_get_latest_tid(Relation relation, Snapshot snapshot, Ite extern Oid heap_insert(Relation relation, HeapTuple tup); extern int heap_delete(Relation relation, ItemPointer tid, ItemPointer ctid); extern int heap_update(Relation relation, ItemPointer otid, HeapTuple tup, - ItemPointer ctid); + ItemPointer ctid); extern int heap_mark4update(Relation relation, HeapTuple tup, Buffer *userbuf); extern void heap_markpos(HeapScanDesc scan); extern void heap_restrpos(HeapScanDesc scan); diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 4337d541f14..784c5051a93 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: htup.h,v 1.28 2000/01/26 05:57:50 momjian Exp $ + * $Id: htup.h,v 1.29 2000/04/12 17:16:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -81,15 +81,15 @@ extern long heap_sysoffset[]; * he have to add something below... * * Change for 7.0: - * Up to now t_data could be NULL, the memory location directly following - * HeapTupleData or pointing into a buffer. Now, it could also point to - * a separate allocation that was done in the t_datamcxt memory context. + * Up to now t_data could be NULL, the memory location directly following + * HeapTupleData or pointing into a buffer. Now, it could also point to + * a separate allocation that was done in the t_datamcxt memory context. */ typedef struct HeapTupleData { uint32 t_len; /* length of *t_data */ ItemPointerData t_self; /* SelfItemPointer */ - MemoryContext t_datamcxt; /* */ + MemoryContext t_datamcxt; /* */ HeapTupleHeader t_data; /* */ } HeapTupleData; @@ -127,9 +127,9 @@ typedef HeapTupleData *HeapTuple; #define HEAP_HASVARLENA 0x0002 /* has variable length * attribute(s) */ #define HEAP_HASEXTERNAL 0x0004 /* has external stored */ - /* attribute(s) */ + /* attribute(s) */ #define HEAP_HASCOMPRESSED 0x0008 /* has compressed stored */ - /* attribute(s) */ + /* attribute(s) */ #define HEAP_HASEXTENDED 0x000C /* the two above combined */ #define HEAP_XMIN_COMMITTED 0x0100 /* t_xmin committed */ #define HEAP_XMIN_INVALID 0x0200 /* t_xmin invalid/aborted */ diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h index 808a98c8638..50d688d5124 100644 --- a/src/include/access/ibit.h +++ b/src/include/access/ibit.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: ibit.h,v 1.12 2000/01/26 05:57:50 momjian Exp $ + * $Id: ibit.h,v 1.13 2000/04/12 17:16:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ typedef struct IndexAttributeBitMapData { - bits8 bits[(INDEX_MAX_KEYS + 8 - 1)/8]; + bits8 bits[(INDEX_MAX_KEYS + 8 - 1) / 8]; } IndexAttributeBitMapData; typedef IndexAttributeBitMapData *IndexAttributeBitMap; diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index 7262402dcb9..94d27b1a230 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nbtree.h,v 1.34 2000/02/18 06:32:28 tgl Exp $ + * $Id: nbtree.h,v 1.35 2000/04/12 17:16:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -204,11 +204,11 @@ typedef struct BTPageState * prototypes for functions in nbtinsert.c */ extern InsertIndexResult _bt_doinsert(Relation rel, BTItem btitem, - bool index_is_unique, Relation heapRel); + bool index_is_unique, Relation heapRel); extern int32 _bt_tuplecompare(Relation rel, Size keysz, ScanKey scankey, - IndexTuple tuple1, IndexTuple tuple2); + IndexTuple tuple1, IndexTuple tuple2); extern bool _bt_itemcmp(Relation rel, Size keysz, ScanKey scankey, - BTItem item1, BTItem item2, StrategyNumber strat); + BTItem item1, BTItem item2, StrategyNumber strat); /* * prototypes for functions in nbtpage.c @@ -272,7 +272,7 @@ extern bool _bt_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir); * prototypes for functions in nbtstrat.c */ extern StrategyNumber _bt_getstrat(Relation rel, AttrNumber attno, - RegProcedure proc); + RegProcedure proc); /* * prototypes for functions in nbtutils.c @@ -289,7 +289,7 @@ extern BTItem _bt_formitem(IndexTuple itup); * prototypes for functions in nbtsort.c */ -typedef struct BTSpool BTSpool; /* opaque type known only within nbtsort.c */ +typedef struct BTSpool BTSpool; /* opaque type known only within nbtsort.c */ extern BTSpool *_bt_spoolinit(Relation index, bool isunique); extern void _bt_spooldestroy(BTSpool *btspool); diff --git a/src/include/access/rmgr.h b/src/include/access/rmgr.h index d8bde166c2c..b2796985948 100644 --- a/src/include/access/rmgr.h +++ b/src/include/access/rmgr.h @@ -8,7 +8,7 @@ #ifndef RMGR_H #define RMGR_H -typedef uint8 RmgrId; +typedef uint8 RmgrId; typedef struct RmgrData { @@ -17,18 +17,18 @@ typedef struct RmgrData char *(*rm_undo) (); /* UNDO(XLogRecPtr rptr) */ } RmgrData; -extern RmgrData *RmgrTable; +extern RmgrData *RmgrTable; /* * Built-in resource managers */ -#define RM_XLOG_ID 0 -#define RM_XACT_ID 1 -#define RM_HEAP_ID 2 -#define RM_BTREE_ID 3 -#define RM_HASH_ID 4 -#define RM_RTREE_ID 5 -#define RM_GIST_ID 6 -#define RM_MAX_ID RM_GIST_ID +#define RM_XLOG_ID 0 +#define RM_XACT_ID 1 +#define RM_HEAP_ID 2 +#define RM_BTREE_ID 3 +#define RM_HASH_ID 4 +#define RM_RTREE_ID 5 +#define RM_GIST_ID 6 +#define RM_MAX_ID RM_GIST_ID #endif /* RMGR_H */ diff --git a/src/include/access/strat.h b/src/include/access/strat.h index 26a59180cc2..9406b88ac3d 100644 --- a/src/include/access/strat.h +++ b/src/include/access/strat.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: strat.h,v 1.17 2000/01/26 05:57:51 momjian Exp $ + * $Id: strat.h,v 1.18 2000/04/12 17:16:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,6 +35,8 @@ typedef struct StrategyTransformMapData * * * + * + * * STRUCTURE */ typedef StrategyTransformMapData *StrategyTransformMap; diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index 525cd6267e1..dbdc27931a5 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tupdesc.h,v 1.27 2000/01/31 04:35:54 tgl Exp $ + * $Id: tupdesc.h,v 1.28 2000/04/12 17:16:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,7 +51,7 @@ typedef struct tupleDesc Form_pg_attribute *attrs; /* attrs[N] is a pointer to the description of Attribute Number N+1. */ TupleConstr *constr; -} *TupleDesc; +} *TupleDesc; extern TupleDesc CreateTemplateTupleDesc(int natts); diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h index dedc770db22..9c4f1a50578 100644 --- a/src/include/access/tuptoaster.h +++ b/src/include/access/tuptoaster.h @@ -2,11 +2,11 @@ * * tuptoaster.h * POSTGRES definitions for external and compressed storage - * of variable size attributes. + * of variable size attributes. * * Copyright (c) 2000, PostgreSQL Development Team * - * $Id: tuptoaster.h,v 1.1 1999/12/21 00:06:42 wieck Exp $ + * $Id: tuptoaster.h,v 1.2 2000/04/12 17:16:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,12 +22,12 @@ #include "utils/rel.h" -extern void heap_tuple_toast_attrs(Relation rel, - HeapTuple newtup, HeapTuple oldtup); +extern void heap_tuple_toast_attrs(Relation rel, + HeapTuple newtup, HeapTuple oldtup); -extern varattrib *heap_tuple_untoast_attr(varattrib *attr); +extern varattrib *heap_tuple_untoast_attr(varattrib * attr); -#endif /* TUPLE_TOASTER_ACTIVE */ +#endif /* TUPLE_TOASTER_ACTIVE */ #endif /* TUPTOASTER_H */ diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index 5c8c0754246..e2ab6e4f417 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -13,43 +13,43 @@ typedef struct XLogRecPtr { - uint32 xlogid; /* log file #, 0 based */ - uint32 xrecoff; /* offset of record in log file */ + uint32 xlogid; /* log file #, 0 based */ + uint32 xrecoff; /* offset of record in log file */ } XLogRecPtr; typedef struct XLogRecord { - XLogRecPtr xl_prev; /* ptr to previous record in log */ - XLogRecPtr xl_xact_prev; /* ptr to previous record of this xact */ - TransactionId xl_xid; /* xact id */ - uint16 xl_len; /* len of record on this page */ - uint8 xl_info; - RmgrId xl_rmid; /* resource manager inserted this record */ + XLogRecPtr xl_prev; /* ptr to previous record in log */ + XLogRecPtr xl_xact_prev; /* ptr to previous record of this xact */ + TransactionId xl_xid; /* xact id */ + uint16 xl_len; /* len of record on this page */ + uint8 xl_info; + RmgrId xl_rmid; /* resource manager inserted this record */ /* ACTUAL LOG DATA FOLLOWS AT END OF STRUCT */ } XLogRecord; -#define SizeOfXLogRecord DOUBLEALIGN(sizeof(XLogRecord)) -#define MAXLOGRECSZ (2 * BLCKSZ) +#define SizeOfXLogRecord DOUBLEALIGN(sizeof(XLogRecord)) +#define MAXLOGRECSZ (2 * BLCKSZ) /* * When there is no space on current page we continue on the next * page with subrecord. */ typedef struct XLogSubRecord { - uint16 xl_len; - uint8 xl_info; + uint16 xl_len; + uint8 xl_info; /* ACTUAL LOG DATA FOLLOWS AT END OF STRUCT */ } XLogSubRecord; -#define SizeOfXLogSubRecord DOUBLEALIGN(sizeof(XLogSubRecord)) +#define SizeOfXLogSubRecord DOUBLEALIGN(sizeof(XLogSubRecord)) -#define XLR_TO_BE_CONTINUED 0x01 +#define XLR_TO_BE_CONTINUED 0x01 -#define XLOG_PAGE_MAGIC 0x17345168 +#define XLOG_PAGE_MAGIC 0x17345168 typedef struct XLogPageHeaderData { @@ -57,14 +57,14 @@ typedef struct XLogPageHeaderData uint16 xlp_info; } XLogPageHeaderData; -#define SizeOfXLogPHD DOUBLEALIGN(sizeof(XLogPageHeaderData)) +#define SizeOfXLogPHD DOUBLEALIGN(sizeof(XLogPageHeaderData)) typedef XLogPageHeaderData *XLogPageHeader; -#define XLP_FIRST_IS_SUBRECORD 0x0001 +#define XLP_FIRST_IS_SUBRECORD 0x0001 -extern XLogRecPtr XLogInsert(RmgrId rmid, char *hdr, uint32 hdrlen, - char *buf, uint32 buflen); -extern void XLogFlush(XLogRecPtr RecPtr); +extern XLogRecPtr XLogInsert(RmgrId rmid, char *hdr, uint32 hdrlen, + char *buf, uint32 buflen); +extern void XLogFlush(XLogRecPtr RecPtr); -#endif /* XLOG_H */ +#endif /* XLOG_H */ diff --git a/src/include/c.h b/src/include/c.h index abc3923f9d2..43c9643fd9b 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.68 2000/04/12 05:29:10 momjian Exp $ + * $Id: c.h,v 1.69 2000/04/12 17:16:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -531,9 +531,11 @@ typedef struct Exception * */ #define Trap(condition, exception) \ - { if ((assert_enabled) && (condition)) \ + do { \ + if ((assert_enabled) && (condition)) \ ExceptionalCondition(CppAsString(condition), &(exception), \ - (char*)NULL, __FILE__, __LINE__); } + (char*)NULL, __FILE__, __LINE__); \ + } while (0) /* * TrapMacro is the same as Trap but it's intended for use in macros: @@ -577,9 +579,11 @@ extern int assert_enabled; * */ #define LogTrap(condition, exception, printArgs) \ - { if ((assert_enabled) && (condition)) \ + do { \ + if ((assert_enabled) && (condition)) \ ExceptionalCondition(CppAsString(condition), &(exception), \ - vararg_format printArgs, __FILE__, __LINE__); } + vararg_format printArgs, __FILE__, __LINE__); \ + } while (0) /* * LogTrapMacro is the same as LogTrap but it's intended for use in macros: @@ -673,9 +677,9 @@ extern int assertTest(int val); * overhead. * * We got the 64 number by testing this against the stock memset() on - * BSD/OS 3.0. Larger values were slower. bjm 1997/09/11 + * BSD/OS 3.0. Larger values were slower. bjm 1997/09/11 * - * I think the crossover point could be a good deal higher for + * I think the crossover point could be a good deal higher for * most platforms, actually. tgl 2000-03-19 */ #define MemSet(start, val, len) \ @@ -792,10 +796,12 @@ extern char *vararg_format(const char *fmt,...); #ifndef HAVE_SNPRINTF_DECL extern int snprintf(char *str, size_t count, const char *fmt,...); + #endif #ifndef HAVE_VSNPRINTF_DECL extern int vsnprintf(char *str, size_t count, const char *fmt, va_list args); + #endif #ifndef HAVE_MEMMOVE diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h index 8eaa1a9c8be..5ed346681c5 100644 --- a/src/include/catalog/catalog.h +++ b/src/include/catalog/catalog.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catalog.h,v 1.11 2000/04/09 04:43:14 tgl Exp $ + * $Id: catalog.h,v 1.12 2000/04/12 17:16:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ extern char *relpath(const char *relname); extern char *relpath_blind(const char *dbname, const char *relname, - Oid dbid, Oid relid); + Oid dbid, Oid relid); extern bool IsSystemRelationName(const char *relname); extern bool IsSharedSystemRelationName(const char *relname); extern Oid newoid(void); diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 5af11daa5b7..cafab73cde3 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -1,4 +1,4 @@ -/*------------------------------------------------------------------------- +/*------------------------------------------------------------------------- * * catversion.h * "Catalog version number" for Postgres. @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catversion.h,v 1.19 2000/04/07 13:39:49 thomas Exp $ + * $Id: catversion.h,v 1.20 2000/04/12 17:16:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -52,7 +52,7 @@ * catalog changes on the same day...) */ -/* yyyymmddN */ -#define CATALOG_VERSION_NO 200004051 +/* yyyymmddN */ +#define CATALOG_VERSION_NO 200004051 #endif diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h index 63d114726e7..468eef4d3df 100644 --- a/src/include/catalog/heap.h +++ b/src/include/catalog/heap.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: heap.h,v 1.28 2000/01/26 05:57:56 momjian Exp $ + * $Id: heap.h,v 1.29 2000/04/12 17:16:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,24 +19,25 @@ typedef struct RawColumnDefault { AttrNumber attnum; /* attribute to attach default to */ - Node *raw_default; /* default value (untransformed parse tree) */ + Node *raw_default; /* default value (untransformed parse + * tree) */ } RawColumnDefault; -extern Oid RelnameFindRelid(const char *relname); +extern Oid RelnameFindRelid(const char *relname); extern Relation heap_create(char *relname, TupleDesc att, - bool isnoname, bool istemp, bool storage_create); + bool isnoname, bool istemp, bool storage_create); extern bool heap_storage_create(Relation rel); -extern Oid heap_create_with_catalog(char *relname, TupleDesc tupdesc, - char relkind, bool istemp); +extern Oid heap_create_with_catalog(char *relname, TupleDesc tupdesc, + char relkind, bool istemp); extern void heap_drop_with_catalog(const char *relname); extern void heap_truncate(char *relname); extern void heap_drop(Relation rel); extern void AddRelationRawConstraints(Relation rel, - List *rawColDefaults, - List *rawConstraints); + List *rawColDefaults, + List *rawConstraints); extern void InitNoNameRelList(void); extern void DropNoNameRels(void); diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index b65e2ad98eb..4a74367421f 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: index.h,v 1.22 2000/02/18 09:29:19 inoue Exp $ + * $Id: index.h,v 1.23 2000/04/12 17:16:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,4 +68,5 @@ extern bool activate_index(Oid indexId, bool activate); extern bool reindex_index(Oid indexId, bool force); extern bool activate_indexes_of_a_table(Oid relid, bool activate); extern bool reindex_relation(Oid relid, bool force); + #endif /* INDEX_H */ diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h index 7440bf6152d..3aea1db0fb0 100644 --- a/src/include/catalog/indexing.h +++ b/src/include/catalog/indexing.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: indexing.h,v 1.36 2000/01/26 05:57:56 momjian Exp $ + * $Id: indexing.h,v 1.37 2000/04/12 17:16:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,7 +35,7 @@ #define Num_pg_opclass_indices 2 #define Num_pg_operator_indices 2 #define Num_pg_proc_indices 2 -#define Num_pg_relcheck_indices 1 +#define Num_pg_relcheck_indices 1 #define Num_pg_rewrite_indices 2 #define Num_pg_shadow_indices 2 #define Num_pg_statistic_indices 1 @@ -114,22 +114,22 @@ extern char *IndexedCatalogNames[]; extern void CatalogOpenIndices(int nIndices, char **names, Relation *idescs); extern void CatalogCloseIndices(int nIndices, Relation *idescs); extern void CatalogIndexInsert(Relation *idescs, - int nIndices, - Relation heapRelation, - HeapTuple heapTuple); + int nIndices, + Relation heapRelation, + HeapTuple heapTuple); extern bool CatalogHasIndex(char *catName, Oid catId); extern HeapTuple AccessMethodOpidIndexScan(Relation heapRelation, - Oid claid, Oid opopr, Oid opid); + Oid claid, Oid opopr, Oid opid); extern HeapTuple AccessMethodStrategyIndexScan(Relation heapRelation, - Oid opid, Oid claid, int2 opstrategy); + Oid opid, Oid claid, int2 opstrategy); extern HeapTuple AggregateNameTypeIndexScan(Relation heapRelation, - char *aggName, Oid aggType); + char *aggName, Oid aggType); extern HeapTuple AmNameIndexScan(Relation heapRelation, char *amName); extern HeapTuple AttributeRelidNameIndexScan(Relation heapRelation, - Oid relid, char *attname); + Oid relid, char *attname); extern HeapTuple AttributeRelidNumIndexScan(Relation heapRelation, - Oid relid, AttrNumber attnum); + Oid relid, AttrNumber attnum); extern HeapTuple ClassNameIndexScan(Relation heapRelation, char *relName); extern HeapTuple ClassNameIndexScan(Relation heapRelation, char *relName); extern HeapTuple ClassOidIndexScan(Relation heapRelation, Oid relId); @@ -137,25 +137,25 @@ extern HeapTuple GroupNameIndexScan(Relation heapRelation, char *groName); extern HeapTuple GroupSysidIndexScan(Relation heapRelation, int4 sysId); extern HeapTuple IndexRelidIndexScan(Relation heapRelation, Oid relid); extern HeapTuple InheritsRelidSeqnoIndexScan(Relation heapRelation, Oid relid, - int4 seqno); + int4 seqno); extern HeapTuple LanguageNameIndexScan(Relation heapRelation, char *lanName); extern HeapTuple LanguageOidIndexScan(Relation heapRelation, Oid lanId); extern HeapTuple ListenerRelnamePidIndexScan(Relation heapRelation, char *relName, int4 pid); extern HeapTuple OpclassDeftypeIndexScan(Relation heapRelation, Oid defType); extern HeapTuple OpclassNameIndexScan(Relation heapRelation, char *opcName); extern HeapTuple OperatorNameIndexScan(Relation heapRelation, - char *oprName, Oid oprLeft, Oid oprRight, char oprKind); + char *oprName, Oid oprLeft, Oid oprRight, char oprKind); extern HeapTuple OperatorOidIndexScan(Relation heapRelation, Oid oprId); extern HeapTuple ProcedureNameIndexScan(Relation heapRelation, - char *procName, int2 nargs, Oid *argTypes); + char *procName, int2 nargs, Oid *argTypes); extern HeapTuple ProcedureOidIndexScan(Relation heapRelation, Oid procId); extern HeapTuple RewriteOidIndexScan(Relation heapRelation, Oid rewriteId); extern HeapTuple RewriteRulenameIndexScan(Relation heapRelation, - char *ruleName); + char *ruleName); extern HeapTuple ShadowNameIndexScan(Relation heapRelation, char *useName); extern HeapTuple ShadowSysidIndexScan(Relation heapRelation, int4 sysId); extern HeapTuple StatisticRelidAttnumIndexScan(Relation heapRelation, - Oid relId, AttrNumber attNum); + Oid relId, AttrNumber attNum); extern HeapTuple TypeNameIndexScan(Relation heapRelation, char *typeName); extern HeapTuple TypeOidIndexScan(Relation heapRelation, Oid typeId); diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h index c953d33d00a..0cae51dec64 100644 --- a/src/include/catalog/pg_aggregate.h +++ b/src/include/catalog/pg_aggregate.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_aggregate.h,v 1.24 2000/03/14 23:06:42 thomas Exp $ + * $Id: pg_aggregate.h,v 1.25 2000/04/12 17:16:27 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -132,7 +132,7 @@ DATA(insert OID = 0 ( min PGUID date_smaller - - 1082 1082 0 1082 _null_ _null_ DATA(insert OID = 0 ( min PGUID time_smaller - - 1083 1083 0 1083 _null_ _null_ )); DATA(insert OID = 0 ( min PGUID timetz_smaller - - 1266 1266 0 1266 _null_ _null_ )); DATA(insert OID = 0 ( min PGUID cashsmaller - - 790 790 0 790 _null_ _null_ )); -DATA(insert OID = 0 ( min PGUID timestamp_smaller - - 1184 1184 0 1184 _null_ _null_ )); +DATA(insert OID = 0 ( min PGUID timestamp_smaller - - 1184 1184 0 1184 _null_ _null_ )); DATA(insert OID = 0 ( min PGUID interval_smaller - - 1186 1186 0 1186 _null_ _null_ )); DATA(insert OID = 0 ( min PGUID text_smaller - - 25 25 0 25 _null_ _null_ )); DATA(insert OID = 0 ( min PGUID numeric_smaller - - 1700 1700 0 1700 _null_ _null_ )); diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h index dfebc0e8c8f..6e4366b37f9 100644 --- a/src/include/catalog/pg_am.h +++ b/src/include/catalog/pg_am.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_am.h,v 1.14 2000/02/17 03:39:47 tgl Exp $ + * $Id: pg_am.h,v 1.15 2000/04/12 17:16:27 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -38,13 +38,13 @@ CATALOG(pg_am) { NameData amname; /* access method name */ int4 amowner; /* usesysid of creator */ - int2 amstrategies; /* total NUMBER of strategies by which - * we can traverse/search this AM */ - int2 amsupport; /* total NUMBER of support functions - * that this AM uses */ - int2 amorderstrategy; /* if this AM has a sort order, the - * strategy number of the sort operator. - * Zero if AM is not ordered. */ + int2 amstrategies; /* total NUMBER of strategies by which we + * can traverse/search this AM */ + int2 amsupport; /* total NUMBER of support functions that + * this AM uses */ + int2 amorderstrategy;/* if this AM has a sort order, the + * strategy number of the sort operator. + * Zero if AM is not ordered. */ regproc amgettuple; /* "next valid tuple" function */ regproc aminsert; /* "insert this tuple" function */ regproc amdelete; /* "delete this tuple" function */ @@ -62,7 +62,7 @@ CATALOG(pg_am) regproc ambuild; /* "build new index" function */ regproc amcreate; /* - deprecated */ regproc amdestroy; /* - deprecated */ - regproc amcostestimate; /* estimate cost of an indexscan */ + regproc amcostestimate; /* estimate cost of an indexscan */ } FormData_pg_am; /* ---------------- diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h index 3f8859dd216..00147252298 100644 --- a/src/include/catalog/pg_amop.h +++ b/src/include/catalog/pg_amop.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_amop.h,v 1.32 2000/03/14 23:06:43 thomas Exp $ + * $Id: pg_amop.h,v 1.33 2000/04/12 17:16:28 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -365,7 +365,7 @@ DATA(insert OID = 0 ( 403 1690 1695 4 )); DATA(insert OID = 0 ( 403 1690 59 5 )); /* - * nbtree lztext + * nbtree lztext */ DATA(insert OID = 0 ( 403 1663 1659 1 )); diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index 54f3adc9ee1..6edd86b1f2e 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_attribute.h,v 1.54 2000/03/09 05:00:26 inoue Exp $ + * $Id: pg_attribute.h,v 1.55 2000/04/12 17:16:28 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -41,9 +41,11 @@ */ CATALOG(pg_attribute) BOOTSTRAP { - Oid attrelid; /* OID of relation containing this attribute */ + Oid attrelid; /* OID of relation containing this + * attribute */ NameData attname; Oid atttypid; + /* * atttypid is the OID of the instance in Catalog Class pg_type that * defines the data type of this attribute (e.g. int4). Information @@ -53,19 +55,21 @@ CATALOG(pg_attribute) BOOTSTRAP */ float4 attdisbursion; + /* - * attdisbursion is the disbursion statistic of the column (0.0 to 1.0), - * or zero if the statistic has not been calculated, or -1.0 - * if VACUUM found that the column contains no duplicate entries - * (in which case the disbursion should be taken as 1.0/numberOfRows - * for the current table size). The -1.0 hack is useful because the - * number of rows may be updated more often than attdisbursion is. - * We assume that the column will retain its no-duplicate-entry - * property. (Perhaps this should be driven off the existence of a - * UNIQUE index for the column, instead of being a statistical guess?) + * attdisbursion is the disbursion statistic of the column (0.0 to + * 1.0), or zero if the statistic has not been calculated, or -1.0 if + * VACUUM found that the column contains no duplicate entries (in + * which case the disbursion should be taken as 1.0/numberOfRows for + * the current table size). The -1.0 hack is useful because the + * number of rows may be updated more often than attdisbursion is. We + * assume that the column will retain its no-duplicate-entry property. + * (Perhaps this should be driven off the existence of a UNIQUE index + * for the column, instead of being a statistical guess?) */ int2 attlen; + /* * attlen is a copy of the typlen field from pg_type for this * attribute. See atttypid above. See struct Form_pg_type for @@ -73,6 +77,7 @@ CATALOG(pg_attribute) BOOTSTRAP */ int2 attnum; + /* * attnum is the "attribute number" for the attribute: A value that * uniquely identifies this attribute within its class. For user @@ -90,6 +95,7 @@ CATALOG(pg_attribute) BOOTSTRAP int4 attnelems; /* number of dimensions, if an array type */ int4 attcacheoff; + /* * fastgetattr() uses attcacheoff to cache byte offsets of attributes * in heap tuples. The value actually stored in pg_attribute (-1) @@ -99,36 +105,39 @@ CATALOG(pg_attribute) BOOTSTRAP */ int4 atttypmod; + /* - * atttypmod records type-specific data supplied at table creation time - * (for example, the max length of a varchar field). It is passed to - * type-specific input and output functions as the third argument. - * The value will generally be -1 for types that do not need typmod. + * atttypmod records type-specific data supplied at table creation + * time (for example, the max length of a varchar field). It is + * passed to type-specific input and output functions as the third + * argument. The value will generally be -1 for types that do not need + * typmod. */ bool attbyval; + /* * attbyval is a copy of the typbyval field from pg_type for this * attribute. See atttypid above. See struct Form_pg_type for * definition. */ - + char attstorage; + /* - * attstorage tells for VARLENA attributes, what the heap - * access methods can do to it if a given tuple doesn't fit into - * a page. Possible values are - * 'p': Value must be stored plain allways - * 'e': Value can be stored in "secondary" relation (if relation - * has rellongrelid attached) - * 'c': Value can be stored compressed inline - * 'x': Value can be stored compressed inline or in "secondary". + * attstorage tells for VARLENA attributes, what the heap access + * methods can do to it if a given tuple doesn't fit into a page. + * Possible values are 'p': Value must be stored plain allways 'e': + * Value can be stored in "secondary" relation (if relation has + * rellongrelid attached) 'c': Value can be stored compressed inline + * 'x': Value can be stored compressed inline or in "secondary". * * Note: compressed storage */ bool attisset; char attalign; + /* * attalign is a copy of the typalign field from pg_type for this * attribute. See atttypid above. See struct Form_pg_type for @@ -136,8 +145,10 @@ CATALOG(pg_attribute) BOOTSTRAP */ bool attnotnull; + /* This flag represents the "NOT NULL" constraint */ bool atthasdef; + /* Has DEFAULT value or not */ } FormData_pg_attribute; @@ -182,16 +193,16 @@ typedef FormData_pg_attribute *Form_pg_attribute; /* * CONSTANT and MACROS for DROP COLUMN implementation */ -#define DROP_COLUMN_OFFSET -20 -#define COLUMN_IS_DROPPED(attribute) ((attribute)->attnum <= DROP_COLUMN_OFFSET) -#define DROPPED_COLUMN_INDEX(attidx) (DROP_COLUMN_OFFSET - attidx) -#define ATTRIBUTE_DROP_COLUMN(attribute) \ +#define DROP_COLUMN_OFFSET -20 +#define COLUMN_IS_DROPPED(attribute) ((attribute)->attnum <= DROP_COLUMN_OFFSET) +#define DROPPED_COLUMN_INDEX(attidx) (DROP_COLUMN_OFFSET - attidx) +#define ATTRIBUTE_DROP_COLUMN(attribute) \ Assert((attribute)->attnum > 0); \ (attribute)->attnum = DROPPED_COLUMN_INDEX((attribute)->attnum); \ (attribute)->atttypid = (Oid) -1; \ (attribute)->attnotnull = false; \ - (attribute)->atthasdef = false; -#endif /* _DROP_COLUMN_HACK__ */ + (attribute)->atthasdef = false; +#endif /* _DROP_COLUMN_HACK__ */ /* ---------------- * SCHEMA_ macros for declaring hardcoded tuple descriptors. * these are used in utils/cache/relcache.c @@ -286,7 +297,7 @@ DATA(insert OID = 0 ( 1262 cmax 29 0 4 -6 0 -1 -1 t p f i f f)); { 1255, {"pronargs"}, 21, 0, 2, 7, 0, -1, -1, '\001', 'p', '\0', 's', '\0', '\0' }, \ { 1255, {"proretset"}, 16, 0, 1, 8, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \ { 1255, {"prorettype"}, 26, 0, 4, 9, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \ -{ 1255, {"proargtypes"}, 30, 0, INDEX_MAX_KEYS*4, 10, 0, -1, -1, '\0', 'p', '\0', 'i', '\0', '\0' }, \ +{ 1255, {"proargtypes"}, 30, 0, INDEX_MAX_KEYS*4, 10, 0, -1, -1, '\0', 'p', '\0', 'i', '\0', '\0' }, \ { 1255, {"probyte_pct"}, 23, 0, 4, 11, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \ { 1255, {"properbyte_cpu"}, 23, 0, 4, 12, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \ { 1255, {"propercall_cpu"}, 23, 0, 4, 13, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \ @@ -365,7 +376,7 @@ DATA(insert OID = 0 ( 1261 cmax 29 0 4 -6 0 -1 -1 t p f i f f)); { 1249, {"attcacheoff"}, 23, 0, 4, 8, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \ { 1249, {"atttypmod"}, 23, 0, 4, 9, 0, -1, -1, '\001', 'p', '\0', 'i', '\0', '\0' }, \ { 1249, {"attbyval"}, 16, 0, 1, 10, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \ -{ 1249, {"attstorage"}, 18, 0, 1, 11, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \ +{ 1249, {"attstorage"}, 18, 0, 1, 11, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \ { 1249, {"attisset"}, 16, 0, 1, 12, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \ { 1249, {"attalign"}, 18, 0, 1, 13, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \ { 1249, {"attnotnull"}, 16, 0, 1, 14, 0, -1, -1, '\001', 'p', '\0', 'c', '\0', '\0' }, \ @@ -490,7 +501,7 @@ DATA(insert OID = 0 ( 1219 tgconstrrelid 26 0 4 8 0 -1 -1 t p f i f f)); DATA(insert OID = 0 ( 1219 tgdeferrable 16 0 1 9 0 -1 -1 t p f c f f)); DATA(insert OID = 0 ( 1219 tginitdeferred 16 0 1 10 0 -1 -1 t p f c f f)); DATA(insert OID = 0 ( 1219 tgnargs 21 0 2 11 0 -1 -1 t p f s f f)); -DATA(insert OID = 0 ( 1219 tgattr 22 0 INDEX_MAX_KEYS*2 12 0 -1 -1 f p f i f f)); +DATA(insert OID = 0 ( 1219 tgattr 22 0 INDEX_MAX_KEYS*2 12 0 -1 -1 f p f i f f)); DATA(insert OID = 0 ( 1219 tgargs 17 0 -1 13 0 -1 -1 f p f i f f)); DATA(insert OID = 0 ( 1219 ctid 27 0 6 -1 0 -1 -1 f p f i f f)); DATA(insert OID = 0 ( 1219 oid 26 0 4 -2 0 -1 -1 t p f i f f)); diff --git a/src/include/catalog/pg_description.h b/src/include/catalog/pg_description.h index 96caec1a263..391f88fb5c3 100644 --- a/src/include/catalog/pg_description.h +++ b/src/include/catalog/pg_description.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_description.h,v 1.10 2000/01/26 05:57:57 momjian Exp $ + * $Id: pg_description.h,v 1.11 2000/04/12 17:16:28 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -66,4 +66,3 @@ typedef FormData_pg_description *Form_pg_description; */ #endif /* PG_DESCRIPTION_H */ - diff --git a/src/include/catalog/pg_inheritproc.h b/src/include/catalog/pg_inheritproc.h index c3bb7f165c1..90d182ec181 100644 --- a/src/include/catalog/pg_inheritproc.h +++ b/src/include/catalog/pg_inheritproc.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_inheritproc.h,v 1.8 2000/01/26 05:57:57 momjian Exp $ + * $Id: pg_inheritproc.h,v 1.9 2000/04/12 17:16:28 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -52,8 +52,8 @@ typedef FormData_pg_inheritproc *Form_pg_inheritproc; */ #define Natts_pg_inheritproc 4 #define Anum_pg_inheritproc_inhproname 1 -#define Anum_pg_inheritproc_inhargrelid 2 -#define Anum_pg_inheritproc_inhdefrelid 3 +#define Anum_pg_inheritproc_inhargrelid 2 +#define Anum_pg_inheritproc_inhdefrelid 3 #define Anum_pg_inheritproc_inhproc 4 diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h index 617bb0f4d31..1ff443a53f5 100644 --- a/src/include/catalog/pg_opclass.h +++ b/src/include/catalog/pg_opclass.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_opclass.h,v 1.31 2000/03/14 23:06:43 thomas Exp $ + * $Id: pg_opclass.h,v 1.32 2000/04/12 17:16:28 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -63,66 +63,66 @@ typedef FormData_pg_opclass *Form_pg_opclass; * (see the README in this directory), so just put zeros * in, which are invalid OID's anyway. --djm */ -DATA(insert OID = 421 ( int2_ops 21 )); +DATA(insert OID = 421 ( int2_ops 21 )); DESCR(""); -DATA(insert OID = 422 ( box_ops 603 )); +DATA(insert OID = 422 ( box_ops 603 )); DESCR(""); -DATA(insert OID = 423 ( float8_ops 701 )); +DATA(insert OID = 423 ( float8_ops 701 )); DESCR(""); -DATA(insert OID = 424 ( int24_ops 0 )); +DATA(insert OID = 424 ( int24_ops 0 )); DESCR(""); -DATA(insert OID = 425 ( int42_ops 0 )); +DATA(insert OID = 425 ( int42_ops 0 )); DESCR(""); -DATA(insert OID = 426 ( int4_ops 23 )); +DATA(insert OID = 426 ( int4_ops 23 )); DESCR(""); #define INT4_OPS_OID 426 -DATA(insert OID = 427 ( oid_ops 26 )); +DATA(insert OID = 427 ( oid_ops 26 )); DESCR(""); -DATA(insert OID = 428 ( float4_ops 700 )); +DATA(insert OID = 428 ( float4_ops 700 )); DESCR(""); -DATA(insert OID = 429 ( char_ops 18 )); +DATA(insert OID = 429 ( char_ops 18 )); DESCR(""); -DATA(insert OID = 431 ( text_ops 25 )); +DATA(insert OID = 431 ( text_ops 25 )); DESCR(""); -DATA(insert OID = 432 ( abstime_ops 702 )); +DATA(insert OID = 432 ( abstime_ops 702 )); DESCR(""); -DATA(insert OID = 433 ( bigbox_ops 603 )); +DATA(insert OID = 433 ( bigbox_ops 603 )); DESCR(""); -DATA(insert OID = 434 ( poly_ops 604 )); +DATA(insert OID = 434 ( poly_ops 604 )); DESCR(""); -DATA(insert OID = 435 ( oidvector_ops 30 )); +DATA(insert OID = 435 ( oidvector_ops 30 )); DESCR(""); -DATA(insert OID = 714 ( circle_ops 718 )); +DATA(insert OID = 714 ( circle_ops 718 )); DESCR(""); -DATA(insert OID = 754 ( int8_ops 20 )); +DATA(insert OID = 754 ( int8_ops 20 )); DESCR(""); -DATA(insert OID = 1076 ( bpchar_ops 1042 )); +DATA(insert OID = 1076 ( bpchar_ops 1042 )); DESCR(""); DATA(insert OID = 1077 ( varchar_ops 1043 )); DESCR(""); -DATA(insert OID = 1114 ( date_ops 1082 )); +DATA(insert OID = 1114 ( date_ops 1082 )); DESCR(""); -DATA(insert OID = 1115 ( time_ops 1083 )); +DATA(insert OID = 1115 ( time_ops 1083 )); DESCR(""); -DATA(insert OID = 1181 ( name_ops 19 )); +DATA(insert OID = 1181 ( name_ops 19 )); DESCR(""); DATA(insert OID = 1312 ( timestamp_ops 1184 )); DESCR(""); DATA(insert OID = 1313 ( interval_ops 1186 )); DESCR(""); -DATA(insert OID = 810 ( macaddr_ops 829 )); +DATA(insert OID = 810 ( macaddr_ops 829 )); DESCR(""); -DATA(insert OID = 935 ( inet_ops 869 )); +DATA(insert OID = 935 ( inet_ops 869 )); DESCR(""); -DATA(insert OID = 652 ( cidr_ops 650 )); +DATA(insert OID = 652 ( cidr_ops 650 )); DESCR(""); DATA(insert OID = 1768 ( numeric_ops 1700 )); DESCR(""); -DATA(insert OID = 1663 ( lztext_ops 1625 )); +DATA(insert OID = 1663 ( lztext_ops 1625 )); DESCR(""); -DATA(insert OID = 1690 ( bool_ops 16 )); +DATA(insert OID = 1690 ( bool_ops 16 )); DESCR(""); -DATA(insert OID = 1399 ( timetz_ops 1266 )); +DATA(insert OID = 1399 ( timetz_ops 1266 )); DESCR(""); #endif /* PG_OPCLASS_H */ diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h index 2150bac98de..538d0095258 100644 --- a/src/include/catalog/pg_operator.h +++ b/src/include/catalog/pg_operator.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_operator.h,v 1.74 2000/04/08 02:13:00 thomas Exp $ + * $Id: pg_operator.h,v 1.75 2000/04/12 17:16:29 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -139,7 +139,7 @@ DATA(insert OID = 399 ( "=" PGUID 0 b t f 1026 1026 16 399 0 0 0 array_e DATA(insert OID = 400 ( "=" PGUID 0 b t f 1027 1027 16 400 0 0 0 array_eq eqsel eqjoinsel )); DATA(insert OID = 401 ( "=" PGUID 0 b t f 1034 1034 16 401 0 0 0 array_eq eqsel eqjoinsel )); -DATA(insert OID = 387 ( "=" PGUID 0 b t t 27 27 16 387 0 0 0 tideq eqsel eqjoinsel )); +DATA(insert OID = 387 ( "=" PGUID 0 b t t 27 27 16 387 0 0 0 tideq eqsel eqjoinsel )); #define TIDEqualOperator 387 DATA(insert OID = 388 ( "!" PGUID 0 r t f 20 0 20 0 0 0 0 int8fac - - )); DATA(insert OID = 389 ( "!!" PGUID 0 l t f 0 20 20 0 0 0 0 int8fac - - )); @@ -281,13 +281,13 @@ DATA(insert OID = 1283 ( ";" PGUID 0 l t f 0 701 701 0 0 0 0 dlog1 DATA(insert OID = 1284 ( "|" PGUID 0 l t f 0 704 702 0 0 0 0 tintervalstart - - )); DATA(insert OID = 606 ( "<#>" PGUID 0 b t f 702 702 704 0 0 0 0 mktinterval - - )); DATA(insert OID = 607 ( "=" PGUID 0 b t t 26 26 16 607 608 609 609 oideq eqsel eqjoinsel )); -#define MIN_OIDCMP 607 /* used by cache code */ +#define MIN_OIDCMP 607 /* used by cache code */ DATA(insert OID = 608 ( "<>" PGUID 0 b t f 26 26 16 608 607 0 0 oidne neqsel neqjoinsel )); DATA(insert OID = 609 ( "<" PGUID 0 b t f 26 26 16 610 612 0 0 int4lt scalarltsel scalarltjoinsel )); DATA(insert OID = 610 ( ">" PGUID 0 b t f 26 26 16 609 611 0 0 int4gt scalargtsel scalargtjoinsel )); DATA(insert OID = 611 ( "<=" PGUID 0 b t f 26 26 16 612 610 0 0 int4le scalarltsel scalarltjoinsel )); DATA(insert OID = 612 ( ">=" PGUID 0 b t f 26 26 16 611 609 0 0 int4ge scalargtsel scalargtjoinsel )); -#define MAX_OIDCMP 612 /* used by cache code */ +#define MAX_OIDCMP 612 /* used by cache code */ DATA(insert OID = 644 ( "<>" PGUID 0 b t f 30 30 16 644 649 0 0 oidvectorne neqsel neqjoinsel )); DATA(insert OID = 645 ( "<" PGUID 0 b t f 30 30 16 646 648 0 0 oidvectorlt - - )); @@ -520,11 +520,11 @@ DATA(insert OID = 1134 ( "<=" PGUID 0 b t f 701 700 16 1125 1133 0 0 float8 DATA(insert OID = 1135 ( ">=" PGUID 0 b t f 701 700 16 1124 1132 0 0 float84ge scalargtsel scalargtjoinsel )); /* int4 and oid equality */ -DATA(insert OID = 1136 ( "=" PGUID 0 b t t 23 26 16 1137 0 0 0 int4eqoid eqsel eqjoinsel )); -DATA(insert OID = 1137 ( "=" PGUID 0 b t t 26 23 16 1136 0 0 0 oideqint4 eqsel eqjoinsel )); +DATA(insert OID = 1136 ( "=" PGUID 0 b t t 23 26 16 1137 0 0 0 int4eqoid eqsel eqjoinsel )); +DATA(insert OID = 1137 ( "=" PGUID 0 b t t 26 23 16 1136 0 0 0 oideqint4 eqsel eqjoinsel )); -DATA(insert OID = 1158 ( "!" PGUID 0 r t f 21 0 23 0 0 0 0 int2fac - - )); -DATA(insert OID = 1175 ( "!!" PGUID 0 l t f 0 21 23 0 0 0 0 int2fac - - )); +DATA(insert OID = 1158 ( "!" PGUID 0 r t f 21 0 23 0 0 0 0 int2fac - - )); +DATA(insert OID = 1175 ( "!!" PGUID 0 l t f 0 21 23 0 0 0 0 int2fac - - )); /* LIKE hacks by Keith Parks. */ DATA(insert OID = 1207 ( "~~" PGUID 0 b t f 19 25 16 0 1208 0 0 namelike eqsel eqjoinsel )); @@ -676,10 +676,10 @@ DATA(insert OID = 1203 ( "<" PGUID 0 b t f 869 869 16 1205 1206 0 0 network DATA(insert OID = 1204 ( "<=" PGUID 0 b t f 869 869 16 1206 1205 0 0 network_le scalarltsel scalarltjoinsel )); DATA(insert OID = 1205 ( ">" PGUID 0 b t f 869 869 16 1203 1204 0 0 network_gt scalargtsel scalargtjoinsel )); DATA(insert OID = 1206 ( ">=" PGUID 0 b t f 869 869 16 1204 1203 0 0 network_ge scalargtsel scalargtjoinsel )); -DATA(insert OID = 931 ( "<<" PGUID 0 b t f 869 869 16 933 0 0 0 network_sub - - )); -DATA(insert OID = 932 ( "<<=" PGUID 0 b t f 869 869 16 934 0 0 0 network_subeq - - )); -DATA(insert OID = 933 ( ">>" PGUID 0 b t f 869 869 16 931 0 0 0 network_sup - - )); -DATA(insert OID = 934 ( ">>=" PGUID 0 b t f 869 869 16 932 0 0 0 network_supeq - - )); +DATA(insert OID = 931 ( "<<" PGUID 0 b t f 869 869 16 933 0 0 0 network_sub - - )); +DATA(insert OID = 932 ( "<<=" PGUID 0 b t f 869 869 16 934 0 0 0 network_subeq - - )); +DATA(insert OID = 933 ( ">>" PGUID 0 b t f 869 869 16 931 0 0 0 network_sup - - )); +DATA(insert OID = 934 ( ">>=" PGUID 0 b t f 869 869 16 932 0 0 0 network_supeq - - )); /* CIDR type */ DATA(insert OID = 820 ( "=" PGUID 0 b t f 650 650 16 820 821 0 0 network_eq eqsel eqjoinsel )); @@ -694,7 +694,7 @@ DATA(insert OID = 828 ( ">>" PGUID 0 b t f 650 650 16 826 0 0 0 network_s DATA(insert OID = 1004 ( ">>=" PGUID 0 b t f 650 650 16 827 0 0 0 network_supeq - - )); /* NUMERIC type - OID's 1700-1799 */ -DATA(insert OID = 1751 ( "-" PGUID 0 l t f 0 1700 1700 0 0 0 0 numeric_uminus - - )); +DATA(insert OID = 1751 ( "-" PGUID 0 l t f 0 1700 1700 0 0 0 0 numeric_uminus - - )); DATA(insert OID = 1752 ( "=" PGUID 0 b t f 1700 1700 16 1752 1753 1754 1754 numeric_eq eqsel eqjoinsel )); DATA(insert OID = 1753 ( "<>" PGUID 0 b t f 1700 1700 16 1753 1752 0 0 numeric_ne neqsel neqjoinsel )); DATA(insert OID = 1754 ( "<" PGUID 0 b t f 1700 1700 16 1756 1757 0 0 numeric_lt scalarltsel scalarltjoinsel )); @@ -709,12 +709,12 @@ DATA(insert OID = 1762 ( "%" PGUID 0 b t f 1700 1700 1700 0 0 0 0 numeric DATA(insert OID = 1763 ( "@" PGUID 0 l t f 0 1700 1700 0 0 0 0 numeric_abs - - )); /* LZTEXT type */ -DATA(insert OID = 1657 ( "=" PGUID 0 b t f 1625 1625 16 1657 1658 1659 1659 lztext_eq eqsel eqjoinsel )); -DATA(insert OID = 1658 ( "<>" PGUID 0 b t f 1625 1625 16 1658 1657 0 0 lztext_ne neqsel neqjoinsel )); -DATA(insert OID = 1659 ( "<" PGUID 0 b t f 1625 1625 16 1661 1662 0 0 lztext_lt intltsel intltjoinsel )); -DATA(insert OID = 1660 ( "<=" PGUID 0 b t f 1625 1625 16 1662 1661 0 0 lztext_le intltsel intltjoinsel )); -DATA(insert OID = 1661 ( ">" PGUID 0 b t f 1625 1625 16 1659 1660 0 0 lztext_gt intgtsel intgtjoinsel )); -DATA(insert OID = 1662 ( ">=" PGUID 0 b t f 1625 1625 16 1660 1659 0 0 lztext_ge intgtsel intgtjoinsel )); +DATA(insert OID = 1657 ( "=" PGUID 0 b t f 1625 1625 16 1657 1658 1659 1659 lztext_eq eqsel eqjoinsel )); +DATA(insert OID = 1658 ( "<>" PGUID 0 b t f 1625 1625 16 1658 1657 0 0 lztext_ne neqsel neqjoinsel )); +DATA(insert OID = 1659 ( "<" PGUID 0 b t f 1625 1625 16 1661 1662 0 0 lztext_lt intltsel intltjoinsel )); +DATA(insert OID = 1660 ( "<=" PGUID 0 b t f 1625 1625 16 1662 1661 0 0 lztext_le intltsel intltjoinsel )); +DATA(insert OID = 1661 ( ">" PGUID 0 b t f 1625 1625 16 1659 1660 0 0 lztext_gt intgtsel intgtjoinsel )); +DATA(insert OID = 1662 ( ">=" PGUID 0 b t f 1625 1625 16 1660 1659 0 0 lztext_ge intgtsel intgtjoinsel )); DATA(insert OID = 1784 ( "=" PGUID 0 b t f 1560 1560 16 1784 1785 1786 1786 biteq eqsel eqjoinsel )); DATA(insert OID = 1785 ( "<>" PGUID 0 b t f 1560 1560 16 1785 1784 0 0 bitne neqsel neqjoinsel )); @@ -722,7 +722,7 @@ DATA(insert OID = 1786 ( "<" PGUID 0 b t f 1560 1560 16 1787 1789 0 0 bitlt DATA(insert OID = 1787 ( ">" PGUID 0 b t f 1560 1560 16 1786 1788 0 0 bitgt intgtsel intgtjoinsel )); DATA(insert OID = 1788 ( "<=" PGUID 0 b t f 1560 1560 16 1789 1787 0 0 bitle intltsel intltjoinsel )); DATA(insert OID = 1789 ( ">=" PGUID 0 b t f 1560 1560 16 1788 1786 0 0 bitge intgtsel intgtjoinsel )); -DATA(insert OID = 1790 ( "<=>" PGUID 0 b t f 1560 1560 23 0 0 0 0 bitcmp - - )); +DATA(insert OID = 1790 ( "<=>" PGUID 0 b t f 1560 1560 23 0 0 0 0 bitcmp - - )); DATA(insert OID = 1791 ( "&" PGUID 0 b t f 1560 1560 1560 0 0 0 0 bitand - - )); DATA(insert OID = 1792 ( "|" PGUID 0 b t f 1560 1560 1560 0 0 0 0 bitor - - )); DATA(insert OID = 1793 ( "^" PGUID 0 b t f 1560 1560 1560 0 0 0 0 bitxor - - )); @@ -737,7 +737,7 @@ DATA(insert OID = 1806 ( "<" PGUID 0 b t f 1562 1562 16 1807 1809 0 0 varbit DATA(insert OID = 1807 ( ">" PGUID 0 b t f 1562 1562 16 1806 1808 0 0 varbitgt intgtsel intgtjoinsel )); DATA(insert OID = 1808 ( "<=" PGUID 0 b t f 1562 1562 16 1809 1807 0 0 varbitle intltsel intltjoinsel )); DATA(insert OID = 1809 ( ">=" PGUID 0 b t f 1562 1562 16 1808 1806 0 0 varbitge intgtsel intgtjoinsel )); -DATA(insert OID = 1810 ( "<=>" PGUID 0 b t f 1562 1562 23 0 0 0 0 varbitcmp - - )); +DATA(insert OID = 1810 ( "<=>" PGUID 0 b t f 1562 1562 23 0 0 0 0 varbitcmp - - )); DATA(insert OID = 1811 ( "&" PGUID 0 b t f 1562 1562 1562 0 0 0 0 varbitand - - )); DATA(insert OID = 1812 ( "|" PGUID 0 b t f 1562 1562 1562 0 0 0 0 varbitor - - )); DATA(insert OID = 1813 ( "^" PGUID 0 b t f 1562 1562 1562 0 0 0 0 varbitxor - - )); diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index c38c1c84a43..34d4494b238 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_proc.h,v 1.131 2000/04/08 02:13:00 thomas Exp $ + * $Id: pg_proc.h,v 1.132 2000/04/12 17:16:29 momjian Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -94,7 +94,7 @@ typedef FormData_pg_proc *Form_pg_proc; /* keep the following ordered by OID so that later changes can be made easier */ /* OIDS 1 - 99 */ -DATA(insert OID = 12 ( update_pg_pwd PGUID 11 f t f 0 f 0 "" 100 0 0 100 update_pg_pwd - )); +DATA(insert OID = 12 ( update_pg_pwd PGUID 11 f t f 0 f 0 "" 100 0 0 100 update_pg_pwd - )); DESCR("update pg_pwd file"); DATA(insert OID = 1242 ( boolin PGUID 11 f t t 1 f 16 "0" 100 0 0 100 boolin - )); @@ -406,7 +406,7 @@ DATA(insert OID = 194 ( rt_box_inter PGUID 11 f t t 2 f 603 "603 603" 100 0 DESCR("r-tree"); DATA(insert OID = 195 ( rt_box_size PGUID 11 f t t 2 f 700 "603 700" 100 0 0 100 rt_box_size - )); DESCR("r-tree"); -DATA(insert OID = 196 ( rt_bigbox_size PGUID 11 f t t 2 f 700 "603 700" 100 0 0 100 rt_bigbox_size - )); +DATA(insert OID = 196 ( rt_bigbox_size PGUID 11 f t t 2 f 700 "603 700" 100 0 0 100 rt_bigbox_size - )); DESCR("r-tree"); DATA(insert OID = 197 ( rt_poly_union PGUID 11 f t t 2 f 604 "604 604" 100 0 0 100 rt_poly_union - )); DESCR("r-tree"); @@ -552,19 +552,19 @@ DATA(insert OID = 264 ( tintervalct PGUID 11 f t f 2 f 16 "704 704" 100 0 0 DESCR("less-than"); DATA(insert OID = 265 ( tintervalov PGUID 11 f t f 2 f 16 "704 704" 100 0 0 100 tintervalov - )); DESCR("overlaps"); -DATA(insert OID = 266 ( tintervalleneq PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 tintervalleneq - )); +DATA(insert OID = 266 ( tintervalleneq PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 tintervalleneq - )); DESCR("length equal"); -DATA(insert OID = 267 ( tintervallenne PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 tintervallenne - )); +DATA(insert OID = 267 ( tintervallenne PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 tintervallenne - )); DESCR("length not equal to"); -DATA(insert OID = 268 ( tintervallenlt PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 tintervallenlt - )); +DATA(insert OID = 268 ( tintervallenlt PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 tintervallenlt - )); DESCR("length less-than"); -DATA(insert OID = 269 ( tintervallengt PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 tintervallengt - )); +DATA(insert OID = 269 ( tintervallengt PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 tintervallengt - )); DESCR("length greater-than"); -DATA(insert OID = 270 ( tintervallenle PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 tintervallenle - )); +DATA(insert OID = 270 ( tintervallenle PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 tintervallenle - )); DESCR("length less-than-or-equal"); -DATA(insert OID = 271 ( tintervallenge PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 tintervallenge - )); +DATA(insert OID = 271 ( tintervallenge PGUID 11 f t f 2 f 16 "704 703" 100 0 0 100 tintervallenge - )); DESCR("length greater-than-or-equal"); -DATA(insert OID = 272 ( tintervalstart PGUID 11 f t f 1 f 702 "704" 100 0 0 100 tintervalstart - )); +DATA(insert OID = 272 ( tintervalstart PGUID 11 f t f 1 f 702 "704" 100 0 0 100 tintervalstart - )); DESCR("start of interval"); DATA(insert OID = 273 ( tintervalend PGUID 11 f t f 1 f 702 "704" 100 0 0 100 tintervalend - )); DESCR(""); @@ -717,11 +717,11 @@ DATA(insert OID = 341 ( poly_left PGUID 11 f t t 2 f 16 "604 604" 100 0 1 0 DESCR("is left of"); DATA(insert OID = 342 ( poly_overleft PGUID 11 f t t 2 f 16 "604 604" 100 0 1 0 poly_overleft - )); DESCR("overlaps, but does not extend to right of"); -DATA(insert OID = 343 ( poly_overright PGUID 11 f t t 2 f 16 "604 604" 100 0 1 0 poly_overright - )); +DATA(insert OID = 343 ( poly_overright PGUID 11 f t t 2 f 16 "604 604" 100 0 1 0 poly_overright - )); DESCR("overlaps, but does not extend to left of"); DATA(insert OID = 344 ( poly_right PGUID 11 f t t 2 f 16 "604 604" 100 0 1 0 poly_right - )); DESCR("is left of"); -DATA(insert OID = 345 ( poly_contained PGUID 11 f t t 2 f 16 "604 604" 100 0 1 0 poly_contained - )); +DATA(insert OID = 345 ( poly_contained PGUID 11 f t t 2 f 16 "604 604" 100 0 1 0 poly_contained - )); DESCR("contained in"); DATA(insert OID = 346 ( poly_overlap PGUID 11 f t t 2 f 16 "604 604" 100 0 1 0 poly_overlap - )); DESCR("overlaps"); @@ -746,7 +746,7 @@ DATA(insert OID = 355 ( btfloat8cmp PGUID 11 f t t 2 f 23 "701 701" 100 0 0 DESCR("btree less-equal-greater"); DATA(insert OID = 356 ( btoidcmp PGUID 11 f t t 2 f 23 "26 26" 100 0 0 100 btoidcmp - )); DESCR("btree less-equal-greater"); -DATA(insert OID = 404 ( btoidvectorcmp PGUID 11 f t t 2 f 23 "30 30" 100 0 0 100 btoidvectorcmp - )); +DATA(insert OID = 404 ( btoidvectorcmp PGUID 11 f t t 2 f 23 "30 30" 100 0 0 100 btoidvectorcmp - )); DESCR("btree less-equal-greater"); DATA(insert OID = 357 ( btabstimecmp PGUID 11 f t f 2 f 23 "702 702" 100 0 0 100 btabstimecmp - )); DESCR("btree less-equal-greater"); @@ -773,7 +773,7 @@ DATA(insert OID = 367 ( close_pb PGUID 11 f t t 2 f 600 "600 603" 100 0 0 1 DESCR("closest point on box"); DATA(insert OID = 368 ( close_sb PGUID 11 f t t 2 f 600 "601 603" 100 0 0 100 close_sb - )); DESCR("closest point to line segment on box"); -DATA(insert OID = 369 ( on_ps PGUID 11 f t t 2 f 16 "600 601" 100 0 0 100 on_ps - )); +DATA(insert OID = 369 ( on_ps PGUID 11 f t t 2 f 16 "600 601" 100 0 0 100 on_ps - )); DESCR("point contained in segment"); DATA(insert OID = 370 ( path_distance PGUID 11 f t t 2 f 701 "602 602" 100 0 1 0 path_distance - )); DESCR("distance between paths"); @@ -1267,13 +1267,13 @@ DATA(insert OID = 989 ( point_vert PGUID 11 f t t 2 f 16 "600 600" 100 0 0 DESCR("vertical?"); DATA(insert OID = 990 ( point_horiz PGUID 11 f t t 2 f 16 "600 600" 100 0 0 100 point_horiz - )); DESCR("horizontal?"); -DATA(insert OID = 991 ( point_distance PGUID 11 f t t 2 f 701 "600 600" 100 0 0 100 point_distance - )); +DATA(insert OID = 991 ( point_distance PGUID 11 f t t 2 f 701 "600 600" 100 0 0 100 point_distance - )); DESCR("distance between"); DATA(insert OID = 992 ( slope PGUID 11 f t t 2 f 701 "600 600" 100 0 0 100 point_slope - )); DESCR("slope between points"); DATA(insert OID = 993 ( lseg PGUID 11 f t t 2 f 601 "600 600" 100 0 0 100 lseg_construct - )); DESCR("convert points to line segment"); -DATA(insert OID = 994 ( lseg_intersect PGUID 11 f t t 2 f 16 "601 601" 100 0 0 100 lseg_intersect - )); +DATA(insert OID = 994 ( lseg_intersect PGUID 11 f t t 2 f 16 "601 601" 100 0 0 100 lseg_intersect - )); DESCR("intersects?"); DATA(insert OID = 995 ( lseg_parallel PGUID 11 f t t 2 f 16 "601 601" 100 0 0 100 lseg_parallel - )); DESCR("parallel?"); @@ -1406,7 +1406,7 @@ DESCR("divide"); DATA(insert OID = 1150 ( timestamp_in PGUID 11 f t f 1 f 1184 "0" 100 0 0 100 timestamp_in - )); DESCR("(internal)"); -DATA(insert OID = 1151 ( timestamp_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 timestamp_out - )); +DATA(insert OID = 1151 ( timestamp_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 timestamp_out - )); DESCR("(internal)"); DATA(insert OID = 1152 ( timestamp_eq PGUID 11 f t f 2 f 16 "1184 1184" 100 0 0 100 timestamp_eq - )); DESCR("equal"); @@ -1441,53 +1441,53 @@ DATA(insert OID = 1167 ( interval_gt PGUID 11 f t f 2 f 16 "1186 1186" 100 0 DESCR("greater-than"); DATA(insert OID = 1168 ( interval_um PGUID 11 f t f 1 f 1186 "1186" 100 0 0 100 interval_um - )); DESCR("subtract"); -DATA(insert OID = 1169 ( interval_pl PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100 interval_pl - )); +DATA(insert OID = 1169 ( interval_pl PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100 interval_pl - )); DESCR("addition"); -DATA(insert OID = 1170 ( interval_mi PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100 interval_mi - )); +DATA(insert OID = 1170 ( interval_mi PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100 interval_mi - )); DESCR("subtract"); DATA(insert OID = 1171 ( date_part PGUID 11 f t f 2 f 701 "25 1184" 100 0 0 100 timestamp_part - )); DESCR("extract field from timestamp"); DATA(insert OID = 1172 ( date_part PGUID 11 f t f 2 f 701 "25 1186" 100 0 0 100 interval_part - )); DESCR("extract field from interval"); -DATA(insert OID = 1173 ( timestamp PGUID 11 f t f 1 f 1184 "702" 100 0 0 100 abstime_timestamp - )); +DATA(insert OID = 1173 ( timestamp PGUID 11 f t f 1 f 1184 "702" 100 0 0 100 abstime_timestamp - )); DESCR("convert abstime to timestamp"); DATA(insert OID = 1174 ( timestamp PGUID 11 f t f 1 f 1184 "1082" 100 0 0 100 date_timestamp - )); DESCR("convert date to timestamp"); -DATA(insert OID = 1176 ( timestamp PGUID 11 f t f 2 f 1184 "1082 1083" 100 0 0 100 datetime_timestamp - )); +DATA(insert OID = 1176 ( timestamp PGUID 11 f t f 2 f 1184 "1082 1083" 100 0 0 100 datetime_timestamp - )); DESCR("convert date and time to timestamp"); -DATA(insert OID = 1177 ( interval PGUID 11 f t f 1 f 1186 "703" 100 0 0 100 reltime_interval - )); +DATA(insert OID = 1177 ( interval PGUID 11 f t f 1 f 1186 "703" 100 0 0 100 reltime_interval - )); DESCR("convert reltime to interval"); DATA(insert OID = 1178 ( date PGUID 11 f t f 1 f 1082 "1184" 100 0 0 100 timestamp_date - )); DESCR("convert timestamp to date"); -DATA(insert OID = 1179 ( date PGUID 11 f t f 1 f 1082 "702" 100 0 0 100 abstime_date - )); +DATA(insert OID = 1179 ( date PGUID 11 f t f 1 f 1082 "702" 100 0 0 100 abstime_date - )); DESCR("convert abstime to date"); DATA(insert OID = 1180 ( abstime PGUID 11 f t f 1 f 702 "1184" 100 0 0 100 timestamp_abstime - )); DESCR("convert timestamp to abstime"); DATA(insert OID = 1188 ( timestamp_mi PGUID 11 f t f 2 f 1186 "1184 1184" 100 0 0 100 timestamp_mi - )); DESCR("subtract"); -DATA(insert OID = 1189 ( timestamp_pl_span PGUID 11 f t f 2 f 1184 "1184 1186" 100 0 0 100 timestamp_pl_span - )); +DATA(insert OID = 1189 ( timestamp_pl_span PGUID 11 f t f 2 f 1184 "1184 1186" 100 0 0 100 timestamp_pl_span - )); DESCR("plus"); -DATA(insert OID = 1190 ( timestamp_mi_span PGUID 11 f t f 2 f 1184 "1184 1186" 100 0 0 100 timestamp_mi_span - )); +DATA(insert OID = 1190 ( timestamp_mi_span PGUID 11 f t f 2 f 1184 "1184 1186" 100 0 0 100 timestamp_mi_span - )); DESCR("minus"); DATA(insert OID = 1191 ( timestamp PGUID 11 f t f 1 f 1184 "25" 100 0 0 100 text_timestamp - )); DESCR("convert text to timestamp"); -DATA(insert OID = 1192 ( text PGUID 11 f t f 1 f 25 "1184" 100 0 0 100 timestamp_text - )); +DATA(insert OID = 1192 ( text PGUID 11 f t f 1 f 25 "1184" 100 0 0 100 timestamp_text - )); DESCR("convert timestamp to text"); -DATA(insert OID = 1193 ( text PGUID 11 f t f 1 f 25 "1186" 100 0 0 100 interval_text - )); +DATA(insert OID = 1193 ( text PGUID 11 f t f 1 f 25 "1186" 100 0 0 100 interval_text - )); DESCR("convert interval to text"); -DATA(insert OID = 1194 ( reltime PGUID 11 f t f 1 f 703 "1186" 100 0 0 100 interval_reltime - )); +DATA(insert OID = 1194 ( reltime PGUID 11 f t f 1 f 703 "1186" 100 0 0 100 interval_reltime - )); DESCR("convert interval to reltime"); -DATA(insert OID = 1195 ( timestamp_smaller PGUID 11 f t f 2 f 1184 "1184 1184" 100 0 0 100 timestamp_smaller - )); +DATA(insert OID = 1195 ( timestamp_smaller PGUID 11 f t f 2 f 1184 "1184 1184" 100 0 0 100 timestamp_smaller - )); DESCR("smaller of two"); DATA(insert OID = 1196 ( timestamp_larger PGUID 11 f t f 2 f 1184 "1184 1184" 100 0 0 100 timestamp_larger - )); DESCR("larger of two"); DATA(insert OID = 1197 ( interval_smaller PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100 interval_smaller - )); DESCR("smaller of two"); -DATA(insert OID = 1198 ( interval_larger PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100 interval_larger - )); +DATA(insert OID = 1198 ( interval_larger PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100 interval_larger - )); DESCR("larger of two"); -DATA(insert OID = 1199 ( age PGUID 11 f t f 2 f 1186 "1184 1184" 100 0 0 100 timestamp_age - )); +DATA(insert OID = 1199 ( age PGUID 11 f t f 2 f 1186 "1184 1184" 100 0 0 100 timestamp_age - )); DESCR("date difference preserving months and years"); /* OIDS 1200 - 1299 */ @@ -1527,7 +1527,7 @@ DESCR("convert text to interval"); DATA(insert OID = 1271 ( overlaps PGUID 11 f t t 4 f 16 "1266 1266 1266 1266" 100 0 1 0 overlaps_timetz - )); DESCR("SQL92 interval comparison"); -DATA(insert OID = 1272 ( datetime_pl PGUID 11 f t f 2 f 1184 "1082 1083" 100 0 0 100 datetime_timestamp - )); +DATA(insert OID = 1272 ( datetime_pl PGUID 11 f t f 2 f 1184 "1082 1083" 100 0 0 100 datetime_timestamp - )); DESCR("convert date and time to timestamp"); DATA(insert OID = 1274 ( int84pl PGUID 11 f t t 2 f 20 "20 23" 100 0 0 100 int84pl - )); @@ -1564,11 +1564,11 @@ DESCR("latest tid of a tuple"); DATA(insert OID = 1294 ( currtid2 PGUID 11 f t f 2 f 27 "25 27" 100 0 0 100 currtid_byrelname - )); DESCR("latest tid of a tuple"); -DATA(insert OID = 1296 ( timedate_pl PGUID 14 f t f 2 f 1184 "1083 1082" 100 0 0 100 "select datetime_pl($2, $1)" - )); +DATA(insert OID = 1296 ( timedate_pl PGUID 14 f t f 2 f 1184 "1083 1082" 100 0 0 100 "select datetime_pl($2, $1)" - )); DESCR("convert time and date to timestamp"); -DATA(insert OID = 1297 ( datetimetz_pl PGUID 11 f t f 2 f 1184 "1082 1266" 100 0 0 100 datetimetz_timestamp - )); +DATA(insert OID = 1297 ( datetimetz_pl PGUID 11 f t f 2 f 1184 "1082 1266" 100 0 0 100 datetimetz_timestamp - )); DESCR("convert date and time with time zone to timestamp"); -DATA(insert OID = 1298 ( timetzdate_pl PGUID 14 f t f 2 f 1184 "1266 1082" 100 0 0 100 "select datetimetz_pl($2, $1)" - )); +DATA(insert OID = 1298 ( timetzdate_pl PGUID 14 f t f 2 f 1184 "1266 1082" 100 0 0 100 "select datetimetz_pl($2, $1)" - )); DESCR("convert time with time zone and date to timestamp"); DATA(insert OID = 1299 ( now PGUID 11 f t f 0 f 1184 "0" 100 0 0 100 now - )); DESCR("current transaction time"); @@ -1584,22 +1584,22 @@ DESCR("restriction selectivity for containment comparison operators"); DATA(insert OID = 1303 ( contjoinsel PGUID 11 f t f 5 f 701 "26 26 21 26 21" 100 0 0 100 contjoinsel - )); DESCR("join selectivity for containment comparison operators"); -DATA(insert OID = 1304 ( overlaps PGUID 11 f t t 4 f 16 "1184 1184 1184 1184" 100 0 1 0 overlaps_timestamp - )); +DATA(insert OID = 1304 ( overlaps PGUID 11 f t t 4 f 16 "1184 1184 1184 1184" 100 0 1 0 overlaps_timestamp - )); DESCR("SQL92 interval comparison"); -DATA(insert OID = 1305 ( overlaps PGUID 14 f t t 4 f 16 "1184 1186 1184 1186" 100 0 1 0 "select overlaps($1, ($1 + $2), $3, ($3 + $4))" - )); +DATA(insert OID = 1305 ( overlaps PGUID 14 f t t 4 f 16 "1184 1186 1184 1186" 100 0 1 0 "select overlaps($1, ($1 + $2), $3, ($3 + $4))" - )); DESCR("SQL92 interval comparison"); -DATA(insert OID = 1306 ( overlaps PGUID 14 f t t 4 f 16 "1184 1184 1184 1186" 100 0 1 0 "select overlaps($1, $2, $3, ($3 + $4))" - )); +DATA(insert OID = 1306 ( overlaps PGUID 14 f t t 4 f 16 "1184 1184 1184 1186" 100 0 1 0 "select overlaps($1, $2, $3, ($3 + $4))" - )); DESCR("SQL92 interval comparison"); -DATA(insert OID = 1307 ( overlaps PGUID 14 f t t 4 f 16 "1184 1186 1184 1184" 100 0 1 0 "select overlaps($1, ($1 + $2), $3, $4)" - )); +DATA(insert OID = 1307 ( overlaps PGUID 14 f t t 4 f 16 "1184 1186 1184 1184" 100 0 1 0 "select overlaps($1, ($1 + $2), $3, $4)" - )); DESCR("SQL92 interval comparison"); -DATA(insert OID = 1308 ( overlaps PGUID 11 f t t 4 f 16 "1083 1083 1083 1083" 100 0 1 0 overlaps_time - )); +DATA(insert OID = 1308 ( overlaps PGUID 11 f t t 4 f 16 "1083 1083 1083 1083" 100 0 1 0 overlaps_time - )); DESCR("SQL92 interval comparison"); -DATA(insert OID = 1309 ( overlaps PGUID 14 f t t 4 f 16 "1083 1186 1083 1186" 100 0 1 0 "select overlaps($1, ($1 + $2), $3, ($3 + $4))" - )); +DATA(insert OID = 1309 ( overlaps PGUID 14 f t t 4 f 16 "1083 1186 1083 1186" 100 0 1 0 "select overlaps($1, ($1 + $2), $3, ($3 + $4))" - )); DESCR("SQL92 interval comparison"); -DATA(insert OID = 1310 ( overlaps PGUID 14 f t t 4 f 16 "1083 1083 1083 1186" 100 0 1 0 "select overlaps($1, $2, $3, ($3 + $4))" - )); +DATA(insert OID = 1310 ( overlaps PGUID 14 f t t 4 f 16 "1083 1083 1083 1186" 100 0 1 0 "select overlaps($1, $2, $3, ($3 + $4))" - )); DESCR("SQL92 interval comparison"); -DATA(insert OID = 1311 ( overlaps PGUID 14 f t t 4 f 16 "1083 1186 1083 1083" 100 0 1 0 "select overlaps($1, ($1 + $2), $3, $4)" - )); +DATA(insert OID = 1311 ( overlaps PGUID 14 f t t 4 f 16 "1083 1186 1083 1083" 100 0 1 0 "select overlaps($1, ($1 + $2), $3, $4)" - )); DESCR("SQL92 interval comparison"); DATA(insert OID = 1314 ( timestamp_cmp PGUID 11 f t f 2 f 23 "1184 1184" 100 0 0 100 timestamp_cmp - )); @@ -1662,7 +1662,7 @@ DATA(insert OID = 1357 ( timetz_gt PGUID 11 f t t 2 f 16 "1266 1266" 100 0 DESCR("greater-than"); DATA(insert OID = 1358 ( timetz_cmp PGUID 11 f t t 2 f 23 "1266 1266" 100 0 0 100 timetz_cmp - )); DESCR("less-equal-greater"); -DATA(insert OID = 1359 ( timestamp PGUID 11 f t f 2 f 1184 "1082 1266" 100 0 0 100 datetimetz_timestamp - )); +DATA(insert OID = 1359 ( timestamp PGUID 11 f t f 2 f 1184 "1082 1266" 100 0 0 100 datetimetz_timestamp - )); DESCR("convert date and time with time zone to timestamp"); DATA(insert OID = 1362 ( time PGUID 14 f t t 1 f 1083 "1083" 100 0 0 100 "select $1" - )); @@ -1697,7 +1697,7 @@ DATA(insert OID = 1377 ( time_larger PGUID 11 f t t 2 f 1083 "1083 1083" 100 DESCR("larger of two"); DATA(insert OID = 1378 ( time_smaller PGUID 11 f t t 2 f 1083 "1083 1083" 100 0 0 100 time_smaller - )); DESCR("smaller of two"); -DATA(insert OID = 1379 ( timetz_larger PGUID 11 f t t 2 f 1083 "1266 1266" 100 0 0 100 timetz_larger - )); +DATA(insert OID = 1379 ( timetz_larger PGUID 11 f t t 2 f 1083 "1266 1266" 100 0 0 100 timetz_larger - )); DESCR("larger of two"); DATA(insert OID = 1380 ( timetz_smaller PGUID 11 f t t 2 f 1083 "1266 1266" 100 0 0 100 timetz_smaller - )); DESCR("smaller of two"); @@ -1760,17 +1760,17 @@ DESCR("convert (no-op)"); DATA(insert OID = 1405 ( int4 PGUID 14 f t t 1 f 23 "23" 100 0 0 100 "select $1" - )); DESCR("convert (no-op)"); -DATA(insert OID = 1406 ( isvertical PGUID 11 f t t 2 f 16 "600 600" 100 0 0 100 point_vert - )); +DATA(insert OID = 1406 ( isvertical PGUID 11 f t t 2 f 16 "600 600" 100 0 0 100 point_vert - )); DESCR("vertical?"); -DATA(insert OID = 1407 ( ishorizontal PGUID 11 f t t 2 f 16 "600 600" 100 0 0 100 point_horiz - )); +DATA(insert OID = 1407 ( ishorizontal PGUID 11 f t t 2 f 16 "600 600" 100 0 0 100 point_horiz - )); DESCR("horizontal?"); -DATA(insert OID = 1408 ( isparallel PGUID 11 f t t 2 f 16 "601 601" 100 0 0 100 lseg_parallel - )); +DATA(insert OID = 1408 ( isparallel PGUID 11 f t t 2 f 16 "601 601" 100 0 0 100 lseg_parallel - )); DESCR("parallel?"); -DATA(insert OID = 1409 ( isperp PGUID 11 f t t 2 f 16 "601 601" 100 0 0 100 lseg_perp - )); +DATA(insert OID = 1409 ( isperp PGUID 11 f t t 2 f 16 "601 601" 100 0 0 100 lseg_perp - )); DESCR("perpendicular?"); -DATA(insert OID = 1410 ( isvertical PGUID 11 f t t 1 f 16 "601" 100 0 0 100 lseg_vertical - )); +DATA(insert OID = 1410 ( isvertical PGUID 11 f t t 1 f 16 "601" 100 0 0 100 lseg_vertical - )); DESCR("vertical?"); -DATA(insert OID = 1411 ( ishorizontal PGUID 11 f t t 1 f 16 "601" 100 0 0 100 lseg_horizontal - )); +DATA(insert OID = 1411 ( ishorizontal PGUID 11 f t t 1 f 16 "601" 100 0 0 100 lseg_horizontal - )); DESCR("horizontal?"); DATA(insert OID = 1412 ( isparallel PGUID 11 f t t 2 f 16 "628 628" 100 0 0 100 line_parallel - )); DESCR("lines parallel?"); @@ -1797,7 +1797,7 @@ DATA(insert OID = 1426 ( path_contain_pt PGUID 14 f t t 2 f 16 "602 600" 100 0 DESCR("path contains point?"); DATA(insert OID = 1428 ( poly_contain_pt PGUID 11 f t t 2 f 16 "604 600" 100 0 0 100 poly_contain_pt - )); DESCR("polygon contains point?"); -DATA(insert OID = 1429 ( pt_contained_poly PGUID 11 f t t 2 f 16 "600 604" 100 0 0 100 pt_contained_poly - )); +DATA(insert OID = 1429 ( pt_contained_poly PGUID 11 f t t 2 f 16 "600 604" 100 0 0 100 pt_contained_poly - )); DESCR("point contained by polygon?"); DATA(insert OID = 1430 ( isclosed PGUID 11 f t t 1 f 16 "602" 100 0 0 100 path_isclosed - )); @@ -1902,9 +1902,9 @@ DATA(insert OID = 1475 ( polygon PGUID 11 f t t 2 f 604 "23 718" 100 0 1 0 c DESCR("convert vertex count and circle to polygon"); DATA(insert OID = 1476 ( dist_pc PGUID 11 f t t 2 f 701 "600 718" 100 0 1 0 dist_pc - )); DESCR("distance between point and circle"); -DATA(insert OID = 1477 ( circle_contain_pt PGUID 11 f t t 2 f 16 "718 600" 100 0 0 100 circle_contain_pt - )); +DATA(insert OID = 1477 ( circle_contain_pt PGUID 11 f t t 2 f 16 "718 600" 100 0 0 100 circle_contain_pt - )); DESCR("circle contains point?"); -DATA(insert OID = 1478 ( pt_contained_circle PGUID 11 f t t 2 f 16 "600 718" 100 0 0 100 pt_contained_circle - )); +DATA(insert OID = 1478 ( pt_contained_circle PGUID 11 f t t 2 f 16 "600 718" 100 0 0 100 pt_contained_circle - )); DESCR("point inside circle?"); DATA(insert OID = 1479 ( circle PGUID 11 f t t 1 f 718 "603" 100 0 1 0 box_circle - )); DESCR("convert box to circle"); @@ -1955,7 +1955,7 @@ DESCR("lines horizontal?"); DATA(insert OID = 1530 ( length PGUID 11 f t t 1 f 701 "601" 100 0 1 0 lseg_length - )); DESCR("distance between endpoints"); -DATA(insert OID = 1531 ( length PGUID 11 f t t 1 f 701 "602" 100 0 1 0 path_length - )); +DATA(insert OID = 1531 ( length PGUID 11 f t t 1 f 701 "602" 100 0 1 0 path_length - )); DESCR("sum of path segments"); @@ -1982,7 +1982,7 @@ DESCR("number of points in polygon"); DATA(insert OID = 1564 ( zpbit_in PGUID 11 f t t 1 f 1560 "0" 100 0 0 100 zpbit_in - )); DESCR("(internal)"); -DATA(insert OID = 1565 ( zpbit_out PGUID 11 f t t 1 f 23 "0" 100 0 0 100 zpbit_out - )); +DATA(insert OID = 1565 ( zpbit_out PGUID 11 f t t 1 f 23 "0" 100 0 0 100 zpbit_out - )); DESCR("(internal)"); DATA(insert OID = 1569 ( like PGUID 11 f t t 2 f 16 "25 25" 100 0 1 0 textlike - )); @@ -1998,16 +1998,16 @@ DESCR("convert int8 to int8 (no-op)"); /* SEQUENCEs nextval & currval functions */ -DATA(insert OID = 1574 ( nextval PGUID 11 f t f 1 f 23 "25" 100 0 0 100 nextval - )); +DATA(insert OID = 1574 ( nextval PGUID 11 f t f 1 f 23 "25" 100 0 0 100 nextval - )); DESCR("sequence next value"); -DATA(insert OID = 1575 ( currval PGUID 11 f t f 1 f 23 "25" 100 0 0 100 currval - )); +DATA(insert OID = 1575 ( currval PGUID 11 f t f 1 f 23 "25" 100 0 0 100 currval - )); DESCR("sequence current value"); DATA(insert OID = 1576 ( setval PGUID 11 f t f 2 f 23 "25 23" 100 0 0 100 setval - )); DESCR("sequence set value"); DATA(insert OID = 1579 ( varbit_in PGUID 11 f t t 1 f 1562 "0" 100 0 0 100 varbit_in - )); DESCR("(internal)"); -DATA(insert OID = 1580 ( varbit_out PGUID 11 f t t 1 f 23 "0" 100 0 0 100 varbit_out - )); +DATA(insert OID = 1580 ( varbit_out PGUID 11 f t t 1 f 23 "0" 100 0 0 100 varbit_out - )); DESCR("(internal)"); DATA(insert OID = 1581 ( biteq PGUID 11 f t t 2 f 16 "1560 1560" 100 0 1 0 biteq - )); @@ -2025,9 +2025,9 @@ DESCR("less than"); DATA(insert OID = 1596 ( bitcmp PGUID 11 f t t 2 f 23 "1560 1560" 100 0 1 0 bitcmp - )); DESCR("compare"); -DATA(insert OID = 1598 ( random PGUID 11 f t f 0 f 701 "0" 100 0 0 100 drandom - )); +DATA(insert OID = 1598 ( random PGUID 11 f t f 0 f 701 "0" 100 0 0 100 drandom - )); DESCR("radians to degrees"); -DATA(insert OID = 1599 ( setseed PGUID 11 f t t 1 f 23 "701" 100 0 0 100 setseed - )); +DATA(insert OID = 1599 ( setseed PGUID 11 f t t 1 f 23 "701" 100 0 0 100 setseed - )); DESCR("radians to degrees"); /* OIDS 1600 - 1699 */ @@ -2052,55 +2052,55 @@ DATA(insert OID = 1608 ( degrees PGUID 11 f t t 1 f 701 "701" 100 0 0 100 de DESCR("radians to degrees"); DATA(insert OID = 1609 ( radians PGUID 11 f t t 1 f 701 "701" 100 0 0 100 radians - )); DESCR("radians to degrees"); -DATA(insert OID = 1610 ( pi PGUID 11 f t t 0 f 701 "0" 100 0 0 100 dpi - )); +DATA(insert OID = 1610 ( pi PGUID 11 f t t 0 f 701 "0" 100 0 0 100 dpi - )); DESCR("PI"); -DATA(insert OID = 1618 ( interval_mul PGUID 11 f t t 2 f 1186 "1186 701" 100 0 0 100 interval_mul - )); +DATA(insert OID = 1618 ( interval_mul PGUID 11 f t t 2 f 1186 "1186 701" 100 0 0 100 interval_mul - )); DESCR("multiply interval"); DATA(insert OID = 1619 ( varchar PGUID 11 f t t 1 f 1043 "23" 100 0 0 100 int4_text - )); DESCR("convert int4 to varchar"); -DATA(insert OID = 1620 ( ascii PGUID 11 f t t 1 f 23 "25" 100 0 0 100 ascii - )); +DATA(insert OID = 1620 ( ascii PGUID 11 f t t 1 f 23 "25" 100 0 0 100 ascii - )); DESCR("convert first char to int4"); -DATA(insert OID = 1621 ( ichar PGUID 11 f t t 1 f 25 "23" 100 0 0 100 ichar - )); +DATA(insert OID = 1621 ( ichar PGUID 11 f t t 1 f 25 "23" 100 0 0 100 ichar - )); DESCR("convert int4 to char"); DATA(insert OID = 1622 ( repeat PGUID 11 f t t 2 f 25 "25 23" 100 0 0 100 repeat - )); DESCR("replicate string int4 times"); DATA(insert OID = 1623 ( varchar PGUID 11 f t t 1 f 1043 "20" 100 0 0 100 int8_text - )); DESCR("convert int8 to varchar"); -DATA(insert OID = 1624 ( mul_d_interval PGUID 11 f t t 2 f 1186 "701 1186" 100 0 0 100 mul_d_interval - )); +DATA(insert OID = 1624 ( mul_d_interval PGUID 11 f t t 2 f 1186 "701 1186" 100 0 0 100 mul_d_interval - )); /* OID's 1625 - 1639 LZTEXT data type */ -DATA(insert OID = 1626 ( lztextin PGUID 11 f t t 1 f 1625 "0" 100 0 0 100 lztextin - )); +DATA(insert OID = 1626 ( lztextin PGUID 11 f t t 1 f 1625 "0" 100 0 0 100 lztextin - )); DESCR("(internal)"); -DATA(insert OID = 1627 ( lztextout PGUID 11 f t t 1 f 23 "0" 100 0 0 100 lztextout - )); +DATA(insert OID = 1627 ( lztextout PGUID 11 f t t 1 f 23 "0" 100 0 0 100 lztextout - )); DESCR("(internal)"); -DATA(insert OID = 1629 ( text PGUID 11 f t t 1 f 25 "1625" 100 0 0 100 lztext_text -)); +DATA(insert OID = 1629 ( text PGUID 11 f t t 1 f 25 "1625" 100 0 0 100 lztext_text -)); DESCR("convert lztext to text"); -DATA(insert OID = 1631 ( lztext PGUID 11 f t t 1 f 1625 "25" 100 0 0 100 text_lztext -)); +DATA(insert OID = 1631 ( lztext PGUID 11 f t t 1 f 1625 "25" 100 0 0 100 text_lztext -)); DESCR("convert text to lztext"); -DATA(insert OID = 1632 ( lztext PGUID 14 f t t 1 f 1625 "1625" 100 0 0 100 "select $1" -)); +DATA(insert OID = 1632 ( lztext PGUID 14 f t t 1 f 1625 "1625" 100 0 0 100 "select $1" -)); DESCR("convert text to lztext"); -DATA(insert OID = 1633 ( char_length PGUID 11 f t t 1 f 23 "1625" 100 0 1 0 lztextlen - )); +DATA(insert OID = 1633 ( char_length PGUID 11 f t t 1 f 23 "1625" 100 0 1 0 lztextlen - )); DESCR("length"); -DATA(insert OID = 1634 ( length PGUID 11 f t t 1 f 23 "1625" 100 0 1 0 lztextlen - )); +DATA(insert OID = 1634 ( length PGUID 11 f t t 1 f 23 "1625" 100 0 1 0 lztextlen - )); DESCR("length"); -DATA(insert OID = 1635 ( octet_length PGUID 11 f t t 1 f 23 "1625" 100 0 1 0 lztextoctetlen - )); +DATA(insert OID = 1635 ( octet_length PGUID 11 f t t 1 f 23 "1625" 100 0 1 0 lztextoctetlen - )); DESCR("octet length"); -DATA(insert OID = 1636 ( lztext_cmp PGUID 11 f t t 2 f 23 "1625 1625" 100 0 1 0 lztext_cmp - )); +DATA(insert OID = 1636 ( lztext_cmp PGUID 11 f t t 2 f 23 "1625 1625" 100 0 1 0 lztext_cmp - )); DESCR("compare lztext"); -DATA(insert OID = 1637 ( lztext_eq PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_eq - )); +DATA(insert OID = 1637 ( lztext_eq PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_eq - )); DESCR("equal"); -DATA(insert OID = 1638 ( lztext_ne PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_ne - )); +DATA(insert OID = 1638 ( lztext_ne PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_ne - )); DESCR("not equal"); -DATA(insert OID = 1639 ( lztext_gt PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_gt - )); +DATA(insert OID = 1639 ( lztext_gt PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_gt - )); DESCR("greater-than"); -DATA(insert OID = 1664 ( lztext_ge PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_ge - )); +DATA(insert OID = 1664 ( lztext_ge PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_ge - )); DESCR("greater-than-or-equal"); -DATA(insert OID = 1665 ( lztext_lt PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_lt - )); +DATA(insert OID = 1665 ( lztext_lt PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_lt - )); DESCR("less-than"); -DATA(insert OID = 1656 ( lztext_le PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_le - )); +DATA(insert OID = 1656 ( lztext_le PGUID 11 f t t 2 f 16 "1625 1625" 100 0 1 0 lztext_le - )); DESCR("less-than-or-equal"); /* Oracle Compatibility Related Functions - By Edmund Mergl <E.Mergl@bawue.de> */ @@ -2160,15 +2160,15 @@ DATA(insert OID = 1643 ( pg_get_indexdef PGUID 11 f t f 1 f 25 "26" 100 0 0 DESCR("index description"); /* Generic referential integrity constraint triggers */ -DATA(insert OID = 1644 ( RI_FKey_check_ins PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_check_ins - )); +DATA(insert OID = 1644 ( RI_FKey_check_ins PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_check_ins - )); DESCR("referential integrity FOREIGN KEY ... REFERENCES"); -DATA(insert OID = 1645 ( RI_FKey_check_upd PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_check_upd - )); +DATA(insert OID = 1645 ( RI_FKey_check_upd PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_check_upd - )); DESCR("referential integrity FOREIGN KEY ... REFERENCES"); -DATA(insert OID = 1646 ( RI_FKey_cascade_del PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_cascade_del - )); +DATA(insert OID = 1646 ( RI_FKey_cascade_del PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_cascade_del - )); DESCR("referential integrity ON DELETE CASCADE"); -DATA(insert OID = 1647 ( RI_FKey_cascade_upd PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_cascade_upd - )); +DATA(insert OID = 1647 ( RI_FKey_cascade_upd PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_cascade_upd - )); DESCR("referential integrity ON UPDATE CASCADE"); -DATA(insert OID = 1648 ( RI_FKey_restrict_del PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_restrict_del - )); +DATA(insert OID = 1648 ( RI_FKey_restrict_del PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_restrict_del - )); DESCR("referential integrity ON DELETE RESTRICT"); DATA(insert OID = 1649 ( RI_FKey_restrict_upd PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_restrict_upd - )); DESCR("referential integrity ON UPDATE RESTRICT"); @@ -2180,9 +2180,9 @@ DATA(insert OID = 1652 ( RI_FKey_setdefault_del PGUID 11 f t f 0 f 0 "" 100 0 0 DESCR("referential integrity ON DELETE SET DEFAULT"); DATA(insert OID = 1653 ( RI_FKey_setdefault_upd PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_setdefault_upd - )); DESCR("referential integrity ON UPDATE SET DEFAULT"); -DATA(insert OID = 1654 ( RI_FKey_noaction_del PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_noaction_del - )); +DATA(insert OID = 1654 ( RI_FKey_noaction_del PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_noaction_del - )); DESCR("referential integrity ON DELETE NO ACTION"); -DATA(insert OID = 1655 ( RI_FKey_noaction_upd PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_noaction_upd - )); +DATA(insert OID = 1655 ( RI_FKey_noaction_upd PGUID 11 f t f 0 f 0 "" 100 0 0 100 RI_FKey_noaction_upd - )); DESCR("referential integrity ON UPDATE NO ACTION"); DATA(insert OID = 1666 ( varbiteq PGUID 11 f t t 2 f 16 "1562 1562" 100 0 1 0 varbiteq - )); @@ -2383,7 +2383,7 @@ DATA(insert OID = 1739 ( numeric_power PGUID 11 f t t 2 f 1700 "1700 1700" 100 DESCR("m raised to the power of n"); DATA(insert OID = 1740 ( numeric PGUID 11 f t t 1 f 1700 "23" 100 0 0 100 int4_numeric - )); DESCR("(internal)"); -DATA(insert OID = 1741 ( log PGUID 14 f t t 1 f 1700 "1700" 100 0 0 100 "select log(10, $1)" - )); +DATA(insert OID = 1741 ( log PGUID 14 f t t 1 f 1700 "1700" 100 0 0 100 "select log(10, $1)" - )); DESCR("logarithm base 10 of n"); DATA(insert OID = 1742 ( numeric PGUID 11 f t t 1 f 1700 "700" 100 0 0 100 float4_numeric - )); DESCR("(internal)"); @@ -2417,23 +2417,23 @@ DATA(insert OID = 1783 ( int2 PGUID 11 f t t 1 f 21 "1700" 100 0 0 100 nume DESCR("(internal)"); /* formatting */ -DATA(insert OID = 1770 ( to_char PGUID 11 f t f 2 f 25 "1184 25" 100 0 0 100 timestamp_to_char - )); +DATA(insert OID = 1770 ( to_char PGUID 11 f t f 2 f 25 "1184 25" 100 0 0 100 timestamp_to_char - )); DESCR("format timestamp to text"); -DATA(insert OID = 1772 ( to_char PGUID 11 f t f 2 f 25 "1700 25" 100 0 0 100 numeric_to_char - )); +DATA(insert OID = 1772 ( to_char PGUID 11 f t f 2 f 25 "1700 25" 100 0 0 100 numeric_to_char - )); DESCR("format numeric to text"); -DATA(insert OID = 1773 ( to_char PGUID 11 f t f 2 f 25 "23 25" 100 0 0 100 int4_to_char - )); +DATA(insert OID = 1773 ( to_char PGUID 11 f t f 2 f 25 "23 25" 100 0 0 100 int4_to_char - )); DESCR("format int4 to text"); -DATA(insert OID = 1774 ( to_char PGUID 11 f t f 2 f 25 "20 25" 100 0 0 100 int8_to_char - )); +DATA(insert OID = 1774 ( to_char PGUID 11 f t f 2 f 25 "20 25" 100 0 0 100 int8_to_char - )); DESCR("format int8 to text"); -DATA(insert OID = 1775 ( to_char PGUID 11 f t f 2 f 25 "700 25" 100 0 0 100 float4_to_char - )); +DATA(insert OID = 1775 ( to_char PGUID 11 f t f 2 f 25 "700 25" 100 0 0 100 float4_to_char - )); DESCR("format float4 to text"); -DATA(insert OID = 1776 ( to_char PGUID 11 f t f 2 f 25 "701 25" 100 0 0 100 float8_to_char - )); +DATA(insert OID = 1776 ( to_char PGUID 11 f t f 2 f 25 "701 25" 100 0 0 100 float8_to_char - )); DESCR("format float8 to text"); -DATA(insert OID = 1777 ( to_number PGUID 11 f t f 2 f 1700 "25 25" 100 0 0 100 numeric_to_number - )); +DATA(insert OID = 1777 ( to_number PGUID 11 f t f 2 f 1700 "25 25" 100 0 0 100 numeric_to_number - )); DESCR("convert text to numeric"); -DATA(insert OID = 1778 ( to_timestamp PGUID 11 f t f 2 f 1184 "25 25" 100 0 0 100 to_timestamp - )); +DATA(insert OID = 1778 ( to_timestamp PGUID 11 f t f 2 f 1184 "25 25" 100 0 0 100 to_timestamp - )); DESCR("convert text to timestamp"); -DATA(insert OID = 1780 ( to_date PGUID 11 f t f 2 f 1082 "25 25" 100 0 0 100 to_date - )); +DATA(insert OID = 1780 ( to_date PGUID 11 f t f 2 f 1082 "25 25" 100 0 0 100 to_date - )); DESCR("convert text to date"); @@ -2457,4 +2457,3 @@ extern Oid ProcedureCreate(char *procedureName, #endif /* PG_PROC_H */ - diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h index e863acc0957..77c89e6b144 100644 --- a/src/include/catalog/pg_statistic.h +++ b/src/include/catalog/pg_statistic.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_statistic.h,v 1.8 2000/01/26 05:57:58 momjian Exp $ + * $Id: pg_statistic.h,v 1.9 2000/04/12 17:16:29 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -37,20 +37,29 @@ CATALOG(pg_statistic) Oid starelid; /* relation containing attribute */ int2 staattnum; /* attribute (column) stats are for */ Oid staop; /* '<' comparison op used for lo/hi vals */ - /* Note: the current VACUUM code will never produce more than one entry - * per column, but in theory there could be multiple entries if a datatype - * has more than one useful ordering operator. Also, the current code - * will not write an entry unless it found at least one non-NULL value - * in the column; so the remaining fields will never be NULL. + + /* + * Note: the current VACUUM code will never produce more than one + * entry per column, but in theory there could be multiple entries if + * a datatype has more than one useful ordering operator. Also, the + * current code will not write an entry unless it found at least one + * non-NULL value in the column; so the remaining fields will never be + * NULL. */ - /* These fields contain the stats about the column indicated by the key */ - float4 stanullfrac; /* the fraction of the entries that are NULL */ - float4 stacommonfrac; /* the fraction that are the most common val */ + /* + * These fields contain the stats about the column indicated by the + * key + */ + float4 stanullfrac; /* the fraction of the entries that are + * NULL */ + float4 stacommonfrac; /* the fraction that are the most common + * val */ - /* THE REST OF THESE ARE VARIABLE LENGTH FIELDS. - * They cannot be accessed as C struct entries; you have to use the - * full field access machinery (heap_getattr) for them. + /* + * THE REST OF THESE ARE VARIABLE LENGTH FIELDS. They cannot be + * accessed as C struct entries; you have to use the full field access + * machinery (heap_getattr) for them. * * All three of these are text representations of data values of the * column's data type. To re-create the actual Datum, do @@ -77,7 +86,7 @@ typedef FormData_pg_statistic *Form_pg_statistic; #define Anum_pg_statistic_staattnum 2 #define Anum_pg_statistic_staop 3 #define Anum_pg_statistic_stanullfrac 4 -#define Anum_pg_statistic_stacommonfrac 5 +#define Anum_pg_statistic_stacommonfrac 5 #define Anum_pg_statistic_stacommonval 6 #define Anum_pg_statistic_staloval 7 #define Anum_pg_statistic_stahival 8 diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h index 76e28d2df10..cb1af718bed 100644 --- a/src/include/catalog/pg_trigger.h +++ b/src/include/catalog/pg_trigger.h @@ -35,12 +35,13 @@ CATALOG(pg_trigger) BOOTSTRAP int2 tgtype; /* BEFORE/AFTER UPDATE/DELETE/INSERT * ROW/STATEMENT */ bool tgenabled; /* trigger is enabled/disabled */ - bool tgisconstraint; /* trigger is a RI constraint */ + bool tgisconstraint; /* trigger is a RI constraint */ NameData tgconstrname; /* RI constraint name */ Oid tgconstrrelid; /* RI table of foreign key definition */ - /* in the case of ON DELETE or ON UPDATE */ + + /* in the case of ON DELETE or ON UPDATE */ bool tgdeferrable; /* RI trigger is deferrable */ - bool tginitdeferred; /* RI trigger is deferred initially */ + bool tginitdeferred; /* RI trigger is deferred initially */ int2 tgnargs; /* # of extra arguments in tgargs */ int2vector tgattr; /* UPDATE of attr1, attr2 ... (NI) */ bytea tgargs; /* first\000second\000tgnargs\000 */ diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index 61bbfeab858..3f8665ebe1e 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_type.h,v 1.87 2000/04/08 02:13:01 thomas Exp $ + * $Id: pg_type.h,v 1.88 2000/04/12 17:16:29 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -314,7 +314,7 @@ DATA(insert OID = 1001 ( _bytea PGUID -1 -1 f b t \054 0 17 array_in array_ou DATA(insert OID = 1002 ( _char PGUID -1 -1 f b t \054 0 18 array_in array_out array_in array_out i _null_ )); DATA(insert OID = 1003 ( _name PGUID -1 -1 f b t \054 0 19 array_in array_out array_in array_out i _null_ )); DATA(insert OID = 1005 ( _int2 PGUID -1 -1 f b t \054 0 21 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1006 ( _int2vector PGUID -1 -1 f b t \054 0 22 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1006 ( _int2vector PGUID -1 -1 f b t \054 0 22 array_in array_out array_in array_out i _null_ )); DATA(insert OID = 1007 ( _int4 PGUID -1 -1 f b t \054 0 23 array_in array_out array_in array_out i _null_ )); DATA(insert OID = 1008 ( _regproc PGUID -1 -1 f b t \054 0 24 array_in array_out array_in array_out i _null_ )); DATA(insert OID = 1009 ( _text PGUID -1 -1 f b t \054 0 25 array_in array_out array_in array_out i _null_ )); @@ -325,7 +325,7 @@ DATA(insert OID = 1012 ( _cid PGUID -1 -1 f b t \054 0 29 array_in array_out DATA(insert OID = 1013 ( _oidvector PGUID -1 -1 f b t \054 0 30 array_in array_out array_in array_out i _null_ )); DATA(insert OID = 1014 ( _bpchar PGUID -1 -1 f b t \054 0 1042 array_in array_out array_in array_out i _null_ )); DATA(insert OID = 1015 ( _varchar PGUID -1 -1 f b t \054 0 1043 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1016 ( _int8 PGUID -1 -1 f b t \054 0 20 array_in array_out array_in array_out d _null_ )); +DATA(insert OID = 1016 ( _int8 PGUID -1 -1 f b t \054 0 20 array_in array_out array_in array_out d _null_ )); DATA(insert OID = 1017 ( _point PGUID -1 -1 f b t \054 0 600 array_in array_out array_in array_out d _null_ )); DATA(insert OID = 1018 ( _lseg PGUID -1 -1 f b t \054 0 601 array_in array_out array_in array_out d _null_ )); DATA(insert OID = 1019 ( _path PGUID -1 -1 f b t \054 0 602 array_in array_out array_in array_out d _null_ )); @@ -342,7 +342,7 @@ DATA(insert OID = 1027 ( _polygon PGUID -1 -1 f b t \054 0 604 array_in array * Thanks to some padding, this will be 8 on all platforms. * We also have an Assert to make sure. */ -#define ACLITEMSIZE 8 +#define ACLITEMSIZE 8 DATA(insert OID = 1033 ( aclitem PGUID 8 -1 f b t \054 0 0 aclitemin aclitemout aclitemin aclitemout i _null_ )); DESCR("access control list"); DATA(insert OID = 1034 ( _aclitem PGUID -1 -1 f b t \054 0 1033 array_in array_out array_in array_out i _null_ )); @@ -369,33 +369,33 @@ DATA(insert OID = 1183 ( _time PGUID -1 -1 f b t \054 0 1083 array_in array_ou DATA(insert OID = 1184 ( timestamp PGUID 8 47 f b t \054 0 0 timestamp_in timestamp_out timestamp_in timestamp_out d _null_ )); DESCR("date and time"); #define TIMESTAMPOID 1184 -DATA(insert OID = 1185 ( _timestamp PGUID -1 -1 f b t \054 0 1184 array_in array_out array_in array_out d _null_ )); +DATA(insert OID = 1185 ( _timestamp PGUID -1 -1 f b t \054 0 1184 array_in array_out array_in array_out d _null_ )); DATA(insert OID = 1186 ( interval PGUID 12 47 f b t \054 0 0 interval_in interval_out interval_in interval_out d _null_ )); DESCR("@ <number> <units>, time interval"); #define INTERVALOID 1186 DATA(insert OID = 1187 ( _interval PGUID -1 -1 f b t \054 0 1186 array_in array_out array_in array_out d _null_ )); /* OIDS 1200 - 1299 */ -DATA(insert OID = 1231 ( _numeric PGUID -1 -1 f b t \054 0 1700 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1231 ( _numeric PGUID -1 -1 f b t \054 0 1700 array_in array_out array_in array_out i _null_ )); DATA(insert OID = 1266 ( timetz PGUID 12 22 f b t \054 0 0 timetz_in timetz_out timetz_in timetz_out d _null_ )); DESCR("hh:mm:ss, ANSI SQL time"); #define TIMETZOID 1266 DATA(insert OID = 1270 ( _timetz PGUID -1 -1 f b t \054 0 1266 array_in array_out array_in array_out d _null_ )); /* OIDS 1500 - 1599 */ -DATA(insert OID = 1560 ( bit PGUID -1 -1 f b t \054 0 0 zpbit_in zpbit_out zpbit_in zpbit_out i _null_ )); +DATA(insert OID = 1560 ( bit PGUID -1 -1 f b t \054 0 0 zpbit_in zpbit_out zpbit_in zpbit_out i _null_ )); DESCR("fixed-length bit string"); -#define ZPBITOID 1560 -DATA(insert OID = 1561 ( _bit PGUID -1 -1 f b t \054 0 1560 array_in array_out array_in array_out i _null_ )); -DATA(insert OID = 1562 ( varbit PGUID -1 -1 f b t \054 0 0 varbit_in varbit_out varbit_in varbit_out i _null_ )); +#define ZPBITOID 1560 +DATA(insert OID = 1561 ( _bit PGUID -1 -1 f b t \054 0 1560 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1562 ( varbit PGUID -1 -1 f b t \054 0 0 varbit_in varbit_out varbit_in varbit_out i _null_ )); DESCR("fixed-length bit string"); -#define VARBITOID 1562 -DATA(insert OID = 1563 ( _varbit PGUID -1 -1 f b t \054 0 1562 array_in array_out array_in array_out i _null_ )); +#define VARBITOID 1562 +DATA(insert OID = 1563 ( _varbit PGUID -1 -1 f b t \054 0 1562 array_in array_out array_in array_out i _null_ )); /* OIDS 1600 - 1699 */ -DATA(insert OID = 1625 ( lztext PGUID -1 -1 f b t \054 0 0 lztextin lztextout lztextin lztextout i _null_ )); +DATA(insert OID = 1625 ( lztext PGUID -1 -1 f b t \054 0 0 lztextin lztextout lztextin lztextout i _null_ )); DESCR("variable-length string, stored compressed"); -#define LZTEXTOID 1625 +#define LZTEXTOID 1625 /* OIDS 1700 - 1799 */ DATA(insert OID = 1700 ( numeric PGUID -1 -1 f b t \054 0 0 numeric_in numeric_out numeric_in numeric_out i _null_ )); diff --git a/src/include/catalog/pg_version.h b/src/include/catalog/pg_version.h index 76f00e5a311..85b5d0f4ac9 100644 --- a/src/include/catalog/pg_version.h +++ b/src/include/catalog/pg_version.h @@ -8,14 +8,14 @@ * version or anything like that. It is for defining individual relations * that have multiple concurrently-existing versions. Yes, there used to * be such a feature in Postgres, but it's been broken for a long time - * (see src/backend/commands/_deadcode/version.c). The pg_version table + * (see src/backend/commands/_deadcode/version.c). The pg_version table * isn't even created at present. * * * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_version.h,v 1.10 2000/01/26 05:57:59 momjian Exp $ + * $Id: pg_version.h,v 1.11 2000/04/12 17:16:30 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki diff --git a/src/include/commands/command.h b/src/include/commands/command.h index a10adffea9d..b68ec2de5da 100644 --- a/src/include/commands/command.h +++ b/src/include/commands/command.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: command.h,v 1.17 2000/01/26 05:58:00 momjian Exp $ + * $Id: command.h,v 1.18 2000/04/12 17:16:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,22 +42,22 @@ extern void PortalCleanup(Portal portal); * ALTER TABLE variants */ extern void AlterTableAddColumn(const char *relationName, - bool inh, ColumnDef *colDef); + bool inh, ColumnDef *colDef); extern void AlterTableAlterColumn(const char *relationName, - bool inh, const char *colName, - Node *newDefault); + bool inh, const char *colName, + Node *newDefault); extern void AlterTableDropColumn(const char *relationName, - bool inh, const char *colName, - int behavior); + bool inh, const char *colName, + int behavior); extern void AlterTableAddConstraint(const char *relationName, - bool inh, Node *newConstraint); + bool inh, Node *newConstraint); extern void AlterTableDropConstraint(const char *relationName, - bool inh, const char *constrName, - int behavior); + bool inh, const char *constrName, + int behavior); /* * LOCK diff --git a/src/include/commands/comment.h b/src/include/commands/comment.h index 93ed200a74a..7f400411b4e 100644 --- a/src/include/commands/comment.h +++ b/src/include/commands/comment.h @@ -1,7 +1,7 @@ /*------------------------------------------------------------------------- * * comment.h - * + * * Prototypes for functions in commands/comment.c * * Copyright (c) 1999, PostgreSQL Global Development Group @@ -14,18 +14,18 @@ /*------------------------------------------------------------------ * Function Prototypes -- - * + * * The following protoypes define the public functions of the comment * related routines. CreateComments() is used to create/drop a comment - * for any object with a valid oid. DeleteComments() deletes, if any, - * the comments associated with the object. CommentObject() is used to + * for any object with a valid oid. DeleteComments() deletes, if any, + * the comments associated with the object. CommentObject() is used to * create comments to be identified by the specific type. *------------------------------------------------------------------ */ -void CreateComments(Oid oid, char *comment); -void DeleteComments(Oid oid); -void CommentObject(int objtype, char *objname, char *objproperty, - List *objlist, char *comment); +void CreateComments(Oid oid, char *comment); +void DeleteComments(Oid oid); +void CommentObject(int objtype, char *objname, char *objproperty, + List *objlist, char *comment); #endif /* COMMENT_H */ diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h index ecdb9bbb4e8..bbd465586c9 100644 --- a/src/include/commands/copy.h +++ b/src/include/commands/copy.h @@ -7,16 +7,16 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: copy.h,v 1.10 2000/02/13 18:59:52 momjian Exp $ + * $Id: copy.h,v 1.11 2000/04/12 17:16:32 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef COPY_H #define COPY_H -extern int lineno; +extern int lineno; void DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe, - char *filename, char *delim, char *null_print); + char *filename, char *delim, char *null_print); #endif /* COPY_H */ diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h index b2c258c2f83..3b735546ea5 100644 --- a/src/include/commands/trigger.h +++ b/src/include/commands/trigger.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: trigger.h,v 1.18 2000/01/31 04:35:54 tgl Exp $ + * $Id: trigger.h,v 1.19 2000/04/12 17:16:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -93,31 +93,34 @@ extern void ExecARUpdateTriggers(EState *estate, ItemPointer tupleid, HeapTuple * Deferred trigger stuff * ---------- */ -typedef struct DeferredTriggerStatusData { - Oid dts_tgoid; - bool dts_tgisdeferred; +typedef struct DeferredTriggerStatusData +{ + Oid dts_tgoid; + bool dts_tgisdeferred; } DeferredTriggerStatusData; typedef struct DeferredTriggerStatusData *DeferredTriggerStatus; -typedef struct DeferredTriggerEventItem { - Oid dti_tgoid; - int32 dti_state; +typedef struct DeferredTriggerEventItem +{ + Oid dti_tgoid; + int32 dti_state; } DeferredTriggerEventItem; -typedef struct DeferredTriggerEventData { - int32 dte_event; - Oid dte_relid; - ItemPointerData dte_oldctid; - ItemPointerData dte_newctid; - int32 dte_n_items; - DeferredTriggerEventItem dte_item[1]; +typedef struct DeferredTriggerEventData +{ + int32 dte_event; + Oid dte_relid; + ItemPointerData dte_oldctid; + ItemPointerData dte_newctid; + int32 dte_n_items; + DeferredTriggerEventItem dte_item[1]; } DeferredTriggerEventData; typedef struct DeferredTriggerEventData *DeferredTriggerEvent; -extern int DeferredTriggerInit(void); +extern int DeferredTriggerInit(void); extern void DeferredTriggerBeginXact(void); extern void DeferredTriggerEndQuery(void); extern void DeferredTriggerEndXact(void); @@ -126,7 +129,7 @@ extern void DeferredTriggerAbortXact(void); extern void DeferredTriggerSetState(ConstraintsSetStmt *stmt); extern void DeferredTriggerSaveEvent(Relation rel, int event, - HeapTuple oldtup, HeapTuple newtup); + HeapTuple oldtup, HeapTuple newtup); /* diff --git a/src/include/commands/user.h b/src/include/commands/user.h index 6a52fe613d9..f250a1c3da8 100644 --- a/src/include/commands/user.h +++ b/src/include/commands/user.h @@ -18,7 +18,7 @@ extern void AlterUser(AlterUserStmt *stmt); extern void DropUser(DropUserStmt *stmt); extern void CreateGroup(CreateGroupStmt *stmt); -extern void AlterGroup(AlterGroupStmt *stmt, const char * tag); +extern void AlterGroup(AlterGroupStmt *stmt, const char *tag); extern void DropGroup(DropGroupStmt *stmt); extern HeapTuple update_pg_pwd(void); diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index 07bc4ea1f99..136721c4e17 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: vacuum.h,v 1.26 2000/01/26 05:58:00 momjian Exp $ + * $Id: vacuum.h,v 1.27 2000/04/12 17:16:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,7 +47,8 @@ typedef struct VPageListData { int vpl_empty_end_pages; /* Number of "empty" end-pages */ int vpl_num_pages; /* Number of pages in vpl_pagedesc */ - int vpl_num_allocated_pages; /* Number of allocated pages in vpl_pagedesc */ + int vpl_num_allocated_pages; /* Number of allocated + * pages in vpl_pagedesc */ VPageDescr *vpl_pagedesc; /* Descriptions of pages */ } VPageListData; diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h index dd104b0af94..303516b167e 100644 --- a/src/include/executor/nodeGroup.h +++ b/src/include/executor/nodeGroup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeGroup.h,v 1.15 2000/01/27 18:11:41 tgl Exp $ + * $Id: nodeGroup.h,v 1.16 2000/04/12 17:16:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,13 +23,13 @@ extern void ExecEndGroup(Group *node); extern void ExecReScanGroup(Group *node, ExprContext *exprCtxt, Plan *parent); extern bool execTuplesMatch(HeapTuple tuple1, - HeapTuple tuple2, - TupleDesc tupdesc, - int numCols, - AttrNumber *matchColIdx, - FmgrInfo *eqfunctions); + HeapTuple tuple2, + TupleDesc tupdesc, + int numCols, + AttrNumber *matchColIdx, + FmgrInfo *eqfunctions); extern FmgrInfo *execTuplesMatchPrepare(TupleDesc tupdesc, - int numCols, - AttrNumber *matchColIdx); + int numCols, + AttrNumber *matchColIdx); #endif /* NODEGROUP_H */ diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h index b25e4dee379..a56ae216f5e 100644 --- a/src/include/executor/nodeSubplan.h +++ b/src/include/executor/nodeSubplan.h @@ -10,7 +10,7 @@ #include "nodes/plannodes.h" extern Datum ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext, - bool *isNull); + bool *isNull); extern bool ExecInitSubPlan(SubPlan *node, EState *estate, Plan *parent); extern void ExecReScanSetParamPlan(SubPlan *node, Plan *parent); extern void ExecSetParamPlan(SubPlan *node); diff --git a/src/include/executor/nodeTidscan.h b/src/include/executor/nodeTidscan.h index ffee4677eb7..58f18e4b8f4 100644 --- a/src/include/executor/nodeTidscan.h +++ b/src/include/executor/nodeTidscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeTidscan.h,v 1.2 2000/01/26 05:58:05 momjian Exp $ + * $Id: nodeTidscan.h,v 1.3 2000/04/12 17:16:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,7 @@ extern void ExecEndTidScan(TidScan *node); extern void ExecTidMarkPos(TidScan *node); extern void ExecTidRestrPos(TidScan *node); extern bool ExecInitTidScan(TidScan *node, EState *estate, Plan *parent); -extern int ExecCountSlotsTidScan(TidScan *node); +extern int ExecCountSlotsTidScan(TidScan *node); extern void ExecTidReScan(TidScan *node, ExprContext *exprCtxt, Plan *parent); #endif /* NODETIDSCAN_H */ diff --git a/src/include/lib/dllist.h b/src/include/lib/dllist.h index d56f773a9db..46192e13332 100644 --- a/src/include/lib/dllist.h +++ b/src/include/lib/dllist.h @@ -27,7 +27,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: dllist.h,v 1.11 2000/01/26 05:58:09 momjian Exp $ + * $Id: dllist.h,v 1.12 2000/04/12 17:16:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,7 +67,7 @@ extern void DLRemove(Dlelem *); /* removes node from list */ extern void DLAddHead(Dllist *list, Dlelem *node); extern void DLAddTail(Dllist *list, Dlelem *node); extern Dlelem *DLRemHead(Dllist *list); /* remove and return the head */ -extern void DLMoveToFront(Dlelem *); /* move node to front of its list */ +extern void DLMoveToFront(Dlelem *); /* move node to front of its list */ #define DLE_VAL(x) (x->dle_val) diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h index 05ba4b58a17..de8ac4a07e3 100644 --- a/src/include/lib/stringinfo.h +++ b/src/include/lib/stringinfo.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: stringinfo.h,v 1.17 2000/02/13 13:21:11 momjian Exp $ + * $Id: stringinfo.h,v 1.18 2000/04/12 17:16:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -106,6 +106,6 @@ extern void appendStringInfoChar(StringInfo str, char ch); * if necessary. */ extern void appendBinaryStringInfo(StringInfo str, - const char *data, int datalen); + const char *data, int datalen); #endif /* STRINGINFO_H */ diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index 5dcf49100d5..1a5021ad268 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.16 1999/10/23 03:13:29 tgl Exp $ + * $Id: hba.h,v 1.17 2000/04/12 17:16:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,7 +42,7 @@ typedef enum UserAuth typedef struct Port hbaPort; -int hba_getauthmethod(hbaPort *port); +int hba_getauthmethod(hbaPort *port); int authident(struct sockaddr_in * raddr, struct sockaddr_in * laddr, const char *postgres_username, const char *auth_arg); diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 56e0e996d02..76403d495e0 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-be.h,v 1.18 2000/01/26 05:58:12 momjian Exp $ + * $Id: libpq-be.h,v 1.19 2000/04/12 17:16:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -133,11 +133,11 @@ typedef struct Port char auth_arg[MAX_AUTH_ARG]; UserAuth auth_method; - /* - * SSL structures + /* + * SSL structures */ #ifdef USE_SSL - SSL *ssl; + SSL *ssl; #endif } Port; diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index d60d4a0a117..bb935d42514 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq.h,v 1.35 2000/01/26 05:58:12 momjian Exp $ + * $Id: libpq.h,v 1.36 2000/04/12 17:16:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -139,7 +139,7 @@ extern Exception MemoryError, * PQerrormsg[] is used only for error messages generated within backend * libpq, none of which are remarkably long. Note that this length should * NOT be taken as any indication of the maximum error message length that - * the backend can create! elog() can in fact produce extremely long messages. + * the backend can create! elog() can in fact produce extremely long messages. */ #define PQERRORMSG_LENGTH 1024 diff --git a/src/include/libpq/pqsignal.h b/src/include/libpq/pqsignal.h index 7b7350442c0..8013848ef65 100644 --- a/src/include/libpq/pqsignal.h +++ b/src/include/libpq/pqsignal.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqsignal.h,v 1.11 2000/01/26 05:58:12 momjian Exp $ + * $Id: pqsignal.h,v 1.12 2000/04/12 17:16:36 momjian Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -19,16 +19,18 @@ #define PQSIGNAL_H #ifdef HAVE_SIGPROCMASK -extern sigset_t UnBlockSig, - BlockSig; -#define PG_INITMASK() ( \ +extern sigset_t UnBlockSig, + BlockSig; + +#define PG_INITMASK() ( \ sigemptyset(&UnBlockSig), \ sigfillset(&BlockSig) \ ) -#define PG_SETMASK(mask) sigprocmask(SIG_SETMASK, mask, NULL) +#define PG_SETMASK(mask) sigprocmask(SIG_SETMASK, mask, NULL) #else -extern int UnBlockSig, - BlockSig; +extern int UnBlockSig, + BlockSig; + #define PG_INITMASK() ( \ UnBlockSig = 0, \ BlockSig = sigmask(SIGHUP) | sigmask(SIGQUIT) | \ @@ -37,7 +39,7 @@ extern int UnBlockSig, sigmask(SIGUSR2) | sigmask(SIGCHLD) | \ sigmask(SIGWINCH) | sigmask(SIGFPE) \ ) -#define PG_SETMASK(mask) sigsetmask(*((int*)(mask))) +#define PG_SETMASK(mask) sigsetmask(*((int*)(mask))) #endif typedef void (*pqsigfunc) (int); diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index 3d5dbae01fb..5070f5bc4d1 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: miscadmin.h,v 1.54 2000/02/23 15:46:14 momjian Exp $ + * $Id: miscadmin.h,v 1.55 2000/04/12 17:16:24 momjian Exp $ * * NOTES * some of the information in this file will be moved to @@ -23,7 +23,7 @@ #ifndef MISCADMIN_H #define MISCADMIN_H -#include <sys/types.h> /* For pid_t */ +#include <sys/types.h> /* For pid_t */ #include "postgres.h" @@ -66,7 +66,7 @@ extern bool TransactionInitWasProcessed; extern bool IsUnderPostmaster; -extern int DebugLvl; +extern int DebugLvl; /* Date/Time Configuration * @@ -148,7 +148,7 @@ extern int CheckPathAccess(char *path, char *name, int open_mode); *****************************************************************************/ /* * Description: - * There are three processing modes in POSTGRES. They are + * There are three processing modes in POSTGRES. They are * "BootstrapProcessing or "bootstrap," InitProcessing or * "initialization," and NormalProcessing or "normal." * @@ -157,12 +157,12 @@ extern int CheckPathAccess(char *path, char *name, int open_mode); * transaction id "one" and are consequently guarenteed to commit. This mode * is used during the initial generation of template databases. * - * Initialization mode until all normal initialization is complete. - * Some code behaves differently when executed in this mode to enable + * Initialization mode until all normal initialization is complete. + * Some code behaves differently when executed in this mode to enable * system bootstrapping. * * If a POSTGRES binary is in normal mode, then all code may be executed - * normally. + * normally. */ typedef enum ProcessingMode @@ -205,11 +205,11 @@ extern ProcessingMode Mode; #define IsNormalProcessingMode() ((bool)(Mode == NormalProcessing)) #define SetProcessingMode(mode) \ - do { \ - AssertArg(mode == BootstrapProcessing || mode == InitProcessing || \ - mode == NormalProcessing); \ - Mode = mode; \ - } while(0) + do { \ + AssertArg(mode == BootstrapProcessing || mode == InitProcessing || \ + mode == NormalProcessing); \ + Mode = mode; \ + } while(0) #define GetProcessingMode() Mode @@ -218,7 +218,7 @@ extern bool IsIgnoringSystemIndexes(void); extern bool IsCacheInitialized(void); extern void SetWaitingForLock(bool); -/* +/* * "postmaster.pid" is a file containing postmaster's pid, being * created uder $PGDATA upon postmaster's starting up. When postmaster * shuts down, it will be unlinked. @@ -228,6 +228,6 @@ extern void SetWaitingForLock(bool); extern void SetPidFname(char *datadir); extern char *GetPidFname(void); extern void UnlinkPidFile(void); -extern int SetPidFile(pid_t pid); +extern int SetPidFile(pid_t pid); #endif /* MISCADMIN_H */ diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 827bb75a9c8..044cee23eab 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execnodes.h,v 1.40 2000/01/27 18:11:44 tgl Exp $ + * $Id: execnodes.h,v 1.41 2000/04/12 17:16:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -89,7 +89,7 @@ typedef struct ExprContext ParamListInfo ecxt_param_list_info; ParamExecData *ecxt_param_exec_vals; /* this is for subselects */ List *ecxt_range_table; - Datum *ecxt_aggvalues; /* precomputed values for Aggref nodes */ + Datum *ecxt_aggvalues; /* precomputed values for Aggref nodes */ bool *ecxt_aggnulls; /* null flags for Aggref nodes */ } ExprContext; @@ -443,8 +443,8 @@ typedef struct TidScanState int tss_NumTids; int tss_TidPtr; int tss_MarkTidPtr; - ItemPointer *tss_TidList; - HeapTupleData tss_htup; + ItemPointer *tss_TidList; + HeapTupleData tss_htup; } TidScanState; /* ---------------------------------------------------------------- @@ -602,7 +602,7 @@ typedef struct MaterialState * during evaluation of an Agg node's output tuple(s). * ------------------------- */ -typedef struct AggStatePerAggData *AggStatePerAgg; /* private in nodeAgg.c */ +typedef struct AggStatePerAggData *AggStatePerAgg; /* private in nodeAgg.c */ typedef struct AggState { diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index f934eb5e63a..3b470b150a2 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: makefuncs.h,v 1.23 2000/02/15 03:38:13 thomas Exp $ + * $Id: makefuncs.h,v 1.24 2000/04/12 17:16:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,6 +47,6 @@ extern Const *makeConst(Oid consttype, bool constiscast); extern Attr * -makeAttr(char *relname, char *attname); + makeAttr(char *relname, char *attname); #endif /* MAKEFUNC_H */ diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index f42f615c7a6..a8fe032ba51 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodes.h,v 1.66 2000/02/20 21:32:16 tgl Exp $ + * $Id: nodes.h,v 1.67 2000/04/12 17:16:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -301,7 +301,8 @@ extern bool equal(void *a, void *b); * These could have gone into plannodes.h or some such, but many files * depend on them... */ -typedef double Selectivity; /* fraction of tuples a qualifier will pass */ +typedef double Selectivity; /* fraction of tuples a qualifier will + * pass */ typedef double Cost; /* execution cost (in page-access units) */ diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index cbbe77c333a..15c370a64a6 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.103 2000/03/24 23:26:45 tgl Exp $ + * $Id: parsenodes.h,v 1.104 2000/04/12 17:16:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -54,7 +54,7 @@ typedef struct Query Node *qual; /* qualifications applied to tuples */ List *rowMark; /* list of RowMark entries */ - List *distinctClause; /* a list of SortClause's */ + List *distinctClause; /* a list of SortClause's */ List *sortClause; /* a list of SortClause's */ @@ -72,7 +72,8 @@ typedef struct Query /* internal to planner */ List *base_rel_list; /* list of base-relation RelOptInfos */ List *join_rel_list; /* list of join-relation RelOptInfos */ - List *equi_key_list; /* list of lists of equijoined PathKeyItems */ + List *equi_key_list; /* list of lists of equijoined + * PathKeyItems */ List *query_pathkeys; /* pathkeys for query_planner()'s result */ } Query; @@ -94,12 +95,13 @@ typedef struct Query typedef struct AlterTableStmt { NodeTag type; - char subtype; /* A = add, T = alter, D = drop, C = add constr, X = drop constr */ - char *relname; /* table to work on */ + char subtype; /* A = add, T = alter, D = drop, C = add + * constr, X = drop constr */ + char *relname; /* table to work on */ bool inh; /* recursively on children? */ - char *name; /* column or constraint name to act on */ - Node *def; /* definition of new column or constraint */ - int behavior; /* CASCADE or RESTRICT drop behavior */ + char *name; /* column or constraint name to act on */ + Node *def; /* definition of new column or constraint */ + int behavior; /* CASCADE or RESTRICT drop behavior */ } AlterTableStmt; /* ---------------------- @@ -137,7 +139,7 @@ typedef struct CopyStmt int direction; /* TO or FROM */ char *filename; /* if NULL, use stdin/stdout */ char *delimiter; /* delimiter character, \t by default */ - char *null_print; /* how to print NULLs, `\N' by default */ + char *null_print; /* how to print NULLs, `\N' by default */ } CopyStmt; /* ---------------------- @@ -177,7 +179,8 @@ typedef struct CreateStmt typedef enum ConstrType /* types of constraints */ { - CONSTR_NULL, /* not SQL92, but a lot of people expect it */ + CONSTR_NULL, /* not SQL92, but a lot of people expect + * it */ CONSTR_NOTNULL, CONSTR_DEFAULT, CONSTR_CHECK, @@ -219,14 +222,14 @@ typedef struct Constraint typedef struct FkConstraint { NodeTag type; - char *constr_name; /* Constraint name */ - char *pktable_name; /* Primary key table name */ - List *fk_attrs; /* Attributes of foreign key */ - List *pk_attrs; /* Corresponding attrs in PK table */ - char *match_type; /* FULL or PARTIAL */ - int32 actions; /* ON DELETE/UPDATE actions */ - bool deferrable; /* DEFERRABLE */ - bool initdeferred; /* INITIALLY DEFERRED */ + char *constr_name; /* Constraint name */ + char *pktable_name; /* Primary key table name */ + List *fk_attrs; /* Attributes of foreign key */ + List *pk_attrs; /* Corresponding attrs in PK table */ + char *match_type; /* FULL or PARTIAL */ + int32 actions; /* ON DELETE/UPDATE actions */ + bool deferrable; /* DEFERRABLE */ + bool initdeferred; /* INITIALLY DEFERRED */ } FkConstraint; @@ -250,8 +253,8 @@ typedef struct CreateTrigStmt List *attr; /* UPDATE OF a, b,... (NI) or NULL */ char *when; /* WHEN 'a > 10 ...' (NI) or NULL */ - /* The following are used for referential */ - /* integrity constraint triggers */ + /* The following are used for referential */ + /* integrity constraint triggers */ bool isconstraint; /* This is an RI trigger */ bool deferrable; /* [NOT] DEFERRABLE */ bool initdeferred; /* INITIALLY {DEFERRED|IMMEDIATE} */ @@ -295,9 +298,9 @@ typedef struct CreateUserStmt NodeTag type; char *user; /* PostgreSQL user login */ char *password; /* PostgreSQL user password */ - int sysid; /* PgSQL system id (-1 if don't care) */ - bool createdb; /* Can the user create databases? */ - bool createuser; /* Can this user create users? */ + int sysid; /* PgSQL system id (-1 if don't care) */ + 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; @@ -307,43 +310,43 @@ typedef struct AlterUserStmt NodeTag type; char *user; /* PostgreSQL user login */ char *password; /* PostgreSQL user password */ - int createdb; /* Can the user create databases? */ - int createuser; /* Can this user create users? */ + int createdb; /* Can the user create databases? */ + int createuser; /* Can this user create users? */ char *validUntil; /* The time the login is valid until */ } AlterUserStmt; typedef struct DropUserStmt { NodeTag type; - List *users; /* List of users to remove */ + List *users; /* List of users to remove */ } DropUserStmt; /* ---------------------- - * Create/Alter/Drop Group Statements + * Create/Alter/Drop Group Statements * ---------------------- */ typedef struct CreateGroupStmt { - NodeTag type; - char *name; /* name of the new group */ - int sysid; /* group id (-1 if pick default) */ - List *initUsers; /* list of initial users */ + NodeTag type; + char *name; /* name of the new group */ + int sysid; /* group id (-1 if pick default) */ + List *initUsers; /* list of initial users */ } CreateGroupStmt; typedef struct AlterGroupStmt { - NodeTag type; - char *name; /* name of group to alter */ - int action; /* +1 = add, -1 = drop user */ - int sysid; /* sysid change */ - List *listUsers; /* list of users to add/drop */ + NodeTag type; + char *name; /* name of group to alter */ + int action; /* +1 = add, -1 = drop user */ + int sysid; /* sysid change */ + List *listUsers; /* list of users to add/drop */ } AlterGroupStmt; typedef struct DropGroupStmt { - NodeTag type; - char *name; + NodeTag type; + char *name; } DropGroupStmt; @@ -396,29 +399,29 @@ typedef struct DropStmt } DropStmt; /* ---------------------- - * Truncate Table Statement + * Truncate Table Statement * ---------------------- */ typedef struct TruncateStmt { - NodeTag type; - char *relName; /* relation to be truncated */ + NodeTag type; + char *relName; /* relation to be truncated */ } TruncateStmt; /* ---------------------- - * Comment On Statement + * Comment On Statement * ---------------------- */ typedef struct CommentStmt { - NodeTag type; - int objtype; /* Object's type */ - char *objname; /* Name of the object */ - char *objproperty; /* Property Id (such as column) */ - List *objlist; /* Arguments for VAL objects */ - char *comment; /* The comment to insert */ + NodeTag type; + int objtype; /* Object's type */ + char *objname; /* Name of the object */ + char *objproperty; /* Property Id (such as column) */ + List *objlist; /* Arguments for VAL objects */ + char *comment; /* The comment to insert */ } CommentStmt; - + /* ---------------------- * Extend Index Statement * ---------------------- @@ -738,7 +741,7 @@ typedef struct LockStmt typedef struct ConstraintsSetStmt { NodeTag type; - List *constraints; + List *constraints; bool deferred; } ConstraintsSetStmt; @@ -749,8 +752,8 @@ typedef struct ConstraintsSetStmt typedef struct ReindexStmt { NodeTag type; - int reindexType; /* INDEX|TABLE|DATABASE */ - const char *name; /* name to reindex */ + int reindexType; /* INDEX|TABLE|DATABASE */ + const char *name; /* name to reindex */ bool force; bool all; } ReindexStmt; @@ -768,8 +771,9 @@ typedef struct InsertStmt { NodeTag type; char *relname; /* relation to insert into */ - List *distinctClause; /* NULL, list of DISTINCT ON exprs, or - * lcons(NIL,NIL) for all (SELECT DISTINCT) */ + List *distinctClause; /* NULL, list of DISTINCT ON exprs, or + * lcons(NIL,NIL) for all (SELECT + * DISTINCT) */ List *cols; /* names of the columns */ List *targetList; /* the target list (of ResTarget) */ List *fromClause; /* the from clause */ @@ -813,8 +817,9 @@ typedef struct UpdateStmt typedef struct SelectStmt { NodeTag type; - List *distinctClause; /* NULL, list of DISTINCT ON exprs, or - * lcons(NIL,NIL) for all (SELECT DISTINCT) */ + List *distinctClause; /* NULL, list of DISTINCT ON exprs, or + * lcons(NIL,NIL) for all (SELECT + * DISTINCT) */ char *into; /* name of table (for select into table) */ List *targetList; /* the target list (of ResTarget) */ List *fromClause; /* the from clause */ @@ -839,7 +844,7 @@ typedef struct SelectStmt * Supporting data structures for Parse Trees * * Most of these node types appear in raw parsetrees output by the grammar, - * and get transformed to something else by the analyzer. A few of them + * and get transformed to something else by the analyzer. A few of them * are used as-is in transformed querytrees. ****************************************************************************/ @@ -951,7 +956,7 @@ typedef struct CaseWhen * in either "raw" form (an untransformed parse tree) or "cooked" form * (the nodeToString representation of an executable expression tree), * depending on how this ColumnDef node was created (by parsing, or by - * inheritance from an existing relation). We should never have both + * inheritance from an existing relation). We should never have both * in the same node! * * The constraints list may contain a CONSTR_DEFAULT item in a raw @@ -966,8 +971,9 @@ typedef struct ColumnDef TypeName *typename; /* type of column */ bool is_not_null; /* flag to NOT NULL constraint */ bool is_sequence; /* is a sequence? */ - Node *raw_default; /* default value (untransformed parse tree) */ - char *cooked_default; /* nodeToString representation */ + Node *raw_default; /* default value (untransformed parse + * tree) */ + char *cooked_default; /* nodeToString representation */ List *constraints; /* other constraints on column */ } ColumnDef; @@ -1141,7 +1147,7 @@ typedef struct TargetEntry * inFromCl marks those range variables that are listed in the FROM clause. * In SQL, the query can only refer to range variables listed in the * FROM clause, but POSTQUEL allows you to refer to tables not listed, - * in which case a range table entry will be generated. We still support + * in which case a range table entry will be generated. We still support * this POSTQUEL feature, although there is some doubt whether it's * convenient or merely confusing. The flag is needed since an * implicitly-added RTE shouldn't change the namespace for unqualified @@ -1156,7 +1162,7 @@ typedef struct TargetEntry * Here we should get the product of the sizes of tx and ty. However, * the query optimizer can simplify the WHERE clause to "TRUE", so * ty will no longer be referred to explicitly; without a flag forcing - * it to be included in the join, we will get the wrong answer. So, + * it to be included in the join, we will get the wrong answer. So, * a POSTQUEL implicit RTE must be marked inJoinSet but not inFromCl. *-------------------- */ diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index 9f05bc7985f..c68f0659fa1 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_list.h,v 1.16 2000/02/21 18:47:12 tgl Exp $ + * $Id: pg_list.h,v 1.17 2000/04/12 17:16:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,12 +27,12 @@ * The same Value struct is used for three node types: T_Integer, * T_Float, and T_String. Integral values are actually represented * by a machine integer, but both floats and strings are represented - * as strings. Using T_Float as the node type simply indicates that + * as strings. Using T_Float as the node type simply indicates that * the contents of the string look like a valid numeric literal. * * (Before Postgres 7.0, we used a double to represent T_Float, * but that creates loss-of-precision problems when the value is - * ultimately destined to be converted to NUMERIC. Since Value nodes + * ultimately destined to be converted to NUMERIC. Since Value nodes * are only used in the parsing process, not for runtime data, it's * better to use the more general representation.) * @@ -105,7 +105,7 @@ extern bool intMember(int datum, List *list); extern Value *makeInteger(long i); extern Value *makeFloat(char *numericStr); extern Value *makeString(char *str); -extern List *makeList(void *elem, ...); +extern List *makeList(void *elem,...); extern List *lappend(List *list, void *datum); extern List *lappendi(List *list, int datum); extern List *lremove(void *elem, List *list); diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 2731c57948c..1cab6e03fc0 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: plannodes.h,v 1.38 2000/02/15 20:49:25 tgl Exp $ + * $Id: plannodes.h,v 1.39 2000/04/12 17:16:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -66,10 +66,13 @@ typedef struct Plan NodeTag type; /* estimated execution costs for plan (see costsize.c for more info) */ - Cost startup_cost; /* cost expended before fetching any tuples */ - Cost total_cost; /* total cost (assuming all tuples fetched) */ + Cost startup_cost; /* cost expended before fetching any + * tuples */ + Cost total_cost; /* total cost (assuming all tuples + * fetched) */ - /* planner's estimate of result size (note: LIMIT, if any, is not + /* + * planner's estimate of result size (note: LIMIT, if any, is not * considered in setting plan_rows) */ double plan_rows; /* number of rows plan is expected to emit */ @@ -183,12 +186,12 @@ typedef struct IndexScan List *indxid; List *indxqual; List *indxqualorig; - ScanDirection indxorderdir; + ScanDirection indxorderdir; IndexScanState *indxstate; } IndexScan; /* ---------------- - * tid scan node + * tid scan node * ---------------- */ typedef struct TidScan @@ -199,7 +202,7 @@ typedef struct TidScan TidScanState *tidstate; } TidScan; -/* +/* * ========== * Join nodes * ========== @@ -319,7 +322,8 @@ typedef struct Unique Plan plan; /* noname node flattened out */ Oid nonameid; int keycount; - int numCols; /* number of columns to check for uniqueness */ + int numCols; /* number of columns to check for + * uniqueness */ AttrNumber *uniqColIdx; /* indexes into the target list */ UniqueState *uniquestate; } Unique; @@ -375,10 +379,13 @@ typedef struct SubPlan 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 from parser; holds info about - * what to do with subselect's results */ + SubLink *sublink; /* SubLink node from parser; holds info + * about what to do with subselect's + * results */ + /* - * Remaining fields are working state for executor; not used in planning + * Remaining fields are working state for executor; not used in + * planning */ bool shutdown; /* TRUE = need to shutdown plan */ HeapTuple curTuple; /* copy of most recent tuple from subplan */ diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index 7c3e0c6c4b8..926513e0af2 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: primnodes.h,v 1.40 2000/02/20 21:32:16 tgl Exp $ + * $Id: primnodes.h,v 1.41 2000/04/12 17:16:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,7 +29,7 @@ * restype - type of the value * restypmod - type-specific modifier of the value * resname - name of the resdom (could be NULL) - * ressortgroupref - nonzero if referenced by a sort/group clause + * ressortgroupref - nonzero if referenced by a sort/group clause * reskey - order of key in a sort (for those > 0) * reskeyop - sort operator's regproc Oid * resjunk - set to true to eliminate the attribute @@ -37,12 +37,12 @@ * * Notes: * ressortgroupref is the parse/plan-time representation of ORDER BY and - * GROUP BY items. Targetlist entries with ressortgroupref=0 are not + * GROUP BY items. Targetlist entries with ressortgroupref=0 are not * sort/group items. If ressortgroupref>0, then this item is an ORDER BY or - * GROUP BY value. No two entries in a targetlist may have the same nonzero + * GROUP BY value. No two entries in a targetlist may have the same nonzero * ressortgroupref --- but there is no particular meaning to the nonzero - * values, except as tags. (For example, one must not assume that lower - * ressortgroupref means a more significant sort key.) The order of the + * values, except as tags. (For example, one must not assume that lower + * ressortgroupref means a more significant sort key.) The order of the * associated SortClause or GroupClause lists determine the semantics. * * reskey and reskeyop are the execution-time representation of sorting. @@ -329,7 +329,7 @@ typedef struct Aggref * subselect - subselect as Query* or parsetree * * A SubLink represents a subselect appearing in an expression, and in some - * cases also the combining operator(s) just above it. The subLinkType + * cases also the combining operator(s) just above it. The subLinkType * indicates the form of the expression represented: * EXISTS_SUBLINK EXISTS(SELECT ...) * ALL_SUBLINK (lefthand) op ALL (SELECT ...) @@ -350,21 +350,21 @@ typedef struct Aggref * NOTE: lefthand and oper have varying meanings depending on where you look * in the parse/plan pipeline: * 1. gram.y delivers a list of the (untransformed) lefthand expressions in - * lefthand, and sets oper to a one-element list containing the string - * name of the operator. + * lefthand, and sets oper to a one-element list containing the string + * name of the operator. * 2. The parser's expression transformation transforms lefthand normally, - * and replaces oper with a list of Oper nodes, one per lefthand - * expression. These nodes represent the parser's resolution of exactly - * which operator to apply to each pair of lefthand and targetlist - * expressions. However, we have not constructed actual Expr trees for - * these operators yet. This is the representation seen in saved rules - * and in the rewriter. + * and replaces oper with a list of Oper nodes, one per lefthand + * expression. These nodes represent the parser's resolution of exactly + * which operator to apply to each pair of lefthand and targetlist + * expressions. However, we have not constructed actual Expr trees for + * these operators yet. This is the representation seen in saved rules + * and in the rewriter. * 3. Finally, the planner converts the oper list to a list of normal Expr - * nodes representing the application of the operator(s) to the lefthand - * expressions and values from the inner targetlist. The inner - * targetlist items are represented by placeholder Param or Const nodes. - * The lefthand field is set to NIL, since its expressions are now in - * the Expr list. This representation is passed to the executor. + * nodes representing the application of the operator(s) to the lefthand + * expressions and values from the inner targetlist. The inner + * targetlist items are represented by placeholder Param or Const nodes. + * The lefthand field is set to NIL, since its expressions are now in + * the Expr list. This representation is passed to the executor. * * Planner routines that might see either representation 2 or 3 can tell * the difference by checking whether lefthand is NIL or not. Also, @@ -372,7 +372,7 @@ typedef struct Aggref * found in SubLinks that are children of SubPlan nodes. * * In EXISTS and EXPR SubLinks, both lefthand and oper are unused and are - * always NIL. useor is not significant either for these sublink types. + * always NIL. useor is not significant either for these sublink types. * ---------------- */ typedef enum SubLinkType @@ -432,12 +432,12 @@ typedef struct Array * refelemlength - length of the array element type * refelembyval - is the element type pass-by-value? * refupperindexpr - expressions that evaluate to upper array indexes - * reflowerindexpr - expressions that evaluate to lower array indexes + * reflowerindexpr - expressions that evaluate to lower array indexes * refexpr - the expression that evaluates to an array value * refassgnexpr - expression for the source value, or NULL if fetch * * If reflowerindexpr = NIL, then we are fetching or storing a single array - * element at the subscripts given by refupperindexpr. Otherwise we are + * element at the subscripts given by refupperindexpr. Otherwise we are * fetching or storing an array slice, that is a rectangular subarray * with lower and upper bounds given by the index expressions. * reflowerindexpr must be the same length as refupperindexpr when it @@ -445,7 +445,7 @@ typedef struct Array * * Note: array types can be fixed-length (refattrlength > 0), but only * when the element type is itself fixed-length. Otherwise they are - * varlena structures and have refattrlength = -1. In any case, + * varlena structures and have refattrlength = -1. In any case, * an array type is never pass-by-value. * * Note: currently, refelemtype is NOT the element type, but the array type, diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index f01877a9e89..b7d65131066 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: relation.h,v 1.46 2000/03/22 22:08:29 tgl Exp $ + * $Id: relation.h,v 1.47 2000/04/12 17:16:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,10 @@ typedef List *Relids; * When looking for a "cheapest path", this enum specifies whether we want * cheapest startup cost or cheapest total cost. */ -typedef enum CostSelector { STARTUP_COST, TOTAL_COST } CostSelector; +typedef enum CostSelector +{ + STARTUP_COST, TOTAL_COST +} CostSelector; /* * RelOptInfo @@ -82,7 +85,7 @@ typedef enum CostSelector { STARTUP_COST, TOTAL_COST } CostSelector; * (For example, in a 3-base-rel join, a clause relating rels 1 and 2 must be * treated as a restrictclause if we join {1} and {2 3} to make {1 2 3}; but * if we join {1 2} and {3} then that clause will be a restrictclause in {1 2} - * and should not be processed again at the level of {1 2 3}.) Therefore, + * and should not be processed again at the level of {1 2 3}.) Therefore, * the restrictinfo list in the join case appears in individual JoinPaths * (field joinrestrictinfo), not in the parent relation. But it's OK for * the RelOptInfo to store the joininfo lists, because those are the same @@ -98,7 +101,8 @@ typedef struct RelOptInfo NodeTag type; /* all relations included in this RelOptInfo */ - Relids relids; /* integer list of base relids (RT indexes) */ + Relids relids; /* integer list of base relids (RT + * indexes) */ /* size estimates generated by planner */ double rows; /* estimated number of result tuples */ @@ -117,11 +121,14 @@ typedef struct RelOptInfo double tuples; /* used by various scans and joins: */ - List *baserestrictinfo; /* RestrictInfo structures (if base rel) */ - Cost baserestrictcost; /* cost of evaluating the above */ + List *baserestrictinfo; /* RestrictInfo structures (if + * base rel) */ + Cost baserestrictcost; /* cost of evaluating the above */ List *joininfo; /* JoinInfo structures */ List *innerjoin; /* potential indexscans for nestloop joins */ - /* innerjoin indexscans are not in the main pathlist because they are + + /* + * innerjoin indexscans are not in the main pathlist because they are * not usable except in specific join contexts; we have to test before * seeing whether they can be used. */ @@ -143,8 +150,8 @@ typedef struct RelOptInfo * ordering - List of PG_OPERATOR OIDs which order the indexscan result * relam - the OID of the pg_am of the index * amcostestimate - OID of the relam's cost estimator - * indproc - OID of the function if a functional index, else 0 - * indpred - index predicate if a partial index, else NULL + * indproc - OID of the function if a functional index, else 0 + * indpred - index predicate if a partial index, else NULL * lossy - true if index is lossy (may return non-matching tuples) * * NB. the last element of the arrays classlist, indexkeys and ordering @@ -167,7 +174,7 @@ typedef struct IndexOptInfo Oid *ordering; /* OIDs of sort operators for each key */ Oid relam; /* OID of the access method (in pg_am) */ - RegProcedure amcostestimate; /* OID of the access method's cost fcn */ + RegProcedure amcostestimate;/* OID of the access method's cost fcn */ Oid indproc; /* if a functional index */ List *indpred; /* if a partial index */ @@ -178,11 +185,11 @@ typedef struct IndexOptInfo * PathKeys * * The sort ordering of a path is represented by a list of sublists of - * PathKeyItem nodes. An empty list implies no known ordering. Otherwise + * PathKeyItem nodes. An empty list implies no known ordering. Otherwise * the first sublist represents the primary sort key, the second the - * first secondary sort key, etc. Each sublist contains one or more + * first secondary sort key, etc. Each sublist contains one or more * PathKeyItem nodes, each of which can be taken as the attribute that - * appears at that sort position. (See the top of optimizer/path/pathkeys.c + * appears at that sort position. (See the top of optimizer/path/pathkeys.c * for more information.) */ @@ -192,11 +199,12 @@ typedef struct PathKeyItem Node *key; /* the item that is ordered */ Oid sortop; /* the ordering operator ('<' op) */ + /* - * key typically points to a Var node, ie a relation attribute, - * but it can also point to a Func clause representing the value - * indexed by a functional index. Someday we might allow arbitrary - * expressions as path keys, so don't assume more than you must. + * key typically points to a Var node, ie a relation attribute, but it + * can also point to a Func clause representing the value indexed by a + * functional index. Someday we might allow arbitrary expressions as + * path keys, so don't assume more than you must. */ } PathKeyItem; @@ -212,8 +220,10 @@ typedef struct Path RelOptInfo *parent; /* the relation this path can build */ /* estimated execution costs for path (see costsize.c for more info) */ - Cost startup_cost; /* cost expended before fetching any tuples */ - Cost total_cost; /* total cost (assuming all tuples fetched) */ + Cost startup_cost; /* cost expended before fetching any + * tuples */ + Cost total_cost; /* total cost (assuming all tuples + * fetched) */ NodeTag pathtype; /* tag identifying scan/join method */ /* XXX why is pathtype separate from the NodeTag? */ @@ -223,10 +233,10 @@ typedef struct Path } Path; /*---------- - * IndexPath represents an index scan. Although an indexscan can only read + * IndexPath represents an index scan. Although an indexscan can only read * a single relation, it can scan it more than once, potentially using a * different index during each scan. The result is the union (OR) of all the - * tuples matched during any scan. (The executor is smart enough not to return + * tuples matched during any scan. (The executor is smart enough not to return * the same tuple more than once, even if it is matched in multiple scans.) * * 'indexid' is a list of index relation OIDs, one per scan to be performed. @@ -272,10 +282,10 @@ typedef struct IndexPath typedef struct TidPath { - Path path; - List *tideval; - Relids unjoined_relids; /* some rels not yet part of my Path */ -} TidPath; + Path path; + List *tideval; + Relids unjoined_relids;/* some rels not yet part of my Path */ +} TidPath; /* * All join-type paths share these fields. @@ -287,8 +297,10 @@ typedef struct JoinPath Path *outerjoinpath; /* path for the outer side of the join */ Path *innerjoinpath; /* path for the inner side of the join */ - List *joinrestrictinfo; /* RestrictInfos to apply to join */ - /* See the notes for RelOptInfo to understand why joinrestrictinfo is + List *joinrestrictinfo; /* RestrictInfos to apply to join */ + + /* + * See the notes for RelOptInfo to understand why joinrestrictinfo is * needed in JoinPath, and can't be merged into the parent RelOptInfo. */ } JoinPath; @@ -303,7 +315,7 @@ typedef JoinPath NestPath; * A mergejoin path has these fields. * * path_mergeclauses lists the clauses (in the form of RestrictInfos) - * that will be used in the merge. (Before 7.0, this was a list of + * that will be used in the merge. (Before 7.0, this was a list of * bare clause expressions, but we can save on list memory by leaving * it in the form of a RestrictInfo list.) * @@ -321,7 +333,8 @@ typedef JoinPath NestPath; typedef struct MergePath { JoinPath jpath; - List *path_mergeclauses; /* join clauses to be used for merge */ + List *path_mergeclauses; /* join clauses to be used for + * merge */ List *outersortkeys; /* keys for explicit sort, if any */ List *innersortkeys; /* keys for explicit sort, if any */ } MergePath; @@ -340,14 +353,14 @@ typedef struct MergePath typedef struct HashPath { JoinPath jpath; - List *path_hashclauses; /* join clauses used for hashing */ + List *path_hashclauses; /* join clauses used for hashing */ } HashPath; /* * Restriction clause info. * * We create one of these for each AND sub-clause of a restriction condition - * (WHERE clause). Since the restriction clauses are logically ANDed, we + * (WHERE clause). Since the restriction clauses are logically ANDed, we * can use any one of them or any subset of them to filter out tuples, * without having to evaluate the rest. The RestrictInfo node itself stores * data used by the optimizer while choosing the best query plan. @@ -376,7 +389,7 @@ typedef struct HashPath * sequence we use. So, these clauses cannot be associated directly with * the join RelOptInfo, but must be kept track of on a per-join-path basis. * - * In general, the referenced clause might be arbitrarily complex. The + * In general, the referenced clause might be arbitrarily complex. The * kinds of clauses we can handle as indexscan quals, mergejoin clauses, * or hashjoin clauses are fairly limited --- the code for each kind of * path is responsible for identifying the restrict clauses it can use @@ -395,16 +408,16 @@ typedef struct RestrictInfo Expr *clause; /* the represented clause of WHERE cond */ /* only used if clause is an OR clause: */ - List *subclauseindices; /* indexes matching subclauses */ + List *subclauseindices; /* indexes matching subclauses */ /* subclauseindices is a List of Lists of IndexOptInfos */ /* valid if clause is mergejoinable, else InvalidOid: */ - Oid mergejoinoperator; /* copy of clause operator */ + Oid mergejoinoperator; /* copy of clause operator */ Oid left_sortop; /* leftside sortop needed for mergejoin */ Oid right_sortop; /* rightside sortop needed for mergejoin */ /* valid if clause is hashjoinable, else InvalidOid: */ - Oid hashjoinoperator; /* copy of clause operator */ + Oid hashjoinoperator; /* copy of clause operator */ } RestrictInfo; /* @@ -424,8 +437,8 @@ typedef struct RestrictInfo typedef struct JoinInfo { NodeTag type; - Relids unjoined_relids; /* some rels not yet part of my RelOptInfo */ - List *jinfo_restrictinfo; /* relevant RestrictInfos */ + Relids unjoined_relids;/* some rels not yet part of my RelOptInfo */ + List *jinfo_restrictinfo; /* relevant RestrictInfos */ } JoinInfo; /* @@ -463,7 +476,7 @@ typedef struct Stream StreamPtr downstream; bool groupup; Cost groupcost; - Selectivity groupsel; + Selectivity groupsel; } Stream; #endif /* RELATION_H */ diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index a6f6ea2e5f3..9cccc65454e 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: clauses.h,v 1.35 2000/04/04 01:21:45 tgl Exp $ + * $Id: clauses.h,v 1.36 2000/04/12 17:16:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -50,8 +50,8 @@ extern List *pull_constant_clauses(List *quals, List **constantQual); extern void clause_get_relids_vars(Node *clause, Relids *relids, List **vars); extern int NumRelids(Node *clause); extern void get_relattval(Node *clause, int targetrelid, - int *relid, AttrNumber *attno, - Datum *constval, int *flag); + int *relid, AttrNumber *attno, + Datum *constval, int *flag); extern void get_rels_atts(Node *clause, int *relid1, AttrNumber *attno1, int *relid2, AttrNumber *attno2); extern void CommuteClause(Expr *clause); @@ -59,9 +59,9 @@ extern void CommuteClause(Expr *clause); extern Node *eval_const_expressions(Node *node); extern bool expression_tree_walker(Node *node, bool (*walker) (), - void *context); -extern Node *expression_tree_mutator(Node *node, Node * (*mutator) (), - void *context); + void *context); +extern Node *expression_tree_mutator(Node *node, Node *(*mutator) (), + void *context); #define is_subplan(clause) ((clause) != NULL && \ IsA(clause, Expr) && \ diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index e8673675f89..dabfb681756 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: cost.h,v 1.31 2000/03/22 22:08:30 tgl Exp $ + * $Id: cost.h,v 1.32 2000/04/12 17:16:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,7 @@ /* NB: cost-estimation code should use the variables, not these constants! */ #define DEFAULT_EFFECTIVE_CACHE_SIZE 1000.0 /* measured in pages */ #define DEFAULT_RANDOM_PAGE_COST 4.0 -#define DEFAULT_CPU_TUPLE_COST 0.01 +#define DEFAULT_CPU_TUPLE_COST 0.01 #define DEFAULT_CPU_INDEX_TUPLE_COST 0.001 #define DEFAULT_CPU_OPERATOR_COST 0.0025 @@ -53,36 +53,36 @@ extern bool enable_hashjoin; extern void cost_seqscan(Path *path, RelOptInfo *baserel); extern void cost_index(Path *path, Query *root, - RelOptInfo *baserel, IndexOptInfo *index, - List *indexQuals, bool is_injoin); + RelOptInfo *baserel, IndexOptInfo *index, + List *indexQuals, bool is_injoin); extern void cost_tidscan(Path *path, RelOptInfo *baserel, List *tideval); extern void cost_sort(Path *path, List *pathkeys, double tuples, int width); extern void cost_nestloop(Path *path, Path *outer_path, Path *inner_path, - List *restrictlist); + List *restrictlist); extern void cost_mergejoin(Path *path, Path *outer_path, Path *inner_path, - List *restrictlist, - List *outersortkeys, List *innersortkeys); + List *restrictlist, + List *outersortkeys, List *innersortkeys); extern void cost_hashjoin(Path *path, Path *outer_path, Path *inner_path, - List *restrictlist, Selectivity innerdisbursion); + List *restrictlist, Selectivity innerdisbursion); extern Cost cost_qual_eval(List *quals); extern void set_baserel_size_estimates(Query *root, RelOptInfo *rel); extern void set_joinrel_size_estimates(Query *root, RelOptInfo *rel, - RelOptInfo *outer_rel, - RelOptInfo *inner_rel, - List *restrictlist); + RelOptInfo *outer_rel, + RelOptInfo *inner_rel, + List *restrictlist); /* * prototypes for clausesel.c * routines to compute clause selectivities */ extern Selectivity restrictlist_selectivity(Query *root, - List *restrictinfo_list, - int varRelid); + List *restrictinfo_list, + int varRelid); extern Selectivity clauselist_selectivity(Query *root, - List *clauses, - int varRelid); + List *clauses, + int varRelid); extern Selectivity clause_selectivity(Query *root, - Node *clause, - int varRelid); + Node *clause, + int varRelid); #endif /* COST_H */ diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index e59848278f4..b8788851e2b 100644 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pathnode.h,v 1.26 2000/02/15 20:49:26 tgl Exp $ + * $Id: pathnode.h,v 1.27 2000/04/12 17:16:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,48 +20,48 @@ * prototypes for pathnode.c */ extern int compare_path_costs(Path *path1, Path *path2, - CostSelector criterion); + CostSelector criterion); extern int compare_fractional_path_costs(Path *path1, Path *path2, - double fraction); + double fraction); extern void set_cheapest(RelOptInfo *parent_rel); extern void add_path(RelOptInfo *parent_rel, Path *new_path); extern Path *create_seqscan_path(RelOptInfo *rel); extern IndexPath *create_index_path(Query *root, RelOptInfo *rel, - IndexOptInfo *index, - List *restriction_clauses, - ScanDirection indexscandir); + IndexOptInfo *index, + List *restriction_clauses, + ScanDirection indexscandir); extern TidPath *create_tidscan_path(RelOptInfo *rel, List *tideval); extern NestPath *create_nestloop_path(RelOptInfo *joinrel, - Path *outer_path, - Path *inner_path, - List *restrict_clauses, - List *pathkeys); + Path *outer_path, + Path *inner_path, + List *restrict_clauses, + List *pathkeys); extern MergePath *create_mergejoin_path(RelOptInfo *joinrel, - Path *outer_path, - Path *inner_path, - List *restrict_clauses, - List *pathkeys, - List *mergeclauses, - List *outersortkeys, - List *innersortkeys); + Path *outer_path, + Path *inner_path, + List *restrict_clauses, + List *pathkeys, + List *mergeclauses, + List *outersortkeys, + List *innersortkeys); extern HashPath *create_hashjoin_path(RelOptInfo *joinrel, - Path *outer_path, - Path *inner_path, - List *restrict_clauses, - List *hashclauses, - Selectivity innerdisbursion); + Path *outer_path, + Path *inner_path, + List *restrict_clauses, + List *hashclauses, + Selectivity innerdisbursion); /* * prototypes for relnode.c */ extern RelOptInfo *get_base_rel(Query *root, int relid); extern RelOptInfo *get_join_rel(Query *root, RelOptInfo *outer_rel, - RelOptInfo *inner_rel, - List **restrictlist_ptr); + RelOptInfo *inner_rel, + List **restrictlist_ptr); /* * prototypes for indexnode.h diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index d7a0cc2d546..0a2f56db63a 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: paths.h,v 1.43 2000/02/15 20:49:26 tgl Exp $ + * $Id: paths.h,v 1.44 2000/04/12 17:16:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,13 +34,13 @@ extern RelOptInfo *make_one_rel(Query *root); * routines to generate index paths */ extern void create_index_paths(Query *root, RelOptInfo *rel, List *indices, - List *restrictinfo_list, - List *joininfo_list); + List *restrictinfo_list, + List *joininfo_list); extern Oid indexable_operator(Expr *clause, Oid opclass, Oid relam, - bool indexkey_on_left); + bool indexkey_on_left); extern List *extract_or_indexqual_conditions(RelOptInfo *rel, - IndexOptInfo *index, - Expr *orsubclause); + IndexOptInfo *index, + Expr *orsubclause); extern List *expand_indexqual_conditions(List *indexquals); /* @@ -48,7 +48,7 @@ extern List *expand_indexqual_conditions(List *indexquals); * additional routines for indexable OR clauses */ extern void create_or_index_paths(Query *root, RelOptInfo *rel, - List *clauses); + List *clauses); /* * tidpath.h @@ -61,9 +61,9 @@ extern void create_tidscan_paths(Query *root, RelOptInfo *rel); * routines to create join paths */ extern void add_paths_to_joinrel(Query *root, RelOptInfo *joinrel, - RelOptInfo *outerrel, - RelOptInfo *innerrel, - List *restrictlist); + RelOptInfo *outerrel, + RelOptInfo *innerrel, + List *restrictlist); /* * joinrels.c @@ -71,11 +71,11 @@ extern void add_paths_to_joinrel(Query *root, RelOptInfo *joinrel, */ extern void make_rels_by_joins(Query *root, int level); extern RelOptInfo *make_rels_by_clause_joins(Query *root, - RelOptInfo *old_rel, - List *other_rels); + RelOptInfo *old_rel, + List *other_rels); extern RelOptInfo *make_rels_by_clauseless_joins(Query *root, - RelOptInfo *old_rel, - List *other_rels); + RelOptInfo *old_rel, + List *other_rels); /* * pathkeys.c @@ -94,22 +94,22 @@ extern List *canonicalize_pathkeys(Query *root, List *pathkeys); extern PathKeysComparison compare_pathkeys(List *keys1, List *keys2); extern bool pathkeys_contained_in(List *keys1, List *keys2); extern Path *get_cheapest_path_for_pathkeys(List *paths, List *pathkeys, - CostSelector cost_criterion); + CostSelector cost_criterion); extern Path *get_cheapest_fractional_path_for_pathkeys(List *paths, - List *pathkeys, - double fraction); + List *pathkeys, + double fraction); extern List *build_index_pathkeys(Query *root, RelOptInfo *rel, - IndexOptInfo *index, - ScanDirection scandir); + IndexOptInfo *index, + ScanDirection scandir); extern List *build_join_pathkeys(List *outer_pathkeys, - List *join_rel_tlist, - List *equi_key_list); + List *join_rel_tlist, + List *equi_key_list); extern List *make_pathkeys_for_sortclauses(List *sortclauses, - List *tlist); + List *tlist); extern List *find_mergeclauses_for_pathkeys(List *pathkeys, - List *restrictinfos); + List *restrictinfos); extern List *make_pathkeys_for_mergeclauses(Query *root, - List *mergeclauses, - List *tlist); + List *mergeclauses, + List *tlist); #endif /* PATHS_H */ diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index fb44b5c3038..745d8dc73ef 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: plancat.h,v 1.17 2000/01/26 05:58:20 momjian Exp $ + * $Id: plancat.h,v 1.18 2000/04/12 17:16:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ extern void relation_info(Query *root, Index relid, - bool *hasindex, long *pages, double *tuples); + bool *hasindex, long *pages, double *tuples); extern List *find_secondary_indexes(Query *root, Index relid); diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 2d61a035bf8..e0a0d84bc8a 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: planmain.h,v 1.38 2000/02/15 20:49:26 tgl Exp $ + * $Id: planmain.h,v 1.39 2000/04/12 17:16:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ * prototypes for plan/planmain.c */ extern Plan *query_planner(Query *root, List *tlist, List *qual, - double tuple_fraction); + double tuple_fraction); /* * prototypes for plan/createplan.c @@ -49,7 +49,7 @@ extern void add_missing_rels_to_query(Query *root); */ extern void set_plan_references(Plan *plan); extern List *join_references(List *clauses, List *outer_tlist, - List *inner_tlist, Index acceptable_rel); + List *inner_tlist, Index acceptable_rel); extern void fix_opids(Node *node); /* diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h index f4e51121613..9c56a7592ba 100644 --- a/src/include/optimizer/subselect.h +++ b/src/include/optimizer/subselect.h @@ -9,7 +9,7 @@ #include "nodes/plannodes.h" -extern Index PlannerQueryLevel; /* level of current query */ +extern Index PlannerQueryLevel; /* level of current query */ extern List *PlannerInitPlan; /* init subplans for current query */ extern List *PlannerParamVar; /* to get Var from Param->paramid */ extern int PlannerPlanId; /* to assign unique ID to subquery plans */ diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index dba93c0d173..3f1c17c9952 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tlist.h,v 1.24 2000/01/27 18:11:45 tgl Exp $ + * $Id: tlist.h,v 1.25 2000/04/12 17:16:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,8 +30,8 @@ extern List *add_to_flat_tlist(List *tlist, List *vars); extern Var *get_expr(TargetEntry *tle); extern TargetEntry *get_sortgroupclause_tle(SortClause *sortClause, - List *targetList); + List *targetList); extern Node *get_sortgroupclause_expr(SortClause *sortClause, - List *targetList); + List *targetList); #endif /* TLIST_H */ diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h index 5f4e5a6af76..02c95745fee 100644 --- a/src/include/parser/gramparse.h +++ b/src/include/parser/gramparse.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: gramparse.h,v 1.11 2000/01/26 05:58:26 momjian Exp $ + * $Id: gramparse.h,v 1.12 2000/04/12 17:16:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ /* from scan.l */ extern void init_io(void); extern int yylex(void); -extern void yyerror(const char * message); +extern void yyerror(const char *message); /* from gram.y */ extern Oid param_type(int t); diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index 324931d12d5..2edc2fff705 100644 --- a/src/include/parser/parse_agg.h +++ b/src/include/parser/parse_agg.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_agg.h,v 1.14 2000/01/26 05:58:26 momjian Exp $ + * $Id: parse_agg.h,v 1.15 2000/04/12 17:16:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,8 +19,8 @@ extern void AddAggToParseState(ParseState *pstate, Aggref *aggref); extern void parseCheckAggregates(ParseState *pstate, Query *qry); extern Aggref *ParseAgg(ParseState *pstate, char *aggname, Oid basetype, - List *args, bool agg_star, bool agg_distinct, - int precedence); + List *args, bool agg_star, bool agg_distinct, + 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 58b8fc60fa4..dc665530f8c 100644 --- a/src/include/parser/parse_clause.h +++ b/src/include/parser/parse_clause.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_clause.h,v 1.16 2000/02/15 03:38:28 thomas Exp $ + * $Id: parse_clause.h,v 1.17 2000/04/12 17:16:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,11 +20,11 @@ extern void makeRangeTable(ParseState *pstate, List *frmList); extern void setTargetTable(ParseState *pstate, char *relname); extern Node *transformWhereClause(ParseState *pstate, Node *where); extern List *transformGroupClause(ParseState *pstate, List *grouplist, - List *targetlist); + List *targetlist); extern List *transformSortClause(ParseState *pstate, List *orderlist, - List *targetlist); + List *targetlist); extern List *transformDistinctClause(ParseState *pstate, List *distinctlist, - List *targetlist, List **sortClause); + List *targetlist, List **sortClause); extern List *addAllTargetsToSortList(List *sortlist, List *targetlist); extern Index assignSortGroupRef(TargetEntry *tle, List *tlist); diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index 19dd42c9773..0bb324402fb 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_coerce.h,v 1.21 2000/03/20 15:42:47 momjian Exp $ + * $Id: parse_coerce.h,v 1.22 2000/04/12 17:16:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -126,8 +126,8 @@ extern CATEGORY TypeCategory(Oid type); extern bool can_coerce_type(int nargs, Oid *input_typeids, Oid *func_typeids); extern Node *coerce_type(ParseState *pstate, Node *node, Oid inputTypeId, - Oid targetTypeId, int32 atttypmod); + Oid targetTypeId, int32 atttypmod); extern Node *coerce_type_typmod(ParseState *pstate, Node *node, - Oid targetTypeId, int32 atttypmod); + Oid targetTypeId, int32 atttypmod); #endif /* PARSE_COERCE_H */ diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index b191944ee2f..836626486b7 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_func.h,v 1.23 2000/03/16 06:35:06 tgl Exp $ + * $Id: parse_func.h,v 1.24 2000/04/12 17:16:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,15 +41,15 @@ typedef struct _CandidateList extern Node *ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, int *curr_resno, int precedence); extern Node *ParseFuncOrColumn(ParseState *pstate, - char *funcname, List *fargs, - bool agg_star, bool agg_distinct, - int *curr_resno, int precedence); + char *funcname, List *fargs, + bool agg_star, bool agg_distinct, + int *curr_resno, int precedence); extern List *setup_base_tlist(Oid typeid); extern bool typeInheritsFrom(Oid subclassTypeId, Oid superclassTypeId); extern void func_error(char *caller, char *funcname, - int nargs, Oid *argtypes, char *msg); + int nargs, Oid *argtypes, char *msg); #endif /* PARSE_FUNC_H */ diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index 16641b530a2..583ce8ce6a4 100644 --- a/src/include/parser/parse_node.h +++ b/src/include/parser/parse_node.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_node.h,v 1.18 2000/02/15 03:38:29 thomas Exp $ + * $Id: parse_node.h,v 1.19 2000/04/12 17:16:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,14 +42,14 @@ typedef struct ParseState extern ParseState *make_parsestate(ParseState *parentParseState); extern Expr *make_op(char *opname, Node *ltree, Node *rtree); extern Node *make_operand(char *opname, Node *tree, - Oid orig_typeId, Oid target_typeId); + Oid orig_typeId, Oid target_typeId); extern Var *make_var(ParseState *pstate, Oid relid, char *refname, char *attrname); extern ArrayRef *transformArraySubscripts(ParseState *pstate, - Node *arrayBase, - List *indirection, - bool forceSlice, - Node *assignFrom); + Node *arrayBase, + List *indirection, + bool forceSlice, + Node *assignFrom); extern Const *make_const(Value *value); #endif /* PARSE_NODE_H */ diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 5ba5db3f9d0..340afcc2f39 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_relation.h,v 1.15 2000/02/15 03:38:29 thomas Exp $ + * $Id: parse_relation.h,v 1.16 2000/04/12 17:16:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,18 +18,18 @@ extern RangeTblEntry *refnameRangeTableEntry(ParseState *pstate, char *refname); extern int refnameRangeTablePosn(ParseState *pstate, - char *refname, - int *sublevels_up); + char *refname, + int *sublevels_up); extern RangeTblEntry *colnameRangeTableEntry(ParseState *pstate, char *colname); extern RangeTblEntry *addRangeTableEntry(ParseState *pstate, - char *relname, - Attr *ref, - bool inh, - bool inFromCl, - bool inJoinSet); + char *relname, + Attr *ref, + bool inh, + bool inFromCl, + bool inJoinSet); extern Attr *expandTable(ParseState *pstate, char *refname, bool getaliases); extern List *expandAll(ParseState *pstate, char *relname, Attr *ref, - int *this_resno); + int *this_resno); extern int attnameAttNum(Relation rd, char *a); extern int specialAttNum(char *a); extern bool attnameIsSet(Relation rd, char *name); diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h index 4438073bdaa..55c4d9f8830 100644 --- a/src/include/parser/parse_target.h +++ b/src/include/parser/parse_target.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_target.h,v 1.18 2000/01/26 05:58:27 momjian Exp $ + * $Id: parse_target.h,v 1.19 2000/04/12 17:16:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,14 +18,14 @@ extern List *transformTargetList(ParseState *pstate, List *targetlist); extern TargetEntry *transformTargetEntry(ParseState *pstate, - Node *node, Node *expr, - char *colname, bool resjunk); + Node *node, Node *expr, + char *colname, bool resjunk); extern void updateTargetListEntry(ParseState *pstate, TargetEntry *tle, - char *colname, int attrno, - List *indirection); + char *colname, int attrno, + List *indirection); extern Node *CoerceTargetExpr(ParseState *pstate, Node *expr, - Oid type_id, Oid attrtype, int32 attrtypmod); + Oid type_id, Oid attrtype, int32 attrtypmod); extern List *checkInsertTargets(ParseState *pstate, List *cols, - List **attrnos); + List **attrnos); #endif /* PARSE_TARGET_H */ diff --git a/src/include/port/alpha.h b/src/include/port/alpha.h index 2c1c6e55c9a..90c5a8af6cf 100644 --- a/src/include/port/alpha.h +++ b/src/include/port/alpha.h @@ -8,4 +8,3 @@ typedef msemaphore slock_t; #if defined(__alpha) && !defined(__alpha__) #define __alpha__ #endif - diff --git a/src/include/port/bsd.h b/src/include/port/bsd.h index 8406844d079..dc019303250 100644 --- a/src/include/port/bsd.h +++ b/src/include/port/bsd.h @@ -38,6 +38,8 @@ #if defined(__powerpc__) typedef unsigned int slock_t; + #else typedef unsigned char slock_t; + #endif diff --git a/src/include/port/linux.h b/src/include/port/linux.h index 2de8fc8e7ec..d82103b879b 100644 --- a/src/include/port/linux.h +++ b/src/include/port/linux.h @@ -9,22 +9,27 @@ #if defined(__i386__) typedef unsigned char slock_t; + #define HAS_TEST_AND_SET #elif defined(__sparc__) typedef unsigned char slock_t; + #define HAS_TEST_AND_SET #elif defined(__powerpc__) typedef unsigned int slock_t; + #define HAS_TEST_AND_SET #elif defined(__alpha__) typedef long int slock_t; + #define HAS_TEST_AND_SET #elif defined(__mips__) typedef unsigned int slock_t; + #define HAS_TEST_AND_SET #endif diff --git a/src/include/port/netbsd.h b/src/include/port/netbsd.h index 8406844d079..dc019303250 100644 --- a/src/include/port/netbsd.h +++ b/src/include/port/netbsd.h @@ -38,6 +38,8 @@ #if defined(__powerpc__) typedef unsigned int slock_t; + #else typedef unsigned char slock_t; + #endif diff --git a/src/include/port/qnx4.h b/src/include/port/qnx4.h index 820f26180da..d60555f1047 100644 --- a/src/include/port/qnx4.h +++ b/src/include/port/qnx4.h @@ -1,12 +1,12 @@ -#include <sys/types.h> /* for namser.h */ -#include <arpa/nameser.h> /* for BYTE_ORDER */ -#include <process.h> /* for execv */ -#include <ioctl.h> /* for unix.h */ -#include <termios.h> /* for unix.h */ +#include <sys/types.h> /* for namser.h */ +#include <arpa/nameser.h> /* for BYTE_ORDER */ +#include <process.h> /* for execv */ +#include <ioctl.h> /* for unix.h */ +#include <termios.h> /* for unix.h */ #include <unix.h> -#include <sys/select.h> /* for select */ +#include <sys/select.h> /* for select */ #if !defined(__GNUC__) -#include <semaphore.h> /* for sem_t */ +#include <semaphore.h> /* for sem_t */ #endif #define USE_POSIX_TIME @@ -17,23 +17,26 @@ #define strncasecmp strnicmp -#ifndef NAN -#ifndef __nan_bytes -#define __nan_bytes { 0, 0, 0, 0, 0, 0, 0xf8, 0x7f } -#endif /* __nan_bytes */ +#ifndef NAN +#ifndef __nan_bytes +#define __nan_bytes { 0, 0, 0, 0, 0, 0, 0xf8, 0x7f } +#endif /* __nan_bytes */ extern unsigned char __nan[8]; -#define NAN (*(const double *) __nan) -#endif /* NAN */ + +#define NAN (*(const double *) __nan) +#endif /* NAN */ typedef u_short ushort; #if defined(__GNUC__) typedef unsigned char slock_t; + #else typedef sem_t slock_t; + #endif -extern int isnan(double dsrc); +extern int isnan(double dsrc); extern double rint(double x); diff --git a/src/include/postgres.h b/src/include/postgres.h index e089db510f6..0d16c553527 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1995, Regents of the University of California * - * $Id: postgres.h,v 1.37 2000/03/17 02:36:34 tgl Exp $ + * $Id: postgres.h,v 1.38 2000/04/12 17:16:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -74,8 +74,10 @@ typedef Oid RegProcedure; * some warnings about int->pointer conversions... */ typedef int32 ((*func_ptr) ()); -#else + +#else typedef char *((*func_ptr) ()); + #endif @@ -116,27 +118,27 @@ typedef Oid oidvector[INDEX_MAX_KEYS]; #ifdef TUPLE_TOASTER_ACTIVE typedef struct varattrib { - int32 va_header; /* External/compressed storage */ - /* flags and item size */ + int32 va_header; /* External/compressed storage */ + /* flags and item size */ union { struct { - int32 va_rawsize; /* Plain data size */ - } va_compressed; /* Compressed stored attribute */ + int32 va_rawsize; /* Plain data size */ + } va_compressed; /* Compressed stored attribute */ struct { - int32 va_rawsize; /* Plain data size */ - Oid va_valueid; /* Unique identifier of value */ - Oid va_longrelid; /* RelID where to find chunks */ - Oid va_rowid; /* Main tables row Oid */ - int16 va_attno; /* Main tables attno */ - } va_external; /* External stored attribute */ + int32 va_rawsize; /* Plain data size */ + Oid va_valueid; /* Unique identifier of value */ + Oid va_longrelid; /* RelID where to find chunks */ + Oid va_rowid; /* Main tables row Oid */ + int16 va_attno; /* Main tables attno */ + } va_external;/* External stored attribute */ - char va_data[1]; /* Plain stored attribute */ - } va_content; -} varattrib; + char va_data[1]; /* Plain stored attribute */ + } va_content; +} varattrib; #define VARATT_FLAG_EXTERNAL 0x8000 #define VARATT_FLAG_COMPRESSED 0x4000 @@ -144,7 +146,7 @@ typedef struct varattrib #define VARATT_MASK_SIZE 0x3fff #define VARATT_SIZEP(_PTR) (((varattrib *)(_PTR))->va_header) -#define VARATT_SIZE(PTR) (VARATT_SIZEP(PTR) & VARATT_MASK_SIZE) +#define VARATT_SIZE(PTR) (VARATT_SIZEP(PTR) & VARATT_MASK_SIZE) #define VARATT_DATA(PTR) (((varattrib *)(PTR))->va_content.va_data) #define VARATT_IS_EXTENDED(PTR) \ @@ -160,22 +162,22 @@ typedef struct varattrib * so we (evil evil evil) declare it here once more. * ---------- */ -extern varattrib *heap_tuple_untoast_attr(varattrib *attr); +extern varattrib *heap_tuple_untoast_attr(varattrib * attr); #define VARATT_GETPLAIN(_ARG,_VAR) { \ if (VARATTR_IS_EXTENDED(_ARG)) \ - (_VAR) = (void *)heap_tuple_untoast_attr(_ARG); \ + (_VAR) = (void *)heap_tuple_untoast_attr(_ARG); \ else \ (_VAR) = (_ARG); \ } -#define VARATT_FREE(_ARG,VAR) { \ +#define VARATT_FREE(_ARG,VAR) do { \ if ((void *)(_VAR) != (void *)(_ARG)) \ pfree((void *)(_VAR)); \ - } -#else /* TUPLE_TOASTER_ACTIVE */ + } while (0) +#else /* TUPLE_TOASTER_ACTIVE */ #define VARATT_SIZE(__PTR) VARSIZE(__PTR) #define VARATT_SIZEP(__PTR) VARSIZE(__PTR) -#endif /* TUPLE_TOASTER_ACTIVE */ +#endif /* TUPLE_TOASTER_ACTIVE */ /* We want NameData to have length NAMEDATALEN and int alignment, @@ -251,7 +253,8 @@ typedef uint32 CommandId; * --------------- */ #ifdef CYR_RECODE -extern void SetCharSet(); +extern void SetCharSet(); + #endif /* CYR_RECODE */ #endif /* POSTGRES_H */ diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h index 33ea824cf2f..af052a65510 100644 --- a/src/include/rewrite/rewriteManip.h +++ b/src/include/rewrite/rewriteManip.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteManip.h,v 1.20 2000/03/16 03:23:17 tgl Exp $ + * $Id: rewriteManip.h,v 1.21 2000/04/12 17:16:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,9 +19,9 @@ /* RewriteManip.c */ extern void OffsetVarNodes(Node *node, int offset, int sublevels_up); extern void ChangeVarNodes(Node *node, int old_varno, int new_varno, - int sublevels_up); + int sublevels_up); extern void IncrementVarSublevelsUp(Node *node, int delta_sublevels_up, - int min_sublevels_up); + int min_sublevels_up); extern void AddQual(Query *parsetree, Node *qual); extern void AddHavingQual(Query *parsetree, Node *havingQual); extern void AddNotQual(Query *parsetree, Node *qual); @@ -33,7 +33,7 @@ extern bool checkExprHasSubLink(Node *node); extern void FixNew(RewriteInfo *info, Query *parsetree); extern void HandleRIRAttributeRule(Query *parsetree, List *rtable, - List *targetlist, int rt_index, - int attr_num, int *modified, int *badsql); + List *targetlist, int rt_index, + int attr_num, int *modified, int *badsql); #endif /* REWRITEMANIP_H */ diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h index 0c5b6d64c0c..2347db17bd0 100644 --- a/src/include/storage/buf_internals.h +++ b/src/include/storage/buf_internals.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: buf_internals.h,v 1.36 2000/04/09 04:43:18 tgl Exp $ + * $Id: buf_internals.h,v 1.37 2000/04/12 17:16:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,9 +67,9 @@ typedef struct buftag */ typedef struct bufblindid { - char dbname[NAMEDATALEN]; /* name of db in which buf belongs */ - char relname[NAMEDATALEN]; /* name of reln */ -} BufferBlindId; + char dbname[NAMEDATALEN]; /* name of db in which buf belongs */ + char relname[NAMEDATALEN]; /* name of reln */ +} BufferBlindId; #define BAD_BUFFER_ID(bid) ((bid) < 1 || (bid) > NBuffers) #define INVALID_DESCRIPTOR (-3) @@ -184,7 +184,7 @@ extern BufferDesc *LocalBufferDescriptors; extern int NLocBuffer; extern BufferDesc *LocalBufferAlloc(Relation reln, BlockNumber blockNum, - bool *foundPtr); + bool *foundPtr); extern int WriteLocalBuffer(Buffer buffer, bool release); extern int FlushLocalBuffer(Buffer buffer, bool release); extern void InitLocalBuffer(void); diff --git a/src/include/storage/buffile.h b/src/include/storage/buffile.h index 30ccb6e0933..3f79e5bfab4 100644 --- a/src/include/storage/buffile.h +++ b/src/include/storage/buffile.h @@ -18,7 +18,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: buffile.h,v 1.3 2000/01/26 05:58:32 momjian Exp $ + * $Id: buffile.h,v 1.4 2000/04/12 17:16:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,9 +41,9 @@ extern BufFile *BufFileCreate(File file); extern void BufFileClose(BufFile *file); extern size_t BufFileRead(BufFile *file, void *ptr, size_t size); extern size_t BufFileWrite(BufFile *file, void *ptr, size_t size); -extern int BufFileSeek(BufFile *file, int fileno, long offset, int whence); +extern int BufFileSeek(BufFile *file, int fileno, long offset, int whence); extern void BufFileTell(BufFile *file, int *fileno, long *offset); -extern int BufFileSeekBlock(BufFile *file, long blknum); +extern int BufFileSeekBlock(BufFile *file, long blknum); extern long BufFileTellBlock(BufFile *file); #endif /* BUFFILE_H */ diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index e852dfd0520..da078ffbf3c 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: bufmgr.h,v 1.36 2000/04/09 04:43:18 tgl Exp $ + * $Id: bufmgr.h,v 1.37 2000/04/12 17:16:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -169,8 +169,8 @@ extern int BufferPoolCheckLeak(void); extern void FlushBufferPool(void); extern BlockNumber BufferGetBlockNumber(Buffer buffer); extern BlockNumber RelationGetNumberOfBlocks(Relation relation); -extern int FlushRelationBuffers(Relation rel, BlockNumber block, - bool doFlush); +extern int FlushRelationBuffers(Relation rel, BlockNumber block, + bool doFlush); extern void ReleaseRelationBuffers(Relation rel); extern void DropBuffers(Oid dbid); extern void PrintPinnedBufs(void); diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index f82fc14cae9..fb45e204564 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: fd.h,v 1.20 2000/04/09 04:43:18 tgl Exp $ + * $Id: fd.h,v 1.21 2000/04/12 17:16:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -65,7 +65,7 @@ extern FILE *AllocateFile(char *name, char *mode); extern void FreeFile(FILE *); /* Miscellaneous support routines */ -extern bool ReleaseDataFile(void); +extern bool ReleaseDataFile(void); extern void closeAllVfds(void); extern void AtEOXact_Files(void); extern int pg_fsync(int fd); diff --git a/src/include/storage/itempos.h b/src/include/storage/itempos.h index d1306068765..83ff7a63626 100644 --- a/src/include/storage/itempos.h +++ b/src/include/storage/itempos.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: itempos.h,v 1.10 2000/01/26 05:58:33 momjian Exp $ + * $Id: itempos.h,v 1.11 2000/04/12 17:16:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,6 +40,6 @@ typedef ItemSubpositionData *ItemSubposition; * unsigned LEN; */ #define PSKIP(OBJP, LEN)\ - { (OBJP)->op_cp += (LEN); (OBJP)->op_len -= (LEN); } + do { (OBJP)->op_cp += (LEN); (OBJP)->op_len -= (LEN); } while (0) #endif /* ITEMPOS_H */ diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 1c0204132ce..5e9fb8b42f2 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lock.h,v 1.36 2000/01/26 05:58:33 momjian Exp $ + * $Id: lock.h,v 1.37 2000/04/12 17:16:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ typedef int LOCKMASK; * See LockShmemSize() in lock.c. * * NLOCKS_PER_XACT - The number of unique locks acquired in a transaction - * (should be configurable!) + * (should be configurable!) * NLOCKENTS - The maximum number of lock entries in the lock table. * ---------------------- */ @@ -62,19 +62,21 @@ typedef int LOCKMETHOD; typedef struct LTAG { - Oid relId; - Oid dbId; + Oid relId; + Oid dbId; union { - BlockNumber blkno; - TransactionId xid; - } objId; - /* - * offnum should be part of objId.tupleId above, but would increase - * sizeof(LOCKTAG) and so moved here; currently used by userlocks only. + BlockNumber blkno; + TransactionId xid; + } objId; + + /* + * offnum should be part of objId.tupleId above, but would increase + * sizeof(LOCKTAG) and so moved here; currently used by userlocks + * only. */ - OffsetNumber offnum; - uint16 lockmethod; /* needed by userlocks */ + OffsetNumber offnum; + uint16 lockmethod; /* needed by userlocks */ } LOCKTAG; #define TAGSIZE (sizeof(LOCKTAG)) diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 23e657c7918..a0f8660fbea 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: proc.h,v 1.29 2000/02/22 09:55:26 inoue Exp $ + * $Id: proc.h,v 1.30 2000/04/12 17:16:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -82,9 +82,9 @@ typedef struct procglobal int32 freeSemMap[MAX_PROC_SEMS / PROC_NSEMS_PER_SET]; /* - * In each freeSemMap entry, the PROC_NSEMS_PER_SET least-significant bits - * flag whether individual semaphores are in use, and the next higher bit - * is set to show that the entire set is allocated. + * In each freeSemMap entry, the PROC_NSEMS_PER_SET least-significant + * bits flag whether individual semaphores are in use, and the next + * higher bit is set to show that the entire set is allocated. */ } PROC_HDR; diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h index 9ea2d4b5b67..fadd87edb75 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.69 2000/01/26 05:58:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.70 2000/04/12 17:16:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -260,7 +260,7 @@ tas(slock_t *s_lock) #else /* i.e. not __osf__ */ #define TAS(lock) tas(lock) -#define S_UNLOCK(lock) { __asm__("mb"); *(lock) = 0; } +#define S_UNLOCK(lock) do { __asm__("mb"); *(lock) = 0; } while (0) static __inline__ int tas(volatile slock_t *lock) @@ -300,10 +300,10 @@ __asm__(" ldq $0, %0 \n\ */ #define S_UNLOCK(lock) \ -{ \ +do { \ volatile slock_t *lock_ = (volatile slock_t *) (lock); \ lock_->sema[0] = lock_->sema[1] = lock_->sema[2] = lock_->sema[3] = -1; \ -} +} while (0) #define S_LOCK_FREE(lock) ( *(int *) (((long) (lock) + 15) & ~15) != 0) diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index 18a14895d77..1d49eb8c620 100644 --- a/src/include/storage/sinvaladt.h +++ b/src/include/storage/sinvaladt.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sinvaladt.h,v 1.20 2000/01/26 05:58:33 momjian Exp $ + * $Id: sinvaladt.h,v 1.21 2000/04/12 17:16:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,7 @@ /* * The shared cache invalidation manager is responsible for transmitting - * invalidation messages between backends. Any message sent by any backend + * invalidation messages between backends. Any message sent by any backend * must be delivered to all already-running backends before it can be * forgotten. * @@ -35,7 +35,7 @@ * In reality, the messages are stored in a circular buffer of MAXNUMMESSAGES * entries. We translate MsgNum values into circular-buffer indexes by * computing MsgNum % MAXNUMMESSAGES (this should be fast as long as - * MAXNUMMESSAGES is a constant and a power of 2). As long as maxMsgNum + * MAXNUMMESSAGES is a constant and a power of 2). As long as maxMsgNum * doesn't exceed minMsgNum by more than MAXNUMMESSAGES, we have enough space * in the buffer. If the buffer does overflow, we reset it to empty and * force each backend to "reset", ie, discard all its invalidatable state. @@ -85,16 +85,19 @@ typedef struct ProcState /* Shared cache invalidation memory segment */ typedef struct SISeg { + /* * General state information */ int minMsgNum; /* oldest message still needed */ int maxMsgNum; /* next message number to be assigned */ int maxBackends; /* size of procState array */ + /* * Circular buffer holding shared-inval messages */ - SharedInvalidData buffer[MAXNUMMESSAGES]; + SharedInvalidData buffer[MAXNUMMESSAGES]; + /* * Per-backend state info. * @@ -106,20 +109,19 @@ typedef struct SISeg extern SISeg *shmInvalBuffer; /* pointer to the shared buffer segment, - * set by SISegmentAttach() - */ + * set by SISegmentAttach() */ /* * prototypes for functions in sinvaladt.c */ -extern int SISegmentInit(bool createNewSegment, IPCKey key, - int maxBackends); +extern int SISegmentInit(bool createNewSegment, IPCKey key, + int maxBackends); extern int SIBackendInit(SISeg *segP); extern bool SIInsertDataEntry(SISeg *segP, SharedInvalidData *data); -extern int SIGetDataEntry(SISeg *segP, int backendId, - SharedInvalidData *data); +extern int SIGetDataEntry(SISeg *segP, int backendId, + SharedInvalidData *data); extern void SIDelExpiredDataEntries(SISeg *segP); #endif /* SINVALADT_H */ diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h index bc0ec04bb2b..64702ffe702 100644 --- a/src/include/storage/smgr.h +++ b/src/include/storage/smgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: smgr.h,v 1.19 2000/04/10 23:41:45 tgl Exp $ + * $Id: smgr.h,v 1.20 2000/04/12 17:16:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,20 +29,20 @@ 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, - char *buffer); -extern int smgrwrite(int16 which, Relation reln, BlockNumber blocknum, - char *buffer); -extern int smgrflush(int16 which, Relation reln, BlockNumber blocknum, - char *buffer); -extern int smgrblindwrt(int16 which, char *dbname, char *relname, - Oid dbid, Oid relid, - BlockNumber blkno, char *buffer, - bool dofsync); +extern int smgrread(int16 which, Relation reln, BlockNumber blocknum, + char *buffer); +extern int smgrwrite(int16 which, Relation reln, BlockNumber blocknum, + char *buffer); +extern int smgrflush(int16 which, Relation reln, BlockNumber blocknum, + char *buffer); +extern int smgrblindwrt(int16 which, char *dbname, char *relname, + Oid dbid, Oid relid, + BlockNumber blkno, char *buffer, + bool dofsync); extern int smgrmarkdirty(int16 which, Relation reln, BlockNumber blkno); -extern int smgrblindmarkdirty(int16 which, char *dbname, char *relname, - Oid dbid, Oid relid, - BlockNumber blkno); +extern int smgrblindmarkdirty(int16 which, char *dbname, char *relname, + Oid dbid, Oid relid, + BlockNumber blkno); extern int smgrnblocks(int16 which, Relation reln); extern int smgrtruncate(int16 which, Relation reln, int nblocks); extern int smgrcommit(void); @@ -62,12 +62,12 @@ 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 *dbname, char *relname, Oid dbid, Oid relid, - BlockNumber blkno, char *buffer, - bool dofsync); +extern int mdblindwrt(char *dbname, char *relname, Oid dbid, Oid relid, + BlockNumber blkno, char *buffer, + bool dofsync); extern int mdmarkdirty(Relation reln, BlockNumber blkno); -extern int mdblindmarkdirty(char *dbname, char *relname, Oid dbid, Oid relid, - BlockNumber blkno); +extern int mdblindmarkdirty(char *dbname, char *relname, Oid dbid, Oid relid, + BlockNumber blkno); extern int mdnblocks(Relation reln); extern int mdtruncate(Relation reln, int nblocks); extern int mdcommit(void); @@ -85,12 +85,12 @@ 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 *dbname, char *relname, Oid dbid, Oid relid, - BlockNumber blkno, char *buffer, - bool dofsync); +extern int mmblindwrt(char *dbname, char *relname, Oid dbid, Oid relid, + BlockNumber blkno, char *buffer, + bool dofsync); extern int mmmarkdirty(Relation reln, BlockNumber blkno); -extern int mmblindmarkdirty(char *dbname, char *relname, Oid dbid, Oid relid, - BlockNumber blkno); +extern int mmblindmarkdirty(char *dbname, char *relname, Oid dbid, Oid relid, + BlockNumber blkno); extern int mmnblocks(Relation reln); extern int mmtruncate(Relation reln, int nblocks); extern int mmcommit(void); diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index 8255770068f..4e1de469334 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tcopprot.h,v 1.26 2000/04/04 21:44:37 tgl Exp $ + * $Id: tcopprot.h,v 1.27 2000/04/12 17:16:53 momjian Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -26,18 +26,18 @@ extern DLLIMPORT sigjmp_buf Warn_restart; extern bool Warn_restart_ready; extern bool InError; -extern bool ExitAfterAbort; +extern bool ExitAfterAbort; #ifndef BOOTSTRAP_INCLUDE extern List *pg_parse_and_rewrite(char *query_string, - Oid *typev, int nargs, - bool aclOverride); + Oid *typev, int nargs, + bool aclOverride); extern Plan *pg_plan_query(Query *querytree); extern void pg_exec_query_acl_override(char *query_string); extern void pg_exec_query_dest(char *query_string, - CommandDest dest, - bool aclOverride); + CommandDest dest, + bool aclOverride); #endif /* BOOTSTRAP_INCLUDE */ diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index c8b79da859c..f1f60fca4cd 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: acl.h,v 1.24 2000/01/26 05:58:37 momjian Exp $ + * $Id: acl.h,v 1.25 2000/04/12 17:16:54 momjian Exp $ * * NOTES * For backward-compatability purposes we have to allow there @@ -76,11 +76,13 @@ typedef struct AclItem AclId ai_id; AclIdType ai_idtype; AclMode ai_mode; + /* - * This is actually type 'aclitem', and we want a fixed size for - * for all platforms, so we pad this with dummies. + * This is actually type 'aclitem', and we want a fixed size for for + * all platforms, so we pad this with dummies. */ - char dummy1, dummy2; + char dummy1, + dummy2; } AclItem; /* Note: if the size of AclItem changes, diff --git a/src/include/utils/array.h b/src/include/utils/array.h index 2c42ebb9998..61317d47051 100644 --- a/src/include/utils/array.h +++ b/src/include/utils/array.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: array.h,v 1.22 2000/01/26 05:58:37 momjian Exp $ + * $Id: array.h,v 1.23 2000/04/12 17:16:54 momjian Exp $ * * NOTES * XXX the data array should be LONGALIGN'd -- notice that the array @@ -98,7 +98,7 @@ typedef struct *------------------------------------------------------------------------ */ -#define RETURN_NULL {*isNull = true; return(0); } +#define RETURN_NULL do {*isNull = true; return(0); } while (0) #define NAME_LEN 30 #define MAX_BUFF_SIZE BLCKSZ diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 270187e9173..80d91aba75a 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.109 2000/04/08 02:13:10 thomas Exp $ + * $Id: builtins.h,v 1.110 2000/04/12 17:16:54 momjian Exp $ * * NOTES * This should normally only be included by fmgr.h. @@ -164,11 +164,12 @@ extern int namestrcmp(Name name, const char *str); #define ltoa pg_ltoa #endif /* hpux */ extern int32 pg_atoi(char *s, int size, int c); + /* XXX hack. QNX has itoa and ltoa (with different arguments) already. */ #ifdef __QNX__ #define itoa pg_itoa #define ltoa pg_ltoa -#endif /* QNX */ +#endif /* QNX */ extern void itoa(int i, char *a); extern void ltoa(int32 l, char *a); @@ -363,11 +364,11 @@ extern Oid regproctooid(RegProcedure rp); /* ruleutils.c */ extern text *pg_get_ruledef(NameData *rname); -extern text *pg_get_viewdef(NameData *rname); -extern text *pg_get_indexdef(Oid indexrelid); +extern text *pg_get_viewdef(NameData *rname); +extern text *pg_get_indexdef(Oid indexrelid); extern NameData *pg_get_userbyid(int32 uid); extern char *deparse_expression(Node *expr, List *rangetables, - bool forceprefix); + bool forceprefix); /* selfuncs.c */ extern float64 eqsel(Oid opid, Oid relid, AttrNumber attno, Datum value, int32 flag); @@ -381,35 +382,35 @@ extern float64 scalargtjoinsel(Oid opid, Oid relid1, AttrNumber attno1, Oid reli extern bool convert_to_scalar(Datum value, Oid typid, double *scaleval); extern void btcostestimate(Query *root, RelOptInfo *rel, - IndexOptInfo *index, List *indexQuals, - Cost *indexStartupCost, - Cost *indexTotalCost, - Selectivity *indexSelectivity); + IndexOptInfo *index, List *indexQuals, + Cost *indexStartupCost, + Cost *indexTotalCost, + Selectivity *indexSelectivity); extern void rtcostestimate(Query *root, RelOptInfo *rel, - IndexOptInfo *index, List *indexQuals, - Cost *indexStartupCost, - Cost *indexTotalCost, - Selectivity *indexSelectivity); + IndexOptInfo *index, List *indexQuals, + Cost *indexStartupCost, + Cost *indexTotalCost, + Selectivity *indexSelectivity); extern void hashcostestimate(Query *root, RelOptInfo *rel, - IndexOptInfo *index, List *indexQuals, - Cost *indexStartupCost, - Cost *indexTotalCost, - Selectivity *indexSelectivity); + IndexOptInfo *index, List *indexQuals, + Cost *indexStartupCost, + Cost *indexTotalCost, + Selectivity *indexSelectivity); extern void gistcostestimate(Query *root, RelOptInfo *rel, - IndexOptInfo *index, List *indexQuals, - Cost *indexStartupCost, - Cost *indexTotalCost, - Selectivity *indexSelectivity); + IndexOptInfo *index, List *indexQuals, + Cost *indexStartupCost, + Cost *indexTotalCost, + Selectivity *indexSelectivity); /* tid.c */ extern ItemPointer tidin(const char *str); extern char *tidout(ItemPointer itemPtr); -extern bool tideq(ItemPointer,ItemPointer); -extern bool tidne(ItemPointer,ItemPointer); +extern bool tideq(ItemPointer, ItemPointer); +extern bool tidne(ItemPointer, ItemPointer); extern text *tid_text(ItemPointer); -extern ItemPointer text_tid(const text *); -extern ItemPointer currtid_byreloid(Oid relOid, ItemPointer); -extern ItemPointer currtid_byrelname(const text* relName, ItemPointer); +extern ItemPointer text_tid(const text *); +extern ItemPointer currtid_byreloid(Oid relOid, ItemPointer); +extern ItemPointer currtid_byrelname(const text *relName, ItemPointer); /* varchar.c */ extern char *bpcharin(char *s, int dummy, int32 atttypmod); @@ -490,7 +491,7 @@ extern text *rpad(text *string1, int4 len, text *string2); extern text *btrim(text *string, text *set); extern text *ltrim(text *string, text *set); extern text *rtrim(text *string, text *set); -extern text *substr(text *string, int4 m, int4 n); +extern text *substr(text *string, int4 m, int4 n); extern text *translate(text *string, text *from, text *to); extern text *ichar(int4 arg1); extern text *repeat(text *string, int4 count); @@ -503,113 +504,113 @@ extern char *inet_net_ntop(int af, const void *src, int bits, char *dst, size_t extern char *inet_cidr_ntop(int af, const void *src, int bits, char *dst, size_t size); /* inet_net_pton.c */ -extern int inet_net_pton(int af, const char *src, void *dst, size_t size); +extern int inet_net_pton(int af, const char *src, void *dst, size_t size); /* network.c */ -extern inet *inet_in(char *str); -extern char *inet_out(inet *addr); -extern inet *cidr_in(char *str); -extern char *cidr_out(inet *addr); -extern bool network_lt(inet *a1, inet *a2); -extern bool network_le(inet *a1, inet *a2); -extern bool network_eq(inet *a1, inet *a2); -extern bool network_ge(inet *a1, inet *a2); -extern bool network_gt(inet *a1, inet *a2); -extern bool network_ne(inet *a1, inet *a2); -extern bool network_sub(inet *a1, inet *a2); -extern bool network_subeq(inet *a1, inet *a2); -extern bool network_sup(inet *a1, inet *a2); -extern bool network_supeq(inet *a1, inet *a2); -extern int4 network_cmp(inet *a1, inet *a2); - -extern text *network_network(inet *addr); -extern text *network_netmask(inet *addr); -extern int4 network_masklen(inet *addr); -extern text *network_broadcast(inet *addr); -extern text *network_host(inet *addr); +extern inet *inet_in(char *str); +extern char *inet_out(inet *addr); +extern inet *cidr_in(char *str); +extern char *cidr_out(inet *addr); +extern bool network_lt(inet *a1, inet *a2); +extern bool network_le(inet *a1, inet *a2); +extern bool network_eq(inet *a1, inet *a2); +extern bool network_ge(inet *a1, inet *a2); +extern bool network_gt(inet *a1, inet *a2); +extern bool network_ne(inet *a1, inet *a2); +extern bool network_sub(inet *a1, inet *a2); +extern bool network_subeq(inet *a1, inet *a2); +extern bool network_sup(inet *a1, inet *a2); +extern bool network_supeq(inet *a1, inet *a2); +extern int4 network_cmp(inet *a1, inet *a2); + +extern text *network_network(inet *addr); +extern text *network_netmask(inet *addr); +extern int4 network_masklen(inet *addr); +extern text *network_broadcast(inet *addr); +extern text *network_host(inet *addr); /* mac.c */ extern macaddr *macaddr_in(char *str); -extern char *macaddr_out(macaddr *addr); -extern bool macaddr_lt(macaddr *a1, macaddr *a2); -extern bool macaddr_le(macaddr *a1, macaddr *a2); -extern bool macaddr_eq(macaddr *a1, macaddr *a2); -extern bool macaddr_ge(macaddr *a1, macaddr *a2); -extern bool macaddr_gt(macaddr *a1, macaddr *a2); -extern bool macaddr_ne(macaddr *a1, macaddr *a2); -extern int4 macaddr_cmp(macaddr *a1, macaddr *a2); -extern text *macaddr_manuf(macaddr *addr); +extern char *macaddr_out(macaddr *addr); +extern bool macaddr_lt(macaddr *a1, macaddr *a2); +extern bool macaddr_le(macaddr *a1, macaddr *a2); +extern bool macaddr_eq(macaddr *a1, macaddr *a2); +extern bool macaddr_ge(macaddr *a1, macaddr *a2); +extern bool macaddr_gt(macaddr *a1, macaddr *a2); +extern bool macaddr_ne(macaddr *a1, macaddr *a2); +extern int4 macaddr_cmp(macaddr *a1, macaddr *a2); +extern text *macaddr_manuf(macaddr *addr); /* numeric.c */ -extern Numeric numeric_in(char *str, int dummy, int32 typmod); -extern char *numeric_out(Numeric num); -extern Numeric numeric(Numeric num, int32 typmod); -extern Numeric numeric_abs(Numeric num); -extern Numeric numeric_uminus(Numeric num); -extern Numeric numeric_sign(Numeric num); -extern Numeric numeric_round(Numeric num, int32 scale); -extern Numeric numeric_trunc(Numeric num, int32 scale); -extern Numeric numeric_ceil(Numeric num); -extern Numeric numeric_floor(Numeric num); -extern int32 numeric_cmp(Numeric num1, Numeric num2); -extern bool numeric_eq(Numeric num1, Numeric num2); -extern bool numeric_ne(Numeric num1, Numeric num2); -extern bool numeric_gt(Numeric num1, Numeric num2); -extern bool numeric_ge(Numeric num1, Numeric num2); -extern bool numeric_lt(Numeric num1, Numeric num2); -extern bool numeric_le(Numeric num1, Numeric num2); -extern Numeric numeric_add(Numeric num1, Numeric num2); -extern Numeric numeric_sub(Numeric num1, Numeric num2); -extern Numeric numeric_mul(Numeric num1, Numeric num2); -extern Numeric numeric_div(Numeric num1, Numeric num2); -extern Numeric numeric_mod(Numeric num1, Numeric num2); -extern Numeric numeric_inc(Numeric num); -extern Numeric numeric_dec(Numeric num); -extern Numeric numeric_smaller(Numeric num1, Numeric num2); -extern Numeric numeric_larger(Numeric num1, Numeric num2); -extern Numeric numeric_sqrt(Numeric num); -extern Numeric numeric_exp(Numeric num); -extern Numeric numeric_ln(Numeric num); -extern Numeric numeric_log(Numeric num1, Numeric num2); -extern Numeric numeric_power(Numeric num1, Numeric num2); -extern Numeric int4_numeric(int32 val); -extern int32 numeric_int4(Numeric num); -extern Numeric int8_numeric(int64 *val); -extern int64 *numeric_int8(Numeric num); -extern Numeric int2_numeric(int16 val); -extern int16 numeric_int2(Numeric num); -extern Numeric float4_numeric(float32 val); -extern float32 numeric_float4(Numeric num); -extern Numeric float8_numeric(float64 val); -extern float64 numeric_float8(Numeric num); +extern Numeric numeric_in(char *str, int dummy, int32 typmod); +extern char *numeric_out(Numeric num); +extern Numeric numeric(Numeric num, int32 typmod); +extern Numeric numeric_abs(Numeric num); +extern Numeric numeric_uminus(Numeric num); +extern Numeric numeric_sign(Numeric num); +extern Numeric numeric_round(Numeric num, int32 scale); +extern Numeric numeric_trunc(Numeric num, int32 scale); +extern Numeric numeric_ceil(Numeric num); +extern Numeric numeric_floor(Numeric num); +extern int32 numeric_cmp(Numeric num1, Numeric num2); +extern bool numeric_eq(Numeric num1, Numeric num2); +extern bool numeric_ne(Numeric num1, Numeric num2); +extern bool numeric_gt(Numeric num1, Numeric num2); +extern bool numeric_ge(Numeric num1, Numeric num2); +extern bool numeric_lt(Numeric num1, Numeric num2); +extern bool numeric_le(Numeric num1, Numeric num2); +extern Numeric numeric_add(Numeric num1, Numeric num2); +extern Numeric numeric_sub(Numeric num1, Numeric num2); +extern Numeric numeric_mul(Numeric num1, Numeric num2); +extern Numeric numeric_div(Numeric num1, Numeric num2); +extern Numeric numeric_mod(Numeric num1, Numeric num2); +extern Numeric numeric_inc(Numeric num); +extern Numeric numeric_dec(Numeric num); +extern Numeric numeric_smaller(Numeric num1, Numeric num2); +extern Numeric numeric_larger(Numeric num1, Numeric num2); +extern Numeric numeric_sqrt(Numeric num); +extern Numeric numeric_exp(Numeric num); +extern Numeric numeric_ln(Numeric num); +extern Numeric numeric_log(Numeric num1, Numeric num2); +extern Numeric numeric_power(Numeric num1, Numeric num2); +extern Numeric int4_numeric(int32 val); +extern int32 numeric_int4(Numeric num); +extern Numeric int8_numeric(int64 *val); +extern int64 *numeric_int8(Numeric num); +extern Numeric int2_numeric(int16 val); +extern int16 numeric_int2(Numeric num); +extern Numeric float4_numeric(float32 val); +extern float32 numeric_float4(Numeric num); +extern Numeric float8_numeric(float64 val); +extern float64 numeric_float8(Numeric num); /* lztext.c */ -lztext *lztextin(char *str); -char *lztextout(lztext *lz); -text *lztext_text(lztext *lz); -lztext *text_lztext(text *txt); -int32 lztextlen(lztext *lz); -int32 lztextoctetlen(lztext *lz); -int32 lztext_cmp(lztext *lz1, lztext *lz2); -bool lztext_eq(lztext *lz1, lztext *lz2); -bool lztext_ne(lztext *lz1, lztext *lz2); -bool lztext_gt(lztext *lz1, lztext *lz2); -bool lztext_ge(lztext *lz1, lztext *lz2); -bool lztext_lt(lztext *lz1, lztext *lz2); -bool lztext_le(lztext *lz1, lztext *lz2); +lztext *lztextin(char *str); +char *lztextout(lztext *lz); +text *lztext_text(lztext *lz); +lztext *text_lztext(text *txt); +int32 lztextlen(lztext *lz); +int32 lztextoctetlen(lztext *lz); +int32 lztext_cmp(lztext *lz1, lztext *lz2); +bool lztext_eq(lztext *lz1, lztext *lz2); +bool lztext_ne(lztext *lz1, lztext *lz2); +bool lztext_gt(lztext *lz1, lztext *lz2); +bool lztext_ge(lztext *lz1, lztext *lz2); +bool lztext_lt(lztext *lz1, lztext *lz2); +bool lztext_le(lztext *lz1, lztext *lz2); /* ri_triggers.c */ -extern HeapTuple RI_FKey_check_ins(FmgrInfo *proinfo); -extern HeapTuple RI_FKey_check_upd(FmgrInfo *proinfo); -extern HeapTuple RI_FKey_noaction_del(FmgrInfo *proinfo); -extern HeapTuple RI_FKey_noaction_upd(FmgrInfo *proinfo); -extern HeapTuple RI_FKey_cascade_del(FmgrInfo *proinfo); -extern HeapTuple RI_FKey_cascade_upd(FmgrInfo *proinfo); -extern HeapTuple RI_FKey_restrict_del(FmgrInfo *proinfo); -extern HeapTuple RI_FKey_restrict_upd(FmgrInfo *proinfo); -extern HeapTuple RI_FKey_setnull_del(FmgrInfo *proinfo); -extern HeapTuple RI_FKey_setnull_upd(FmgrInfo *proinfo); -extern HeapTuple RI_FKey_setdefault_del(FmgrInfo *proinfo); -extern HeapTuple RI_FKey_setdefault_upd(FmgrInfo *proinfo); +extern HeapTuple RI_FKey_check_ins(FmgrInfo *proinfo); +extern HeapTuple RI_FKey_check_upd(FmgrInfo *proinfo); +extern HeapTuple RI_FKey_noaction_del(FmgrInfo *proinfo); +extern HeapTuple RI_FKey_noaction_upd(FmgrInfo *proinfo); +extern HeapTuple RI_FKey_cascade_del(FmgrInfo *proinfo); +extern HeapTuple RI_FKey_cascade_upd(FmgrInfo *proinfo); +extern HeapTuple RI_FKey_restrict_del(FmgrInfo *proinfo); +extern HeapTuple RI_FKey_restrict_upd(FmgrInfo *proinfo); +extern HeapTuple RI_FKey_setnull_del(FmgrInfo *proinfo); +extern HeapTuple RI_FKey_setnull_upd(FmgrInfo *proinfo); +extern HeapTuple RI_FKey_setdefault_del(FmgrInfo *proinfo); +extern HeapTuple RI_FKey_setdefault_upd(FmgrInfo *proinfo); #endif /* BUILTINS_H */ diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index 7b4b679e9dd..cf9b1efc6f3 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catcache.h,v 1.20 2000/02/21 03:36:59 tgl Exp $ + * $Id: catcache.h,v 1.21 2000/04/12 17:16:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,9 @@ typedef struct catctup { HeapTuple ct_tup; /* A pointer to a tuple */ - /* Each tuple in the cache has two catctup items, one in the LRU list + + /* + * Each tuple in the cache has two catctup items, one in the LRU list * and one in the hashbucket list for its hash value. ct_node in each * one points to the other one. */ @@ -38,7 +40,7 @@ typedef struct catctup #define NCCBUCK 500 /* CatCache buckets */ #define MAXTUP 300 /* Maximum # of tuples cached per cache */ -typedef uint32 (* CCHashFunc) (Datum); +typedef uint32 (*CCHashFunc) (Datum); typedef struct catcache { @@ -55,11 +57,11 @@ typedef struct catcache short cc_nkeys; short cc_size; short cc_key[4]; /* AttrNumber of each key */ - CCHashFunc cc_hashfunc[4]; /* hash function to use for each key */ + CCHashFunc cc_hashfunc[4]; /* hash function to use for each key */ ScanKeyData cc_skey[4]; struct catcache *cc_next; Dllist *cc_lrulist; /* LRU list, most recent first */ - Dllist *cc_cache[NCCBUCK + 1]; /* hash buckets */ + Dllist *cc_cache[NCCBUCK + 1]; /* hash buckets */ } CatCache; #define InvalidCatalogCacheId (-1) diff --git a/src/include/utils/date.h b/src/include/utils/date.h index b474634a384..0d53f3755c1 100644 --- a/src/include/utils/date.h +++ b/src/include/utils/date.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: date.h,v 1.2 2000/03/14 23:06:50 thomas Exp $ + * $Id: date.h,v 1.3 2000/04/12 17:16:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,8 +20,9 @@ typedef float8 TimeADT; typedef struct { - double time; /* all time units other than months and years */ - int4 zone; /* numeric time zone, in seconds */ + double time; /* all time units other than months and + * years */ + int4 zone; /* numeric time zone, in seconds */ } TimeTzADT; /* date.c */ @@ -52,9 +53,9 @@ extern bool time_lt(TimeADT *time1, TimeADT *time2); extern bool time_le(TimeADT *time1, TimeADT *time2); extern bool time_gt(TimeADT *time1, TimeADT *time2); extern bool time_ge(TimeADT *time1, TimeADT *time2); -extern int time_cmp(TimeADT *time1, TimeADT *time2); +extern int time_cmp(TimeADT *time1, TimeADT *time2); extern bool overlaps_time(TimeADT *time1, TimeADT *time2, - TimeADT *time3, TimeADT *time4); + TimeADT *time3, TimeADT *time4); extern TimeADT *time_larger(TimeADT *time1, TimeADT *time2); extern TimeADT *time_smaller(TimeADT *time1, TimeADT *time2); extern TimeADT *timestamp_time(Timestamp *timestamp); @@ -68,15 +69,12 @@ extern bool timetz_lt(TimeTzADT *time1, TimeTzADT *time2); extern bool timetz_le(TimeTzADT *time1, TimeTzADT *time2); extern bool timetz_gt(TimeTzADT *time1, TimeTzADT *time2); extern bool timetz_ge(TimeTzADT *time1, TimeTzADT *time2); -extern int timetz_cmp(TimeTzADT *time1, TimeTzADT *time2); +extern int timetz_cmp(TimeTzADT *time1, TimeTzADT *time2); extern bool overlaps_timetz(TimeTzADT *time1, TimeTzADT *time2, - TimeTzADT *time3, TimeTzADT *time4); + TimeTzADT *time3, TimeTzADT *time4); extern TimeTzADT *timetz_larger(TimeTzADT *time1, TimeTzADT *time2); extern TimeTzADT *timetz_smaller(TimeTzADT *time1, TimeTzADT *time2); extern TimeTzADT *timestamp_timetz(Timestamp *timestamp); extern Timestamp *datetimetz_timestamp(DateADT date, TimeTzADT *time); #endif /* DATE_H */ - - - diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h index e6469d46de5..0ba0504e85b 100644 --- a/src/include/utils/datetime.h +++ b/src/include/utils/datetime.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: datetime.h,v 1.11 2000/03/14 23:06:50 thomas Exp $ + * $Id: datetime.h,v 1.12 2000/04/12 17:16:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -236,39 +236,39 @@ extern void j2date(int jd, int *year, int *month, int *day); extern int date2j(int year, int month, int day); extern int ParseDateTime(char *timestr, char *lowstr, - char **field, int *ftype, - int maxfields, int *numfields); + char **field, int *ftype, + int maxfields, int *numfields); extern int DecodeDateTime(char **field, int *ftype, - int nf, int *dtype, - struct tm * tm, double *fsec, int *tzp); + int nf, int *dtype, + struct tm * tm, double *fsec, int *tzp); extern int DecodeTimeOnly(char **field, int *ftype, - int nf, int *dtype, - struct tm * tm, double *fsec, int *tzp); + int nf, int *dtype, + struct tm * tm, double *fsec, int *tzp); extern int DecodeDateDelta(char **field, int *ftype, - int nf, int *dtype, - struct tm * tm, double *fsec); + 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 *tzp, 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 *tzp, 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 DecodeDate(char *str, int fmask, int *tmask, struct tm * tm); +extern int DecodeDate(char *str, int fmask, int *tmask, struct tm * tm); extern int DecodeNumber(int flen, char *field, - int fmask, int *tmask, - struct tm * tm, double *fsec, int *is2digits); + int fmask, int *tmask, + struct tm * tm, double *fsec, int *is2digits); extern int DecodeNumberField(int len, char *str, - int fmask, int *tmask, - struct tm * tm, double *fsec, int *is2digits); -extern int DecodeSpecial(int field, char *lowtoken, int *val); + int fmask, int *tmask, + struct tm * tm, double *fsec, int *is2digits); +extern int DecodeSpecial(int field, char *lowtoken, int *val); extern int DecodeTime(char *str, int fmask, int *tmask, - struct tm * tm, double *fsec); -extern int DecodeTimezone(char *str, int *tzp); -extern int DecodeUnits(int field, char *lowtoken, int *val); + struct tm * tm, double *fsec); +extern int DecodeTimezone(char *str, int *tzp); +extern int DecodeUnits(int field, char *lowtoken, int *val); extern datetkn *datebsearch(char *key, datetkn *base, unsigned int nel); -extern int j2day(int jd); +extern int j2day(int jd); #endif /* DATETIME_H */ diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index eb9ed14f10e..190d44cfff2 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: elog.h,v 1.15 2000/01/26 05:58:37 momjian Exp $ + * $Id: elog.h,v 1.16 2000/04/12 17:16:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,22 +17,25 @@ #define NOTICE 0 /* random info - no special action */ #define ERROR (-1) /* user error - return to known state */ #define FATAL 1 /* fatal error - abort process */ -#define REALLYFATAL 2 /* take down the other backends with me */ -#define STOP REALLYFATAL +#define REALLYFATAL 2 /* take down the other backends with me */ +#define STOP REALLYFATAL #define DEBUG (-2) /* debug message */ -#define LOG DEBUG +#define LOG DEBUG #define NOIND (-3) /* debug message, don't indent as far */ #ifndef __GNUC__ -extern void elog(int lev, const char *fmt, ...); +extern void elog(int lev, const char *fmt,...); + #else /* This extension allows gcc to check the format string for consistency with the supplied arguments. */ -extern void elog(int lev, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); +extern void elog(int lev, const char *fmt,...) __attribute__((format(printf, 2, 3))); + #endif #ifndef PG_STANDALONE extern int DebugFileOpen(void); + #endif #endif /* ELOG_H */ diff --git a/src/include/utils/formatting.h b/src/include/utils/formatting.h index 39259afff24..36cc381b36d 100644 --- a/src/include/utils/formatting.h +++ b/src/include/utils/formatting.h @@ -2,15 +2,15 @@ /* ----------------------------------------------------------------------- * formatting.h * - * $Id: formatting.h,v 1.3 2000/02/16 17:26:26 thomas Exp $ + * $Id: formatting.h,v 1.4 2000/04/12 17:16:55 momjian Exp $ * * - * Portions Copyright (c) 1999-2000, PostgreSQL, Inc + * Portions Copyright (c) 1999-2000, PostgreSQL, Inc * - * The PostgreSQL routines for a DateTime/int/float/numeric formatting, - * inspire with Oracle TO_CHAR() / TO_DATE() / TO_NUMBER() routines. + * The PostgreSQL routines for a DateTime/int/float/numeric formatting, + * inspire with Oracle TO_CHAR() / TO_DATE() / TO_NUMBER() routines. * - * Karel Zak - Zakkr + * Karel Zak - Zakkr * * ----------------------------------------------------------------------- */ diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h index 6d8869802c0..305b482a64e 100644 --- a/src/include/utils/geo_decls.h +++ b/src/include/utils/geo_decls.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geo_decls.h,v 1.26 2000/03/14 23:06:50 thomas Exp $ + * $Id: geo_decls.h,v 1.27 2000/04/12 17:16:55 momjian Exp $ * * NOTE * These routines do *not* use the float types from adt/. @@ -361,16 +361,16 @@ extern double circle_dt(CIRCLE *circle1, CIRCLE *circle2); /* geo_selfuncs.c */ extern float64 areasel(Oid opid, Oid relid, AttrNumber attno, - Datum value, int32 flag); + Datum value, int32 flag); extern float64 areajoinsel(Oid opid, Oid relid1, AttrNumber attno1, - Oid relid2, AttrNumber attno2); + Oid relid2, AttrNumber attno2); extern float64 positionsel(Oid opid, Oid relid, AttrNumber attno, - Datum value, int32 flag); + Datum value, int32 flag); extern float64 positionjoinsel(Oid opid, Oid relid1, AttrNumber attno1, - Oid relid2, AttrNumber attno2); + Oid relid2, AttrNumber attno2); extern float64 contsel(Oid opid, Oid relid, AttrNumber attno, - Datum value, int32 flag); + Datum value, int32 flag); extern float64 contjoinsel(Oid opid, Oid relid1, AttrNumber attno1, - Oid relid2, AttrNumber attno2); + Oid relid2, AttrNumber attno2); #endif /* GEO_DECLS_H */ diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h index aa5f4603012..ef243da145f 100644 --- a/src/include/utils/hsearch.h +++ b/src/include/utils/hsearch.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: hsearch.h,v 1.14 2000/02/26 05:25:53 tgl Exp $ + * $Id: hsearch.h,v 1.15 2000/04/12 17:16:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,13 +27,13 @@ * In a hash table allocated in shared memory, the directory cannot be * expanded because it must stay at a fixed address. The directory size * should be selected using hash_select_dirsize (and you'd better have - * a good idea of the maximum number of entries!). For non-shared hash + * a good idea of the maximum number of entries!). For non-shared hash * tables, the initial directory size can be left at the default. */ #define DEF_SEGSIZE 256 -#define DEF_SEGSIZE_SHIFT 8 /* must be log2(DEF_SEGSIZE) */ +#define DEF_SEGSIZE_SHIFT 8/* must be log2(DEF_SEGSIZE) */ #define DEF_DIRSIZE 256 -#define DEF_FFACTOR 1 /* default fill factor */ +#define DEF_FFACTOR 1/* default fill factor */ #define PRIME1 37 /* for the hash function */ #define PRIME2 1048583 @@ -68,8 +68,9 @@ typedef struct hashhdr long nsegs; /* Number of allocated segments */ long keysize; /* hash key length in bytes */ long datasize; /* elem data length in bytes */ - long max_dsize; /* 'dsize' limit if directory is fixed size */ - BUCKET_INDEX freeBucketIndex; /* index of first free bucket */ + long max_dsize; /* 'dsize' limit if directory is fixed + * size */ + BUCKET_INDEX freeBucketIndex; /* index of first free bucket */ #ifdef HASH_STATISTICS long accesses; long collisions; diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h index 02053d6c393..dab1e0addd1 100644 --- a/src/include/utils/int8.h +++ b/src/include/utils/int8.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: int8.h,v 1.19 2000/03/14 23:06:50 thomas Exp $ + * $Id: int8.h,v 1.20 2000/04/12 17:16:55 momjian Exp $ * * NOTES * These data types are supported on all 64-bit architectures, and may @@ -97,6 +97,7 @@ extern int32 int84(int64 *val); #ifdef NOT_USED extern int16 int82(int64 *val); + #endif extern float64 i8tod(int64 *val); diff --git a/src/include/utils/logtape.h b/src/include/utils/logtape.h index 24bf0bca59b..1ce02fc64b4 100644 --- a/src/include/utils/logtape.h +++ b/src/include/utils/logtape.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: logtape.h,v 1.2 2000/01/26 05:58:38 momjian Exp $ + * $Id: logtape.h,v 1.3 2000/04/12 17:16:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,16 +27,16 @@ typedef struct LogicalTapeSet LogicalTapeSet; extern LogicalTapeSet *LogicalTapeSetCreate(int ntapes); extern void LogicalTapeSetClose(LogicalTapeSet *lts); extern size_t LogicalTapeRead(LogicalTapeSet *lts, int tapenum, - void *ptr, size_t size); + void *ptr, size_t size); extern void LogicalTapeWrite(LogicalTapeSet *lts, int tapenum, - void *ptr, size_t size); + void *ptr, size_t size); extern void LogicalTapeRewind(LogicalTapeSet *lts, int tapenum, bool forWrite); extern void LogicalTapeFreeze(LogicalTapeSet *lts, int tapenum); extern bool LogicalTapeBackspace(LogicalTapeSet *lts, int tapenum, - size_t size); + size_t size); extern bool LogicalTapeSeek(LogicalTapeSet *lts, int tapenum, - long blocknum, int offset); + long blocknum, int offset); extern void LogicalTapeTell(LogicalTapeSet *lts, int tapenum, - long *blocknum, int *offset); + long *blocknum, int *offset); #endif /* LOGTAPE_H */ diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index df510f60bfb..b6c02a11929 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: lsyscache.h,v 1.22 2000/01/26 05:58:38 momjian Exp $ + * $Id: lsyscache.h,v 1.23 2000/04/12 17:16:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,7 @@ extern Oid get_atttype(Oid relid, AttrNumber attnum); extern bool get_attisset(Oid relid, char *attname); extern int32 get_atttypmod(Oid relid, AttrNumber attnum); extern double get_attdisbursion(Oid relid, AttrNumber attnum, - double min_estimate); + double min_estimate); extern RegProcedure get_opcode(Oid opid); extern char *get_opname(Oid opid); extern bool op_mergejoinable(Oid opid, Oid ltype, Oid rtype, diff --git a/src/include/utils/lztext.h b/src/include/utils/lztext.h index a10ab34cd1e..8936ffb133d 100644 --- a/src/include/utils/lztext.h +++ b/src/include/utils/lztext.h @@ -1,7 +1,7 @@ /* ---------- * lztext.h * - * $Header: /cvsroot/pgsql/src/include/utils/Attic/lztext.h,v 1.2 1999/12/28 13:40:53 wieck Exp $ + * $Header: /cvsroot/pgsql/src/include/utils/Attic/lztext.h,v 1.3 2000/04/12 17:16:55 momjian Exp $ * * Definitions for the lztext compressed data type * ---------- @@ -17,6 +17,6 @@ * The internal storage format of an LZ compressed text field * ---------- */ -typedef PGLZ_Header lztext; +typedef PGLZ_Header lztext; -#endif /* _LZTEXT_H_ */ +#endif /* _LZTEXT_H_ */ diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index e86c4be0ae9..a42bce402cd 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: memutils.h,v 1.33 2000/01/26 05:58:38 momjian Exp $ + * $Id: memutils.h,v 1.34 2000/04/12 17:16:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,7 @@ * ---------------- */ -#define TYPEALIGN(ALIGNVAL,LEN) (((long)(LEN) + (ALIGNVAL-1)) & ~(ALIGNVAL-1)) +#define TYPEALIGN(ALIGNVAL,LEN) (((long)(LEN) + (ALIGNVAL-1)) & ~(ALIGNVAL-1)) #define SHORTALIGN(LEN) TYPEALIGN(ALIGNOF_SHORT, (LEN)) #define INTALIGN(LEN) TYPEALIGN(ALIGNOF_INT, (LEN)) @@ -165,14 +165,14 @@ typedef struct AllocSetData { AllocBlock blocks; /* head of list of blocks in this set */ #define ALLOCSET_NUM_FREELISTS 8 - AllocChunk freelist[ALLOCSET_NUM_FREELISTS]; /* free chunk lists */ + AllocChunk freelist[ALLOCSET_NUM_FREELISTS]; /* free chunk lists */ /* Note: this will change in the future to support other modes */ } AllocSetData; /* * AllocBlock * An AllocBlock is the unit of memory that is obtained by aset.c - * from malloc(). It contains one or more AllocChunks, which are + * from malloc(). It contains one or more AllocChunks, which are * the units requested by palloc() and freed by pfree(). AllocChunks * cannot be returned to malloc() individually, instead they are put * on freelists by pfree() and re-used by the next palloc() that has diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h index a822e58a66e..97f5119fd74 100644 --- a/src/include/utils/nabstime.h +++ b/src/include/utils/nabstime.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nabstime.h,v 1.24 2000/03/27 17:07:48 thomas Exp $ + * $Id: nabstime.h,v 1.25 2000/04/12 17:16:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,7 +25,7 @@ * * ---------------------------------------------------------------- */ -/* +/* * Although time_t generally is a long int on 64 bit systems, these two * types must be 4 bytes, because that's what the system assumes. They * should be yanked (long) before 2038 and be replaced by timestamp and @@ -52,10 +52,10 @@ typedef TimeIntervalData *TimeInterval; * so redefine them explicitly using these bit patterns. - tgl 97/02/24 */ #define EPOCH_ABSTIME ((AbsoluteTime) 0) -#define INVALID_ABSTIME ((AbsoluteTime) 0x7FFFFFFE) /* 2147483647 (2^31 - 1) */ -#define CURRENT_ABSTIME ((AbsoluteTime) 0x7FFFFFFD) /* 2147483646 (2^31 - 2) */ -#define NOEND_ABSTIME ((AbsoluteTime) 0x7FFFFFFC) /* 2147483645 (2^31 - 3) */ -#define BIG_ABSTIME ((AbsoluteTime) 0x7FFFFFFB) /* 2147483644 (2^31 - 4) */ +#define INVALID_ABSTIME ((AbsoluteTime) 0x7FFFFFFE) /* 2147483647 (2^31 - 1) */ +#define CURRENT_ABSTIME ((AbsoluteTime) 0x7FFFFFFD) /* 2147483646 (2^31 - 2) */ +#define NOEND_ABSTIME ((AbsoluteTime) 0x7FFFFFFC) /* 2147483645 (2^31 - 3) */ +#define BIG_ABSTIME ((AbsoluteTime) 0x7FFFFFFB) /* 2147483644 (2^31 - 4) */ #if defined(_AIX) /* @@ -66,10 +66,10 @@ typedef TimeIntervalData *TimeInterval; */ #define NOSTART_ABSTIME ((AbsoluteTime) INT_MIN) #else -#define NOSTART_ABSTIME ((AbsoluteTime) 0x80000001) /* -2147483647 (- 2^31) */ +#define NOSTART_ABSTIME ((AbsoluteTime) 0x80000001) /* -2147483647 (- 2^31) */ #endif /* _AIX */ -#define INVALID_RELTIME ((RelativeTime) 0x7FFFFFFE) /* 2147483647 (2^31 - 1) */ +#define INVALID_RELTIME ((RelativeTime) 0x7FFFFFFE) /* 2147483647 (2^31 - 1) */ #define AbsoluteTimeIsValid(time) \ ((bool) ((time) != INVALID_ABSTIME)) diff --git a/src/include/utils/numeric.h b/src/include/utils/numeric.h index cd8ff13e289..1b3864dc0dd 100644 --- a/src/include/utils/numeric.h +++ b/src/include/utils/numeric.h @@ -5,7 +5,7 @@ * * 1998 Jan Wieck * - * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.8 2000/01/15 23:42:48 tgl Exp $ + * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.9 2000/04/12 17:16:55 momjian Exp $ * * ---------- */ @@ -41,7 +41,7 @@ #define NUMERIC_POS 0x0000 #define NUMERIC_NEG 0x4000 #define NUMERIC_NAN 0xC000 -#define NUMERIC_DSCALE_MASK 0x3FFF +#define NUMERIC_DSCALE_MASK 0x3FFF #define NUMERIC_SIGN(n) ((n)->n_sign_dscale & NUMERIC_SIGN_MASK) #define NUMERIC_DSCALE(n) ((n)->n_sign_dscale & NUMERIC_DSCALE_MASK) #define NUMERIC_IS_NAN(n) (NUMERIC_SIGN(n) != NUMERIC_POS && \ diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h index 21e9a6d0f5a..b3a178d6a79 100644 --- a/src/include/utils/pg_locale.h +++ b/src/include/utils/pg_locale.h @@ -2,50 +2,51 @@ /* ----------------------------------------------------------------------- * pg_locale.h * - * $Header: /cvsroot/pgsql/src/include/utils/pg_locale.h,v 1.3 2000/03/18 18:57:15 tgl Exp $ + * $Header: /cvsroot/pgsql/src/include/utils/pg_locale.h,v 1.4 2000/04/12 17:16:55 momjian Exp $ * * - * Portions Copyright (c) 1999-2000, PostgreSQL, Inc + * Portions Copyright (c) 1999-2000, PostgreSQL, Inc * - * The PostgreSQL locale utils. + * The PostgreSQL locale utils. * * Karel Zak - Zakkr * * ----------------------------------------------------------------------- */ - - #ifndef _PG_LOCALE_ - #define _PG_LOCALE_ - - #ifdef USE_LOCALE - + +#ifndef _PG_LOCALE_ +#define _PG_LOCALE_ + +#ifdef USE_LOCALE + /*------ * POSIX locale categories and environment variable LANG *------ */ -typedef struct PG_LocaleCategories { - char *lang, - *lc_ctype, - *lc_numeric, - *lc_time, - *lc_collate, - *lc_monetary, - *lc_messages; -} PG_LocaleCategories; +typedef struct PG_LocaleCategories +{ + char *lang, + *lc_ctype, + *lc_numeric, + *lc_time, + *lc_collate, + *lc_monetary, + *lc_messages; +} PG_LocaleCategories; -extern PG_LocaleCategories *PGLC_current( PG_LocaleCategories *lc ); -extern PG_LocaleCategories *PGLC_setlocale( PG_LocaleCategories *lc ); +extern PG_LocaleCategories *PGLC_current(PG_LocaleCategories * lc); +extern PG_LocaleCategories *PGLC_setlocale(PG_LocaleCategories * lc); /*------ * Return the POSIX lconv struct (contains number/money formatting information) - * with locale information for *all* categories. Returned lconv is *independent* + * with locale information for *all* categories. Returned lconv is *independent* * on current locale catogories setting - in contrast to standard localeconv(). *------ */ extern struct lconv *PGLC_localeconv(void); - -#endif /* USE_LOCALE */ - -#endif /* _PG_LOCALE_ */ + +#endif /* USE_LOCALE */ + +#endif /* _PG_LOCALE_ */ diff --git a/src/include/utils/pg_lzcompress.h b/src/include/utils/pg_lzcompress.h index db9618fd40e..fd1e62a8bed 100644 --- a/src/include/utils/pg_lzcompress.h +++ b/src/include/utils/pg_lzcompress.h @@ -1,7 +1,7 @@ /* ---------- * pg_lzcompress.h - * - * $Header: /cvsroot/pgsql/src/include/utils/pg_lzcompress.h,v 1.4 2000/01/05 18:23:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/utils/pg_lzcompress.h,v 1.5 2000/04/12 17:16:55 momjian Exp $ * * Definitions for the builtin LZ compressor * ---------- @@ -14,14 +14,15 @@ /* ---------- * PGLZ_Header - * - * The information at the top of the compressed data. + * The information at the top of the compressed data. * The varsize must be kept the same data type as the value * in front of all variable size data types in PostgreSQL. * ---------- */ -typedef struct PGLZ_Header { - int32 varsize; - int32 rawsize; +typedef struct PGLZ_Header +{ + int32 varsize; + int32 rawsize; } PGLZ_Header; @@ -54,9 +55,9 @@ typedef struct PGLZ_Header { * uncompressed data. * ---------- */ -#define PGLZ_IS_COMPRESSED(_lzdata) (_lzdata->varsize != \ - _lzdata->rawsize + \ - sizeof(PGLZ_Header)) +#define PGLZ_IS_COMPRESSED(_lzdata) (_lzdata->varsize != \ + _lzdata->rawsize + \ + sizeof(PGLZ_Header)) /* ---------- * PGLZ_RAW_DATA - @@ -65,7 +66,7 @@ typedef struct PGLZ_Header { * data. Useful if PGLZ_IS_COMPRESSED returns false. * ---------- */ -#define PGLZ_RAW_DATA(_lzdata) (((char *)(_lzdata)) + \ +#define PGLZ_RAW_DATA(_lzdata) (((char *)(_lzdata)) + \ sizeof(PGLZ_Header)) /* ---------- @@ -89,7 +90,7 @@ typedef struct PGLZ_Header { * lookup. When looking up the history to find a * match that could be expressed as a tag, the * algorithm does not allways walk back entirely. - * A good match fast is usually better than the + * A good match fast is usually better than the * best possible one very late. For each iteration * in the lookup, this value is lowered so the * longer the lookup takes, the smaller matches @@ -101,7 +102,8 @@ typedef struct PGLZ_Header { * latest history entry at all). * ---------- */ -typedef struct PGLZ_Strategy { +typedef struct PGLZ_Strategy +{ int32 min_input_size; int32 force_input_size; int32 min_comp_rate; @@ -117,16 +119,17 @@ typedef struct PGLZ_Strategy { * using pglz_decomp_getchar() macro. * ---------- */ -typedef struct PGLZ_DecompState { - unsigned char *temp_buf; - unsigned char *cp_in; - unsigned char *cp_end; - unsigned char *cp_out; - unsigned char *cp_copy; - int (*next_char)(struct PGLZ_DecompState *dstate); - int tocopy; - int ctrl_count; - unsigned char ctrl; +typedef struct PGLZ_DecompState +{ + unsigned char *temp_buf; + unsigned char *cp_in; + unsigned char *cp_end; + unsigned char *cp_out; + unsigned char *cp_copy; + int (*next_char) (struct PGLZ_DecompState *dstate); + int tocopy; + int ctrl_count; + unsigned char ctrl; } PGLZ_DecompState; @@ -154,9 +157,9 @@ typedef struct PGLZ_DecompState { * for generic interfacing. * ---------- */ -extern PGLZ_Strategy *PGLZ_strategy_default; -extern PGLZ_Strategy *PGLZ_strategy_allways; -extern PGLZ_Strategy *PGLZ_strategy_never; +extern PGLZ_Strategy *PGLZ_strategy_default; +extern PGLZ_Strategy *PGLZ_strategy_allways; +extern PGLZ_Strategy *PGLZ_strategy_never; /* ---------- @@ -177,10 +180,10 @@ extern PGLZ_Strategy *PGLZ_strategy_never; * Initialize a decomp state from a compressed input. * ---------- */ -#define pglz_decomp_init(_ds,_lz) { \ - (_ds)->cp_in = ((unsigned char *)(_lz)) \ +#define pglz_decomp_init(_ds,_lz) do { \ + (_ds)->cp_in = ((unsigned char *)(_lz)) \ + sizeof(PGLZ_Header); \ - (_ds)->cp_end = (_ds)->cp_in + (_lz)->varsize \ + (_ds)->cp_end = (_ds)->cp_in + (_lz)->varsize \ - sizeof(PGLZ_Header); \ if (PGLZ_IS_COMPRESSED((_lz))) { \ (_ds)->temp_buf = (unsigned char *) \ @@ -193,7 +196,7 @@ extern PGLZ_Strategy *PGLZ_strategy_never; (_ds)->temp_buf = NULL; \ (_ds)->next_char = pglz_get_next_decomp_char_from_plain; \ } \ - } + } while (0) /* ---------- @@ -202,19 +205,19 @@ extern PGLZ_Strategy *PGLZ_strategy_never; * Deallocate resources after decompression. * ---------- */ -#define pglz_decomp_end(_ds) { \ +#define pglz_decomp_end(_ds) do { \ if ((_ds)->temp_buf != NULL) \ pfree((void *)((_ds)->temp_buf)); \ - } + } while (0) /* ---------- * Global function declarations * ---------- */ -int pglz_compress (char *source, int32 slen, PGLZ_Header *dest, - PGLZ_Strategy *strategy); -int pglz_decompress (PGLZ_Header *source, char *dest); +int pglz_compress(char *source, int32 slen, PGLZ_Header *dest, + PGLZ_Strategy *strategy); +int pglz_decompress(PGLZ_Header *source, char *dest); /* ---------- @@ -222,8 +225,7 @@ int pglz_decompress (PGLZ_Header *source, char *dest); * Internal use only. * ---------- */ -extern int pglz_get_next_decomp_char_from_lzdata(PGLZ_DecompState *dstate); -extern int pglz_get_next_decomp_char_from_plain(PGLZ_DecompState *dstate); - -#endif /* _PG_LZCOMPRESS_H_ */ +extern int pglz_get_next_decomp_char_from_lzdata(PGLZ_DecompState *dstate); +extern int pglz_get_next_decomp_char_from_plain(PGLZ_DecompState *dstate); +#endif /* _PG_LZCOMPRESS_H_ */ diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index d24fd16f1a5..406fcc6af23 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: portal.h,v 1.22 2000/02/18 09:30:16 inoue Exp $ + * $Id: portal.h,v 1.23 2000/04/12 17:16:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,7 +61,7 @@ struct PortalD * Special portals (well, their names anyway) */ #define VACPNAME "<vacuum>" -#define TRUNCPNAME "<truncate>" +#define TRUNCPNAME "<truncate>" extern bool PortalNameIsSpecial(char *pname); extern void AtEOXact_portals(void); diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h index 0058e56ae3f..b74816586b4 100644 --- a/src/include/utils/ps_status.h +++ b/src/include/utils/ps_status.h @@ -21,7 +21,7 @@ extern char *ps_status_buffer; char *ps_status_buffer = NULL #define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) \ - { \ + do { \ int i; \ for (i = 0; i < (argc); i++) { \ memset((argv)[i], 0, strlen((argv)[i])); \ @@ -30,10 +30,10 @@ char *ps_status_buffer = NULL sprintf(ps_status_buffer, "%s %s %s %s ", execname, username, hostname, dbname); \ ps_status_buffer += strlen(ps_status_buffer); \ ps_status_buffer[0] = '\0'; \ - } + } while (0) #define PS_CLEAR_STATUS() \ - { if (ps_status_buffer) memset(ps_status_buffer, 0, strlen(ps_status_buffer)); } + do { if (ps_status_buffer) memset(ps_status_buffer, 0, strlen(ps_status_buffer)); } #define PS_SET_STATUS(status) \ { \ @@ -42,7 +42,7 @@ char *ps_status_buffer = NULL PS_CLEAR_STATUS(); \ strcpy(ps_status_buffer, status); \ } \ - } + } while (0) #define PS_STATUS (ps_status_buffer ? ps_status_buffer : "") @@ -53,7 +53,7 @@ extern char Ps_status_buffer[]; #undef PS_DEFINE_BUFFER #define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) \ - { \ + do { \ int i; \ Assert(argc >= 5); \ argv[0] = execname; \ @@ -63,13 +63,13 @@ extern char Ps_status_buffer[]; argv[4] = Ps_status_buffer; \ for (i = 5; i < argc; i++) \ argv[i] = ""; /* blank them */ \ - } + } while (0) #define PS_CLEAR_STATUS() \ - { Ps_status_buffer[0] = '\0'; } + do { Ps_status_buffer[0] = '\0'; } while (0) #define PS_SET_STATUS(status) \ - { strcpy(Ps_status_buffer, (status)); } + do { strcpy(Ps_status_buffer, (status)); } while (0) #define PS_STATUS (Ps_status_buffer) #endif @@ -78,7 +78,7 @@ extern char Ps_status_buffer[]; #undef PS_DEFINE_BUFFER #define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) #define PS_CLEAR_STATUS() -#define PS_SET_STATUS(status) { if ((status)); } +#define PS_SET_STATUS(status) do { if ((status)); } while (0) #define PS_STATUS "" #endif /* !linux */ diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index dcc9cffcbf4..1bd2f10376e 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rel.h,v 1.35 2000/02/27 07:31:00 tgl Exp $ + * $Id: rel.h,v 1.36 2000/04/12 17:16:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -95,7 +95,8 @@ typedef struct RelationData Form_pg_am rd_am; /* AM tuple */ Form_pg_class rd_rel; /* RELATION tuple */ Oid rd_id; /* relation's object id */ - LockInfoData rd_lockInfo; /* lock manager's info for locking relation */ + LockInfoData rd_lockInfo; /* lock manager's info for locking + * relation */ TupleDesc rd_att; /* tuple descriptor */ RuleLock *rd_rules; /* rewrite rules */ IndexStrategy rd_istrat; @@ -225,7 +226,7 @@ typedef Relation *RelationPtr; extern void RelationSetIndexSupport(Relation relation, - IndexStrategy strategy, - RegProcedure *support); + IndexStrategy strategy, + RegProcedure *support); #endif /* REL_H */ diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h index 01dea2a9c2c..272b177c781 100644 --- a/src/include/utils/syscache.h +++ b/src/include/utils/syscache.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: syscache.h,v 1.24 2000/01/26 05:58:38 momjian Exp $ + * $Id: syscache.h,v 1.25 2000/04/12 17:16:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -83,7 +83,7 @@ extern HeapTuple SearchSysCacheTupleCopy(int cacheId, extern HeapTuple SearchSysCacheTuple(int cacheId, Datum key1, Datum key2, Datum key3, Datum key4); extern Datum SysCacheGetAttr(int cacheId, HeapTuple tup, - AttrNumber attributeNumber, - bool *isnull); + AttrNumber attributeNumber, + bool *isnull); #endif /* SYSCACHE_H */ diff --git a/src/include/utils/temprel.h b/src/include/utils/temprel.h index ddcca0bc0de..7a1dfa9e1bf 100644 --- a/src/include/utils/temprel.h +++ b/src/include/utils/temprel.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: temprel.h,v 1.8 2000/01/26 05:58:38 momjian Exp $ + * $Id: temprel.h,v 1.9 2000/04/12 17:16:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,7 @@ void create_temp_relation(const char *relname, HeapTuple pg_class_tuple); void remove_all_temp_relations(void); void invalidate_temp_relations(void); void remove_temp_relation(Oid relid); -char *get_temp_rel_by_username(const char *user_relname); -char *get_temp_rel_by_physicalname(const char *relname); +char *get_temp_rel_by_username(const char *user_relname); +char *get_temp_rel_by_physicalname(const char *relname); #endif /* TEMPREL_H */ diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index cea772afb77..bce73ae0801 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: timestamp.h,v 1.3 2000/04/07 13:40:12 thomas Exp $ + * $Id: timestamp.h,v 1.4 2000/04/12 17:16:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,8 +31,10 @@ typedef double Timestamp; typedef struct { - double time; /* all time units other than months and years */ - int4 month; /* months and years, after time for alignment */ + double time; /* all time units other than months and + * years */ + int4 month; /* months and years, after time for + * alignment */ } Interval; @@ -51,29 +53,29 @@ typedef struct #define DT_CURRENT (DBL_MIN) #define DT_EPOCH (-DBL_MIN) -#define TIMESTAMP_INVALID(j) {j = DT_INVALID;} +#define TIMESTAMP_INVALID(j) do {j = DT_INVALID;} while (0) #ifdef NAN -#define TIMESTAMP_IS_INVALID(j) (isnan(j)) +#define TIMESTAMP_IS_INVALID(j) (isnan(j)) #else -#define TIMESTAMP_IS_INVALID(j) (j == DT_INVALID) +#define TIMESTAMP_IS_INVALID(j) (j == DT_INVALID) #endif -#define TIMESTAMP_NOBEGIN(j) {j = DT_NOBEGIN;} -#define TIMESTAMP_IS_NOBEGIN(j) (j == DT_NOBEGIN) +#define TIMESTAMP_NOBEGIN(j) do {j = DT_NOBEGIN;} while (0) +#define TIMESTAMP_IS_NOBEGIN(j) (j == DT_NOBEGIN) -#define TIMESTAMP_NOEND(j) {j = DT_NOEND;} +#define TIMESTAMP_NOEND(j) do {j = DT_NOEND;} while (0) #define TIMESTAMP_IS_NOEND(j) (j == DT_NOEND) -#define TIMESTAMP_CURRENT(j) {j = DT_CURRENT;} +#define TIMESTAMP_CURRENT(j) do {j = DT_CURRENT;} while (0) #if defined(linux) && defined(__powerpc__) extern int timestamp_is_current(double j); -#define TIMESTAMP_IS_CURRENT(j) timestamp_is_current(j) +#define TIMESTAMP_IS_CURRENT(j) timestamp_is_current(j) #else -#define TIMESTAMP_IS_CURRENT(j) (j == DT_CURRENT) +#define TIMESTAMP_IS_CURRENT(j) (j == DT_CURRENT) #endif -#define TIMESTAMP_EPOCH(j) {j = DT_EPOCH;} +#define TIMESTAMP_EPOCH(j) do {j = DT_EPOCH;} while (0) #if defined(linux) && defined(__powerpc__) extern int timestamp_is_epoch(double j); @@ -83,11 +85,11 @@ extern int timestamp_is_epoch(double j); #endif #define TIMESTAMP_IS_RELATIVE(j) (TIMESTAMP_IS_CURRENT(j) || TIMESTAMP_IS_EPOCH(j)) -#define TIMESTAMP_NOT_FINITE(j) (TIMESTAMP_IS_INVALID(j) \ +#define TIMESTAMP_NOT_FINITE(j) (TIMESTAMP_IS_INVALID(j) \ || TIMESTAMP_IS_NOBEGIN(j) || TIMESTAMP_IS_NOEND(j)) #define TIMESTAMP_IS_RESERVED(j) (TIMESTAMP_IS_RELATIVE(j) || TIMESTAMP_NOT_FINITE(j)) -#define INTERVAL_INVALID(j) {(j).time = DT_INVALID;} +#define INTERVAL_INVALID(j) do {(j).time = DT_INVALID;} while (0) #ifdef NAN #define INTERVAL_IS_INVALID(j) (isnan((j).time)) #else @@ -152,15 +154,15 @@ extern Timestamp *timestamp_mi_span(Timestamp *dt, Interval *span); extern Interval *timestamp_age(Timestamp *dt1, Timestamp *dt2); extern bool overlaps_timestamp(Timestamp *dt1, Timestamp *dt2, Timestamp *dt3, Timestamp *dt4); -extern int tm2timestamp(struct tm * tm, double fsec, int *tzp, Timestamp *dt); -extern int timestamp2tm(Timestamp dt, int *tzp, struct tm * tm, double *fsec, char **tzn); +extern int tm2timestamp(struct tm * tm, double fsec, int *tzp, Timestamp *dt); +extern int timestamp2tm(Timestamp dt, int *tzp, struct tm * tm, double *fsec, char **tzn); extern Timestamp SetTimestamp(Timestamp timestamp); extern Timestamp dt2local(Timestamp dt, int timezone); extern void dt2time(Timestamp dt, int *hour, int *min, double *sec); -extern int EncodeSpecialTimestamp(Timestamp dt, char *str); -extern int interval2tm(Interval span, struct tm * tm, float8 *fsec); -extern int tm2interval(struct tm * tm, double fsec, Interval *span); +extern int EncodeSpecialTimestamp(Timestamp dt, char *str); +extern int interval2tm(Interval span, struct tm * tm, float8 *fsec); +extern int tm2interval(struct tm * tm, double fsec, Interval *span); extern Timestamp *now(void); #endif /* TIMESTAMP_H */ diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index 9f361fd6ff4..01a3b9c80c7 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tqual.h,v 1.28 2000/01/26 05:58:38 momjian Exp $ + * $Id: tqual.h,v 1.29 2000/04/12 17:16:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,11 +21,11 @@ typedef struct SnapshotData { - TransactionId xmin; /* XID < xmin are visible to me */ - TransactionId xmax; /* XID >= xmax are invisible to me */ - uint32 xcnt; /* # of xact below */ - TransactionId *xip; /* array of xacts in progress */ - ItemPointerData tid; /* required for Dirty snapshot -:( */ + TransactionId xmin; /* XID < xmin are visible to me */ + TransactionId xmax; /* XID >= xmax are invisible to me */ + uint32 xcnt; /* # of xact below */ + TransactionId *xip; /* array of xacts in progress */ + ItemPointerData tid; /* required for Dirty snapshot -:( */ } SnapshotData; typedef SnapshotData *Snapshot; @@ -89,7 +89,7 @@ extern bool HeapTupleSatisfiesItself(HeapTupleHeader tuple); extern bool HeapTupleSatisfiesNow(HeapTupleHeader tuple); extern bool HeapTupleSatisfiesDirty(HeapTupleHeader tuple); extern bool HeapTupleSatisfiesSnapshot(HeapTupleHeader tuple, - Snapshot snapshot); + Snapshot snapshot); extern int HeapTupleSatisfiesUpdate(HeapTuple tuple); extern Snapshot GetSnapshotData(bool serializable); diff --git a/src/include/utils/trace.h b/src/include/utils/trace.h index 3cb2d9e28f1..71e402e9edc 100644 --- a/src/include/utils/trace.h +++ b/src/include/utils/trace.h @@ -34,8 +34,10 @@ extern void read_pg_options(SIGNAL_ARGS); * Trace options, used as index into pg_options. * Must match the constants in pg_options[]. */ -enum pg_option_enum { - TRACE_ALL, /* 0=trace some, 1=trace all, -1=trace none */ +enum pg_option_enum +{ + TRACE_ALL, /* 0=trace some, 1=trace all, -1=trace + * none */ TRACE_VERBOSE, TRACE_QUERY, TRACE_PLAN, diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h index dc4dffa8e0a..6b54eb9f0b9 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -6,14 +6,14 @@ * This module handles sorting of heap tuples, index tuples, or single * Datums (and could easily support other kinds of sortable objects, * if necessary). It works efficiently for both small and large amounts - * of data. Small amounts are sorted in-memory using qsort(). Large + * of data. Small amounts are sorted in-memory using qsort(). Large * amounts are sorted using temporary files and a standard external sort * algorithm. * * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tuplesort.h,v 1.3 2000/01/26 05:58:38 momjian Exp $ + * $Id: tuplesort.h,v 1.4 2000/04/12 17:16:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,31 +39,32 @@ typedef struct Tuplesortstate Tuplesortstate; */ extern Tuplesortstate *tuplesort_begin_heap(TupleDesc tupDesc, - int nkeys, ScanKey keys, - bool randomAccess); + int nkeys, ScanKey keys, + bool randomAccess); extern Tuplesortstate *tuplesort_begin_index(Relation indexRel, - bool enforceUnique, - bool randomAccess); + bool enforceUnique, + bool randomAccess); extern Tuplesortstate *tuplesort_begin_datum(Oid datumType, - Oid sortOperator, - bool randomAccess); + Oid sortOperator, + bool randomAccess); extern void tuplesort_puttuple(Tuplesortstate *state, void *tuple); extern void tuplesort_putdatum(Tuplesortstate *state, Datum val, - bool isNull); + bool isNull); extern void tuplesort_performsort(Tuplesortstate *state); extern void *tuplesort_gettuple(Tuplesortstate *state, bool forward, - bool *should_free); + bool *should_free); + #define tuplesort_getheaptuple(state, forward, should_free) \ ((HeapTuple) tuplesort_gettuple(state, forward, should_free)) #define tuplesort_getindextuple(state, forward, should_free) \ ((IndexTuple) tuplesort_gettuple(state, forward, should_free)) extern bool tuplesort_getdatum(Tuplesortstate *state, bool forward, - Datum *val, bool *isNull); + Datum *val, bool *isNull); extern void tuplesort_end(Tuplesortstate *state); diff --git a/src/include/utils/varbit.h b/src/include/utils/varbit.h index 9ee0724b01d..e6106331b9a 100644 --- a/src/include/utils/varbit.h +++ b/src/include/utils/varbit.h @@ -17,7 +17,7 @@ #include "utils/builtins.h" -#define HEXDIG(z) (z)<10 ? ((z)+'0') : ((z)-10+'A') +#define HEXDIG(z) (z)<10 ? ((z)+'0') : ((z)-10+'A') /* Modeled on struct varlena from postgres.h, bu data type is bits8 */ struct varbita @@ -47,41 +47,41 @@ struct varbita #define BITHIGH 0x80 -bits8 * zpbit_in(char *s, int dummy, int32 atttypmod); -char * zpbit_out(bits8 *s); -char * zpbits_out(bits8 *s); -bits8 * varbit_in(char *s, int dummy, int32 atttypmod); -char * varbit_out (bits8 *s); -bool biteq (bits8 *arg1, bits8 *arg2); -bool bitne (bits8 *arg1, bits8 *arg2); -bool bitge (bits8 *arg1, bits8 *arg2); -bool bitgt (bits8 *arg1, bits8 *arg2); -bool bitle (bits8 *arg1, bits8 *arg2); -bool bitlt (bits8 *arg1, bits8 *arg2); -int bitcmp (bits8 *arg1, bits8 *arg2); -bits8 * bitand (bits8 * arg1, bits8 * arg2); -bits8 * bitor (bits8 * arg1, bits8 * arg2); -bits8 * bitxor (bits8 * arg1, bits8 * arg2); -bits8 * bitnot (bits8 * arg); -bits8 * bitshiftright (bits8 * arg, int shft); -bits8 * bitshiftleft (bits8 * arg, int shft); -bits8 * bitcat (bits8 *arg1, bits8 *arg2); -bits8 * bitsubstr (bits8 *arg, int32 s, int32 l); +bits8 *zpbit_in(char *s, int dummy, int32 atttypmod); +char *zpbit_out(bits8 *s); +char *zpbits_out(bits8 *s); +bits8 *varbit_in(char *s, int dummy, int32 atttypmod); +char *varbit_out(bits8 *s); +bool biteq(bits8 *arg1, bits8 *arg2); +bool bitne(bits8 *arg1, bits8 *arg2); +bool bitge(bits8 *arg1, bits8 *arg2); +bool bitgt(bits8 *arg1, bits8 *arg2); +bool bitle(bits8 *arg1, bits8 *arg2); +bool bitlt(bits8 *arg1, bits8 *arg2); +int bitcmp(bits8 *arg1, bits8 *arg2); +bits8 *bitand(bits8 *arg1, bits8 *arg2); +bits8 *bitor(bits8 *arg1, bits8 *arg2); +bits8 *bitxor(bits8 *arg1, bits8 *arg2); +bits8 *bitnot(bits8 *arg); +bits8 *bitshiftright(bits8 *arg, int shft); +bits8 *bitshiftleft(bits8 *arg, int shft); +bits8 *bitcat(bits8 *arg1, bits8 *arg2); +bits8 *bitsubstr(bits8 *arg, int32 s, int32 l); -bool varbiteq (bits8 *arg1, bits8 *arg2); -bool varbitne (bits8 *arg1, bits8 *arg2); -bool varbitge (bits8 *arg1, bits8 *arg2); -bool varbitgt (bits8 *arg1, bits8 *arg2); -bool varbitle (bits8 *arg1, bits8 *arg2); -bool varbitlt (bits8 *arg1, bits8 *arg2); -int varbitcmp (bits8 *arg1, bits8 *arg2); -bits8 * varbitand (bits8 * arg1, bits8 * arg2); -bits8 * varbitor (bits8 * arg1, bits8 * arg2); -bits8 * varbitxor (bits8 * arg1, bits8 * arg2); -bits8 * varbitnot (bits8 * arg); -bits8 * varbitshiftright (bits8 * arg, int shft); -bits8 * varbitshiftleft (bits8 * arg, int shft); -bits8 * varbitcat (bits8 *arg1, bits8 *arg2); -bits8 * varbitsubstr (bits8 *arg, int32 s, int32 l); +bool varbiteq(bits8 *arg1, bits8 *arg2); +bool varbitne(bits8 *arg1, bits8 *arg2); +bool varbitge(bits8 *arg1, bits8 *arg2); +bool varbitgt(bits8 *arg1, bits8 *arg2); +bool varbitle(bits8 *arg1, bits8 *arg2); +bool varbitlt(bits8 *arg1, bits8 *arg2); +int varbitcmp(bits8 *arg1, bits8 *arg2); +bits8 *varbitand(bits8 *arg1, bits8 *arg2); +bits8 *varbitor(bits8 *arg1, bits8 *arg2); +bits8 *varbitxor(bits8 *arg1, bits8 *arg2); +bits8 *varbitnot(bits8 *arg); +bits8 *varbitshiftright(bits8 *arg, int shft); +bits8 *varbitshiftleft(bits8 *arg, int shft); +bits8 *varbitcat(bits8 *arg1, bits8 *arg2); +bits8 *varbitsubstr(bits8 *arg, int32 s, int32 l); #endif |