diff options
| author | Bruce Momjian | 1999-05-25 16:15:34 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1999-05-25 16:15:34 +0000 |
| commit | 07842084fe3e11041f83563c851236395f481470 (patch) | |
| tree | ab9960e67325bec5a97b8b4dd4b2075ce60cc420 /src/include | |
| parent | 4b04b01aaa460f1e52980f24173dc7a4535efd2d (diff) | |
pgindent run over code.
Diffstat (limited to 'src/include')
107 files changed, 840 insertions, 818 deletions
diff --git a/src/include/access/attnum.h b/src/include/access/attnum.h index 25e20f4909e..ef09c3706d0 100644 --- a/src/include/access/attnum.h +++ b/src/include/access/attnum.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: attnum.h,v 1.9 1999/02/13 23:20:49 momjian Exp $ + * $Id: attnum.h,v 1.10 1999/05/25 16:13:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,21 +26,21 @@ typedef int16 AttrNumber; * ---------------- */ /* - * AttributeNumberIsValid + * AttributeNumberIsValid * True iff the attribute number is valid. */ #define AttributeNumberIsValid(attributeNumber) \ ((bool) ((attributeNumber) != InvalidAttrNumber)) /* - * AttrNumberIsForUserDefinedAttr + * AttrNumberIsForUserDefinedAttr * True iff the attribute number corresponds to an user defined attribute. */ #define AttrNumberIsForUserDefinedAttr(attributeNumber) \ ((bool) ((attributeNumber) > 0)) /* - * AttrNumberGetAttrOffset + * AttrNumberGetAttrOffset * Returns the attribute offset for an attribute number. * * Note: @@ -53,7 +53,7 @@ typedef int16 AttrNumber; ) /* - * AttributeOffsetGetAttributeNumber + * AttributeOffsetGetAttributeNumber * Returns the attribute number for an attribute offset. */ #define AttrOffsetGetAttrNumber(attributeOffset) \ diff --git a/src/include/access/hash.h b/src/include/access/hash.h index f3227f59447..6250ead85a2 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hash.h,v 1.22 1999/04/15 02:23:37 thomas Exp $ + * $Id: hash.h,v 1.23 1999/05/25 16:13:27 momjian Exp $ * * NOTES * modeled after Margo Seltzer's hash implementation for unix. @@ -265,7 +265,7 @@ extern void hashdelete(Relation rel, ItemPointer tid); /* hashfunc.c */ extern uint32 hashint2(int16 key); extern uint32 hashint4(uint32 key); -extern uint32 hashint8(int64 *key); +extern uint32 hashint8(int64 * key); extern uint32 hashfloat4(float32 keyp); extern uint32 hashfloat8(float64 keyp); extern uint32 hashoid(Oid key); diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index c205cab52dc..9681bc759d4 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.41 1999/02/13 23:20:52 momjian Exp $ + * $Id: heapam.h,v 1.42 1999/05/25 16:13:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -149,7 +149,7 @@ fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc, (attnum) == 1) ? ( (Datum) fetchatt(&((tupleDesc)->attrs[(attnum) - 1]), - (char *) (tup)->t_data + (tup)->t_data->t_hoff + + (char *) (tup)->t_data + (tup)->t_data->t_hoff + ( ((attnum) != 1) ? (tupleDesc)->attrs[(attnum) - 1]->attcacheoff @@ -256,8 +256,8 @@ extern HeapTuple heap_getnext(HeapScanDesc scandesc, int backw); extern void heap_fetch(Relation relation, Snapshot snapshot, HeapTuple tup, Buffer *userbuf); extern Oid heap_insert(Relation relation, HeapTuple tup); extern int heap_delete(Relation relation, ItemPointer tid, ItemPointer ctid); -extern int heap_replace(Relation relation, ItemPointer otid, HeapTuple tup, - ItemPointer ctid); +extern int heap_replace(Relation relation, ItemPointer otid, HeapTuple tup, + 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/hio.h b/src/include/access/hio.h index 0d84d50e264..bf5164b5e89 100644 --- a/src/include/access/hio.h +++ b/src/include/access/hio.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hio.h,v 1.10 1999/02/13 23:20:53 momjian Exp $ + * $Id: hio.h,v 1.11 1999/05/25 16:13:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,8 +17,8 @@ #include <utils/rel.h> -extern void RelationPutHeapTuple(Relation relation, Buffer buffer, - HeapTuple tuple); +extern void RelationPutHeapTuple(Relation relation, Buffer buffer, + HeapTuple tuple); extern void RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple); #endif /* HIO_H */ diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 5e748f4fcf9..4586f6118a4 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: htup.h,v 1.14 1999/03/28 20:32:30 vadim Exp $ + * $Id: htup.h,v 1.15 1999/05/25 16:13:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,7 +48,7 @@ typedef struct HeapTupleHeaderData /* bit map of domains */ /* MORE DATA FOLLOWS AT END OF STRUCT */ -} HeapTupleHeaderData; +} HeapTupleHeaderData; typedef HeapTupleHeaderData *HeapTupleHeader; @@ -68,22 +68,22 @@ extern long heap_sysoffset[]; * * 1. t_len moved off on-disk tuple data - ItemIdData is used to get len; * 2. t_ctid above is not self tuple TID now - it may point to - * updated version of tuple (required by MVCC); - * 3. someday someone let tuple to cross block boundaries - - * he have to add something below... + * updated version of tuple (required by MVCC); + * 3. someday someone let tuple to cross block boundaries - + * he have to add something below... */ typedef struct HeapTupleData { - uint32 t_len; /* length of *t_data */ - ItemPointerData t_self; /* SelfItemPointer */ - HeapTupleHeader t_data; /* */ + uint32 t_len; /* length of *t_data */ + ItemPointerData t_self; /* SelfItemPointer */ + HeapTupleHeader t_data; /* */ } HeapTupleData; - + typedef HeapTupleData *HeapTuple; -#define HEAPTUPLESIZE DOUBLEALIGN(sizeof(HeapTupleData)) - - +#define HEAPTUPLESIZE DOUBLEALIGN(sizeof(HeapTupleData)) + + /* ---------------- * support macros * ---------------- @@ -118,8 +118,10 @@ typedef HeapTupleData *HeapTuple; #define HEAP_XMAX_INVALID 0x0800 /* t_xmax invalid/aborted */ #define HEAP_MARKED_FOR_UPDATE 0x1000 /* marked for UPDATE */ #define HEAP_UPDATED 0x2000 /* this is UPDATEd version of row */ -#define HEAP_MOVED_OFF 0x4000 /* removed or moved to another place by vacuum */ -#define HEAP_MOVED_IN 0x8000 /* moved from another place by vacuum */ +#define HEAP_MOVED_OFF 0x4000 /* removed or moved to another + * place by vacuum */ +#define HEAP_MOVED_IN 0x8000 /* moved from another place by + * vacuum */ #define HEAP_XACT_MASK 0xFF00 /* */ diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h index 8d3dd069eac..6f451291587 100644 --- a/src/include/access/istrat.h +++ b/src/include/access/istrat.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: istrat.h,v 1.12 1999/02/13 23:20:55 momjian Exp $ + * $Id: istrat.h,v 1.13 1999/05/25 16:13:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,14 +17,14 @@ #include <access/strat.h> /* - * StrategyNumberIsValid + * StrategyNumberIsValid * True iff the strategy number is valid. */ #define StrategyNumberIsValid(strategyNumber) \ ((bool) ((strategyNumber) != InvalidStrategy)) /* - * StrategyNumberIsInBounds + * StrategyNumberIsInBounds * True iff strategy number is within given bounds. * * Note: @@ -36,13 +36,13 @@ (strategyNumber) <= (maxStrategyNumber))) /* - * StrategyMapIsValid + * StrategyMapIsValid * True iff the index strategy mapping is valid. */ #define StrategyMapIsValid(map) PointerIsValid(map) /* - * IndexStrategyIsValid + * IndexStrategyIsValid * True iff the index strategy is valid. */ #define IndexStrategyIsValid(s) PointerIsValid(s) diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index b1c54366d88..a25e0c2c43f 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nbtree.h,v 1.24 1999/03/28 20:32:34 vadim Exp $ + * $Id: nbtree.h,v 1.25 1999/05/25 16:13:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,7 +42,7 @@ typedef struct BTPageOpaqueData { BlockNumber btpo_prev; BlockNumber btpo_next; - BlockNumber btpo_parent; + BlockNumber btpo_parent; uint16 btpo_flags; #define BTP_LEAF (1 << 0) diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h index f5de892d93c..6b5a538b5e6 100644 --- a/src/include/access/printtup.h +++ b/src/include/access/printtup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: printtup.h,v 1.8 1999/02/13 23:20:56 momjian Exp $ + * $Id: printtup.h,v 1.9 1999/05/25 16:13:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,17 +15,17 @@ #include <tcop/dest.h> -extern DestReceiver* printtup_create_DR(void); +extern DestReceiver *printtup_create_DR(void); extern void showatts(char *name, TupleDesc attinfo); extern void debugtup(HeapTuple tuple, TupleDesc typeinfo, - DestReceiver* self); + DestReceiver * self); extern void printtup_internal(HeapTuple tuple, TupleDesc typeinfo, - DestReceiver* self); + DestReceiver * self); /* XXX this one is really in executor/spi.c */ extern void spi_printtup(HeapTuple tuple, TupleDesc tupdesc, - DestReceiver* self); + DestReceiver * self); -extern int getTypeOutAndElem(Oid type, Oid* typOutput, Oid* typElem); +extern int getTypeOutAndElem(Oid type, Oid *typOutput, Oid *typElem); #endif /* PRINTTUP_H */ diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index 5b33e7ca12d..4481c575e61 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: relscan.h,v 1.14 1999/02/13 23:20:56 momjian Exp $ + * $Id: relscan.h,v 1.15 1999/05/25 16:13:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,40 +22,40 @@ typedef ItemPointerData MarkData; typedef struct HeapScanDescData { - Relation rs_rd; /* pointer to relation descriptor */ - HeapTupleData rs_ptup; /* previous tuple in scan */ - HeapTupleData rs_ctup; /* current tuple in scan */ - HeapTupleData rs_ntup; /* next tuple in scan */ - Buffer rs_pbuf; /* previous buffer in scan */ - Buffer rs_cbuf; /* current buffer in scan */ - Buffer rs_nbuf; /* next buffer in scan */ - ItemPointerData rs_mptid; /* marked previous tid */ - ItemPointerData rs_mctid; /* marked current tid */ - ItemPointerData rs_mntid; /* marked next tid */ - ItemPointerData rs_mcd; /* marked current delta XXX ??? */ - Snapshot rs_snapshot; /* snapshot to see */ - bool rs_atend; /* restart scan at end? */ - uint16 rs_cdelta; /* current delta in chain */ - uint16 rs_nkeys; /* number of attributes in keys */ - ScanKey rs_key; /* key descriptors */ + Relation rs_rd; /* pointer to relation descriptor */ + HeapTupleData rs_ptup; /* previous tuple in scan */ + HeapTupleData rs_ctup; /* current tuple in scan */ + HeapTupleData rs_ntup; /* next tuple in scan */ + Buffer rs_pbuf; /* previous buffer in scan */ + Buffer rs_cbuf; /* current buffer in scan */ + Buffer rs_nbuf; /* next buffer in scan */ + ItemPointerData rs_mptid; /* marked previous tid */ + ItemPointerData rs_mctid; /* marked current tid */ + ItemPointerData rs_mntid; /* marked next tid */ + ItemPointerData rs_mcd; /* marked current delta XXX ??? */ + Snapshot rs_snapshot; /* snapshot to see */ + bool rs_atend; /* restart scan at end? */ + uint16 rs_cdelta; /* current delta in chain */ + uint16 rs_nkeys; /* number of attributes in keys */ + ScanKey rs_key; /* key descriptors */ } HeapScanDescData; typedef HeapScanDescData *HeapScanDesc; typedef struct IndexScanDescData { - Relation relation; /* relation descriptor */ - void *opaque; /* am-specific slot */ + Relation relation; /* relation descriptor */ + void *opaque; /* am-specific slot */ ItemPointerData previousItemData; /* previous index pointer */ ItemPointerData currentItemData; /* current index pointer */ ItemPointerData nextItemData; /* next index pointer */ MarkData previousMarkData; /* marked previous pointer */ - MarkData currentMarkData; /* marked current pointer */ - MarkData nextMarkData; /* marked next pointer */ - uint8 flags; /* scan position flags */ - bool scanFromEnd; /* restart scan at end? */ - uint16 numberOfKeys; /* number of key attributes */ - ScanKey keyData; /* key descriptor */ + MarkData currentMarkData;/* marked current pointer */ + MarkData nextMarkData; /* marked next pointer */ + uint8 flags; /* scan position flags */ + bool scanFromEnd; /* restart scan at end? */ + uint16 numberOfKeys; /* number of key attributes */ + ScanKey keyData; /* key descriptor */ } IndexScanDescData; typedef IndexScanDescData *IndexScanDesc; @@ -69,13 +69,13 @@ typedef IndexScanDescData *IndexScanDesc; typedef IndexScanDesc *IndexScanDescPtr; /* - * HeapScanIsValid + * HeapScanIsValid * True iff the heap scan is valid. */ #define HeapScanIsValid(scan) PointerIsValid(scan) /* - * IndexScanIsValid + * IndexScanIsValid * True iff the index scan is valid. */ #define IndexScanIsValid(scan) PointerIsValid(scan) diff --git a/src/include/access/sdir.h b/src/include/access/sdir.h index 42654765bf7..4f317f5eb03 100644 --- a/src/include/access/sdir.h +++ b/src/include/access/sdir.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: sdir.h,v 1.5 1999/02/13 23:20:58 momjian Exp $ + * $Id: sdir.h,v 1.6 1999/05/25 16:13:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,7 @@ typedef enum ScanDirection } ScanDirection; /* - * ScanDirectionIsValid + * ScanDirectionIsValid * True iff scan direction is valid. */ #define ScanDirectionIsValid(direction) \ @@ -34,21 +34,21 @@ typedef enum ScanDirection direction <= ForwardScanDirection)) /* - * ScanDirectionIsBackward + * ScanDirectionIsBackward * True iff scan direction is backward. */ #define ScanDirectionIsBackward(direction) \ ((bool) (direction == BackwardScanDirection)) /* - * ScanDirectionIsNoMovement + * ScanDirectionIsNoMovement * True iff scan direction indicates no movement. */ #define ScanDirectionIsNoMovement(direction) \ ((bool) (direction == NoMovementScanDirection)) /* - * ScanDirectionIsForward + * ScanDirectionIsForward * True iff scan direction is forward. */ #define ScanDirectionIsForward(direction) \ diff --git a/src/include/access/strat.h b/src/include/access/strat.h index 4f47c0e224e..0fa3cf62fd8 100644 --- a/src/include/access/strat.h +++ b/src/include/access/strat.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: strat.h,v 1.12 1999/02/13 23:20:58 momjian Exp $ + * $Id: strat.h,v 1.13 1999/05/25 16:13:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,6 +31,7 @@ typedef struct StrategyTransformMapData * * * + * * STRUCTURE */ typedef StrategyTransformMapData *StrategyTransformMap; @@ -70,7 +71,7 @@ typedef struct StrategyEvaluationData typedef StrategyEvaluationData *StrategyEvaluation; /* - * StrategyTransformMapIsValid + * StrategyTransformMapIsValid * Returns true iff strategy transformation map is valid. */ #define StrategyTransformMapIsValid(transform) PointerIsValid(transform) diff --git a/src/include/access/transam.h b/src/include/access/transam.h index a7f911e50a3..221a7456f92 100644 --- a/src/include/access/transam.h +++ b/src/include/access/transam.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: transam.h,v 1.19 1999/02/13 23:20:59 momjian Exp $ + * $Id: transam.h,v 1.20 1999/05/25 16:13:35 momjian Exp $ * * NOTES * Transaction System Version 101 now support proper oid @@ -145,7 +145,7 @@ extern bool TransactionIdDidCommit(TransactionId transactionId); extern bool TransactionIdDidAbort(TransactionId transactionId); extern void TransactionIdCommit(TransactionId transactionId); extern void TransactionIdAbort(TransactionId transactionId); -extern void TransactionIdFlushCache(void); +extern void TransactionIdFlushCache(void); /* in transam/transsup.c */ extern void AmiTransactionOverride(bool flag); diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h index 6dd499c60b9..3f2d6e8d962 100644 --- a/src/include/access/tupmacs.h +++ b/src/include/access/tupmacs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tupmacs.h,v 1.9 1999/03/25 03:49:26 tgl Exp $ + * $Id: tupmacs.h,v 1.10 1999/05/25 16:13:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,7 +63,7 @@ ) /* att_align aligns the given offset as needed for a datum of length attlen - * and alignment requirement attalign. In practice we don't need the length. + * and alignment requirement attalign. In practice we don't need the length. * The attalign cases are tested in what is hopefully something like their * frequency of occurrence. */ @@ -89,5 +89,5 @@ (cur_offset) + VARSIZE(DatumGetPointer(attval)) \ ) \ ) - + #endif diff --git a/src/include/c.h b/src/include/c.h index 4e604a88efc..4b7f7aa03d9 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.54 1999/04/02 05:10:14 tgl Exp $ + * $Id: c.h,v 1.55 1999/05/25 16:13:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,14 +61,15 @@ * ---------------------------------------------------------------- */ /* - * bool + * bool * Boolean value, either true or false. * */ #ifndef __cplusplus #ifndef bool typedef char bool; -#endif /* ndef bool */ + +#endif /* ndef bool */ #endif /* not C++ */ #define false ((bool) 0) #define true ((bool) 1) @@ -83,7 +84,7 @@ typedef bool *BoolPtr; #endif /* FALSE */ /* - * NULL + * NULL * Null pointer. */ #ifndef NULL @@ -105,9 +106,9 @@ typedef bool *BoolPtr; */ /* - * CppAsString + * CppAsString * Convert the argument to a string, using the C preprocessor. - * CppConcat + * CppConcat * Concatenate two arguments together, using the C preprocessor. * * Note: the standard Autoconf macro AC_C_STRINGIZE actually only checks @@ -139,7 +140,7 @@ typedef bool *BoolPtr; * dummyret is used to set return values in macros that use ?: to make * assignments. gcc wants these to be void, other compilers like char */ -#ifdef __GNUC__ /* GNU cc */ +#ifdef __GNUC__ /* GNU cc */ #define dummyret void #else #define dummyret char @@ -151,7 +152,7 @@ typedef bool *BoolPtr; */ /* - * Pointer + * Pointer * Variable holding address of any memory resident object. * * XXX Pointer arithmetic is done with this, so it can't be void * @@ -160,7 +161,7 @@ typedef bool *BoolPtr; typedef char *Pointer; /* - * intN + * intN * Signed integer, EXACTLY N BITS IN SIZE, * used for numerical computations and the * frontend/backend protocol. @@ -170,7 +171,7 @@ typedef signed short int16; /* == 16 bits */ typedef signed int int32; /* == 32 bits */ /* - * uintN + * uintN * Unsigned integer, EXACTLY N BITS IN SIZE, * used for numerical computations and the * frontend/backend protocol. @@ -180,7 +181,7 @@ typedef unsigned short uint16; /* == 16 bits */ typedef unsigned int uint32; /* == 32 bits */ /* - * floatN + * floatN * Floating point number, AT LEAST N BITS IN SIZE, * used for numerical computations. * @@ -193,7 +194,7 @@ typedef float *float32; typedef double *float64; /* - * boolN + * boolN * Boolean value, AT LEAST N BITS IN SIZE. */ typedef uint8 bool8; /* >= 8 bits */ @@ -201,7 +202,7 @@ typedef uint16 bool16; /* >= 16 bits */ typedef uint32 bool32; /* >= 32 bits */ /* - * bitsN + * bitsN * Unit of bitwise operation, AT LEAST N BITS IN SIZE. */ typedef uint8 bits8; /* >= 8 bits */ @@ -209,7 +210,7 @@ typedef uint16 bits16; /* >= 16 bits */ typedef uint32 bits32; /* >= 32 bits */ /* - * wordN + * wordN * Unit of storage, AT LEAST N BITS IN SIZE, * used to fetch/store data. */ @@ -218,13 +219,13 @@ typedef uint16 word16; /* >= 16 bits */ typedef uint32 word32; /* >= 32 bits */ /* - * Size + * Size * Size of any memory resident object, as returned by sizeof. */ typedef size_t Size; /* - * Index + * Index * Index into any memory resident array. * * Note: @@ -239,7 +240,7 @@ typedef struct } IntArray; /* - * Offset + * Offset * Offset into any memory resident array. * * Note: @@ -253,7 +254,7 @@ typedef signed int Offset; * ---------------------------------------------------------------- */ /* - * datum.h + * datum.h * POSTGRES abstract data type datum representation definitions. * * Note: @@ -288,133 +289,133 @@ typedef Datum *DatumPtr; #define SET_4_BYTES(value) (((Datum) (value)) & 0xffffffff) /* - * DatumGetChar + * DatumGetChar * Returns character value of a datum. */ #define DatumGetChar(X) ((char) GET_1_BYTE(X)) /* - * CharGetDatum + * CharGetDatum * Returns datum representation for a character. */ #define CharGetDatum(X) ((Datum) SET_1_BYTE(X)) /* - * Int8GetDatum + * Int8GetDatum * Returns datum representation for an 8-bit integer. */ #define Int8GetDatum(X) ((Datum) SET_1_BYTE(X)) /* - * DatumGetUInt8 + * DatumGetUInt8 * Returns 8-bit unsigned integer value of a datum. */ #define DatumGetUInt8(X) ((uint8) GET_1_BYTE(X)) /* - * UInt8GetDatum + * UInt8GetDatum * Returns datum representation for an 8-bit unsigned integer. */ #define UInt8GetDatum(X) ((Datum) SET_1_BYTE(X)) /* - * DatumGetInt16 + * DatumGetInt16 * Returns 16-bit integer value of a datum. */ #define DatumGetInt16(X) ((int16) GET_2_BYTES(X)) /* - * Int16GetDatum + * Int16GetDatum * Returns datum representation for a 16-bit integer. */ #define Int16GetDatum(X) ((Datum) SET_2_BYTES(X)) /* - * DatumGetUInt16 + * DatumGetUInt16 * Returns 16-bit unsigned integer value of a datum. */ #define DatumGetUInt16(X) ((uint16) GET_2_BYTES(X)) /* - * UInt16GetDatum + * UInt16GetDatum * Returns datum representation for a 16-bit unsigned integer. */ #define UInt16GetDatum(X) ((Datum) SET_2_BYTES(X)) /* - * DatumGetInt32 + * DatumGetInt32 * Returns 32-bit integer value of a datum. */ #define DatumGetInt32(X) ((int32) GET_4_BYTES(X)) /* - * Int32GetDatum + * Int32GetDatum * Returns datum representation for a 32-bit integer. */ #define Int32GetDatum(X) ((Datum) SET_4_BYTES(X)) /* - * DatumGetUInt32 + * DatumGetUInt32 * Returns 32-bit unsigned integer value of a datum. */ #define DatumGetUInt32(X) ((uint32) GET_4_BYTES(X)) /* - * UInt32GetDatum + * UInt32GetDatum * Returns datum representation for a 32-bit unsigned integer. */ #define UInt32GetDatum(X) ((Datum) SET_4_BYTES(X)) /* - * DatumGetObjectId + * DatumGetObjectId * Returns object identifier value of a datum. */ #define DatumGetObjectId(X) ((Oid) GET_4_BYTES(X)) /* - * ObjectIdGetDatum + * ObjectIdGetDatum * Returns datum representation for an object identifier. */ #define ObjectIdGetDatum(X) ((Datum) SET_4_BYTES(X)) /* - * DatumGetPointer + * DatumGetPointer * Returns pointer value of a datum. */ #define DatumGetPointer(X) ((Pointer) X) /* - * PointerGetDatum + * PointerGetDatum * Returns datum representation for a pointer. */ #define PointerGetDatum(X) ((Datum) X) /* - * DatumGetName + * DatumGetName * Returns name value of a datum. */ #define DatumGetName(X) ((Name) DatumGetPointer((Datum) X)) /* - * NameGetDatum + * NameGetDatum * Returns datum representation for a name. */ @@ -422,7 +423,7 @@ typedef Datum *DatumPtr; /* - * DatumGetFloat32 + * DatumGetFloat32 * Returns 32-bit floating point value of a datum. * This is really a pointer, of course. */ @@ -430,7 +431,7 @@ typedef Datum *DatumPtr; #define DatumGetFloat32(X) ((float32) DatumGetPointer((Datum) X)) /* - * Float32GetDatum + * Float32GetDatum * Returns datum representation for a 32-bit floating point number. * This is really a pointer, of course. */ @@ -438,7 +439,7 @@ typedef Datum *DatumPtr; #define Float32GetDatum(X) PointerGetDatum((Pointer) X) /* - * DatumGetFloat64 + * DatumGetFloat64 * Returns 64-bit floating point value of a datum. * This is really a pointer, of course. */ @@ -446,7 +447,7 @@ typedef Datum *DatumPtr; #define DatumGetFloat64(X) ((float64) DatumGetPointer(X)) /* - * Float64GetDatum + * Float64GetDatum * Returns datum representation for a 64-bit floating point number. * This is really a pointer, of course. */ @@ -458,19 +459,19 @@ typedef Datum *DatumPtr; * ---------------------------------------------------------------- */ /* - * BoolIsValid + * BoolIsValid * True iff bool is valid. */ #define BoolIsValid(boolean) ((boolean) == false || (boolean) == true) /* - * PointerIsValid + * PointerIsValid * True iff pointer is valid. */ #define PointerIsValid(pointer) (bool)((void*)(pointer) != NULL) /* - * PointerIsInBounds + * PointerIsInBounds * True iff pointer is within given bounds. * * Note: @@ -481,7 +482,7 @@ typedef Datum *DatumPtr; ((min) <= (pointer) && (pointer) < (max)) /* - * PointerIsAligned + * PointerIsAligned * True iff pointer is properly aligned to point to the given type. */ #define PointerIsAligned(pointer, type) \ @@ -492,7 +493,7 @@ typedef Datum *DatumPtr; * ---------------------------------------------------------------- */ /* - * offsetof + * offsetof * Offset of a structure/union field within that structure/union. * * XXX This is supposed to be part of stddef.h, but isn't on @@ -503,13 +504,13 @@ typedef Datum *DatumPtr; #endif /* offsetof */ /* - * lengthof + * lengthof * Number of elements in an array. */ #define lengthof(array) (sizeof (array) / sizeof ((array)[0])) /* - * endof + * endof * Address of the element one past the last in an array. */ #define endof(array) (&array[lengthof(array)]) @@ -537,7 +538,7 @@ typedef struct Exception */ /* - * Trap + * Trap * Generates an exception if the given condition is true. * */ @@ -583,7 +584,7 @@ extern int assert_enabled; #endif /* USE_ASSERT_CHECKING */ /* - * LogTrap + * LogTrap * Generates an exception with a message if the given condition is true. * */ @@ -634,25 +635,25 @@ extern int assertTest(int val); * ---------------------------------------------------------------- */ /* - * Max + * Max * Return the maximum of two numbers. */ #define Max(x, y) ((x) > (y) ? (x) : (y)) /* - * Min + * Min * Return the minimum of two numbers. */ #define Min(x, y) ((x) < (y) ? (x) : (y)) /* - * Abs + * Abs * Return the absolute value of the argument. */ #define Abs(x) ((x) >= 0 ? (x) : -(x)) /* - * StrNCpy + * StrNCpy * Does string copy, and forces terminating NULL */ /* we do this so if the macro is used in an if action, it will work */ @@ -772,24 +773,26 @@ extern char *form(const char *fmt,...); #endif #ifdef BUILDING_DLL #define DLLIMPORT __declspec (dllexport) -#else /* not BUILDING_DLL */ +#else /* not BUILDING_DLL */ #define DLLIMPORT __declspec (dllimport) #endif -#else /* not CYGWIN */ +#else /* not CYGWIN */ #define DLLIMPORT #endif /* Provide prototypes for routines not present in a particular machine's - * standard C library. It'd be better to put these in config.h, but + * standard C library. It'd be better to put these in config.h, but * in config.h we haven't yet included anything that defines size_t... */ #ifndef HAVE_SNPRINTF -extern int snprintf(char *str, size_t count, const char *fmt, ...); +extern int snprintf(char *str, size_t count, const char *fmt,...); + #endif #ifndef HAVE_VSNPRINTF -extern int vsnprintf(char *str, size_t count, const char *fmt, va_list args); +extern int vsnprintf(char *str, size_t count, const char *fmt, va_list args); + #endif /* ---------------- diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h index 177e9217ce2..f10340a2a4f 100644 --- a/src/include/catalog/heap.h +++ b/src/include/catalog/heap.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: heap.h,v 1.18 1999/02/13 23:21:03 momjian Exp $ + * $Id: heap.h,v 1.19 1999/05/25 16:13:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,7 @@ extern Oid RelnameFindRelid(char *relname); extern Relation heap_create(char *relname, TupleDesc att, - bool isnoname, bool istemp); + bool isnoname, bool istemp); extern Oid heap_create_with_catalog(char *relname, TupleDesc tupdesc, char relkind, bool istemp); diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index fb157c63440..95cdf8845f5 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: index.h,v 1.15 1999/02/13 23:21:03 momjian Exp $ + * $Id: index.h,v 1.16 1999/05/25 16:13:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -39,7 +39,7 @@ extern void index_create(char *heapRelationName, Node *predicate, bool islossy, bool unique, - bool primary); + bool primary); extern void index_destroy(Oid indexId); diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index e3aef0a5d9a..466a0a2215b 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_attribute.h,v 1.46 1999/03/28 02:01:38 tgl Exp $ + * $Id: pg_attribute.h,v 1.47 1999/05/25 16:13:42 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -369,9 +369,9 @@ DATA(insert OID = 0 ( 1249 cmax 29 0 4 -6 0 -1 -1 t f i f f)); { 1259, {"relnatts"}, 21, 0, 2, 10, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ { 1259, {"relchecks"}, 21, 0, 2, 11, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ { 1259, {"reltriggers"}, 21, 0, 2, 12, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ -{ 1259, {"relukeys"}, 21, 0, 2, 13, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ -{ 1259, {"relfkeys"}, 21, 0, 2, 14, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ -{ 1259, {"relrefs"}, 21, 0, 2, 15, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ +{ 1259, {"relukeys"}, 21, 0, 2, 13, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ +{ 1259, {"relfkeys"}, 21, 0, 2, 14, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ +{ 1259, {"relrefs"}, 21, 0, 2, 15, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \ { 1259, {"relhaspkey"}, 16, 0, 1, 16, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1259, {"relhasrules"}, 16, 0, 1, 17, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \ { 1259, {"relacl"}, 1034, 0, -1, 18, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' } diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h index 246970db81f..5647707a204 100644 --- a/src/include/catalog/pg_class.h +++ b/src/include/catalog/pg_class.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_class.h,v 1.28 1999/03/28 02:01:38 tgl Exp $ + * $Id: pg_class.h,v 1.29 1999/05/25 16:13:44 momjian Exp $ * * NOTES * ``pg_relation'' is being replaced by ``pg_class''. currently @@ -144,7 +144,7 @@ DATA(insert OID = 1264 ( pg_variable 90 PGUID 0 0 0 f t s 1 0 0 0 0 0 f f _n DESCR(""); DATA(insert OID = 1269 ( pg_log 99 PGUID 0 0 0 f t s 1 0 0 0 0 0 f f _null_ )); DESCR(""); -DATA(insert OID = 376 ( pg_xactlock 0 PGUID 0 0 0 f t s 1 0 0 0 0 0 f f _null_ )); +DATA(insert OID = 376 ( pg_xactlock 0 PGUID 0 0 0 f t s 1 0 0 0 0 0 f f _null_ )); DESCR(""); DATA(insert OID = 1215 ( pg_attrdef 109 PGUID 0 0 0 t t r 4 0 0 0 0 0 f f _null_ )); DESCR(""); diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h index 38bb948a660..ee0fa2284f1 100644 --- a/src/include/catalog/pg_index.h +++ b/src/include/catalog/pg_index.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_index.h,v 1.11 1999/02/13 23:21:10 momjian Exp $ + * $Id: pg_index.h,v 1.12 1999/05/25 16:13:45 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -53,8 +53,8 @@ CATALOG(pg_index) bool indhaskeytype; /* does key type != attribute type? */ bool indisunique; /* is this a unique index? */ bool indisprimary; /* is this index for primary key */ - Oid indreference; /* oid of index of referenced relation - * (ie - this index for foreign key */ + Oid indreference; /* oid of index of referenced relation (ie + * - this index for foreign key */ text indpred; /* query plan for partial index predicate */ } FormData_pg_index; diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h index cc18de9fd0a..591021fbb4e 100644 --- a/src/include/catalog/pg_opclass.h +++ b/src/include/catalog/pg_opclass.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_opclass.h,v 1.18 1999/03/28 02:01:38 tgl Exp $ + * $Id: pg_opclass.h,v 1.19 1999/05/25 16:13:45 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -109,11 +109,11 @@ DATA(insert OID = 1312 ( datetime_ops 1184 )); DESCR(""); DATA(insert OID = 1313 ( timespan_ops 1186 )); DESCR(""); -DATA(insert OID = 810 ( macaddr_ops 829 )); +DATA(insert OID = 810 ( macaddr_ops 829 )); DESCR(""); -DATA(insert OID = 935 ( network_ops 869 )); +DATA(insert OID = 935 ( network_ops 869 )); DESCR(""); -DATA(insert OID = 652 ( network_ops 650 )); +DATA(insert OID = 652 ( network_ops 650 )); DESCR(""); #endif /* PG_OPCLASS_H */ diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h index 01b929fc153..1dec2cfcd97 100644 --- a/src/include/catalog/pg_operator.h +++ b/src/include/catalog/pg_operator.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_operator.h,v 1.56 1999/04/10 23:53:00 tgl Exp $ + * $Id: pg_operator.h,v 1.57 1999/05/25 16:13:46 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -197,7 +197,7 @@ DATA(insert OID = 527 ( "/" PGUID 0 b t f 21 21 21 0 0 0 0 int2div DATA(insert OID = 528 ( "/" PGUID 0 b t f 23 23 23 0 0 0 0 int4div - - )); DATA(insert OID = 529 ( "%" PGUID 0 b t f 21 21 21 0 0 0 0 int2mod - - )); DATA(insert OID = 530 ( "%" PGUID 0 b t f 23 23 23 0 0 0 0 int4mod - - )); -DATA(insert OID = 531 ( "<>" PGUID 0 b t f 25 25 16 531 98 0 0 textne neqsel neqjoinsel )); +DATA(insert OID = 531 ( "<>" PGUID 0 b t f 25 25 16 531 98 0 0 textne neqsel neqjoinsel )); DATA(insert OID = 532 ( "=" PGUID 0 b t f 21 23 16 533 538 95 97 int24eq eqsel eqjoinsel )); DATA(insert OID = 533 ( "=" PGUID 0 b t f 23 21 16 532 539 97 95 int42eq eqsel eqjoinsel )); DATA(insert OID = 534 ( "<" PGUID 0 b t f 21 23 16 537 542 0 0 int24lt intltsel intltjoinsel )); @@ -476,7 +476,7 @@ DATA(insert OID = 1116 ( "+" PGUID 0 b t f 700 701 701 1126 0 0 0 float48pl DATA(insert OID = 1117 ( "-" PGUID 0 b t f 700 701 701 0 0 0 0 float48mi - - )); DATA(insert OID = 1118 ( "/" PGUID 0 b t f 700 701 701 0 0 0 0 float48div - - )); DATA(insert OID = 1119 ( "*" PGUID 0 b t f 700 701 701 1129 0 0 0 float48mul - - )); -DATA(insert OID = 1120 ( "=" PGUID 0 b t f 700 701 16 1130 1121 622 672 float48eq eqsel eqjoinsel )); +DATA(insert OID = 1120 ( "=" PGUID 0 b t f 700 701 16 1130 1121 622 672 float48eq eqsel eqjoinsel )); DATA(insert OID = 1121 ( "<>" PGUID 0 b t f 700 701 16 1131 1120 0 0 float48ne neqsel neqjoinsel )); DATA(insert OID = 1122 ( "<" PGUID 0 b t f 700 701 16 1133 1125 0 0 float48lt intltsel intltjoinsel )); DATA(insert OID = 1123 ( ">" PGUID 0 b t f 700 701 16 1132 1124 0 0 float48gt intgtsel intgtjoinsel )); @@ -571,29 +571,29 @@ DATA(insert OID = 1513 ( "&&" PGUID 0 b t f 718 718 16 0 0 0 0 circle DATA(insert OID = 1514 ( ">^" PGUID 0 b t f 718 718 16 0 0 0 0 circle_above - - )); DATA(insert OID = 1515 ( "<^" PGUID 0 b t f 718 718 16 0 0 0 0 circle_below - - )); -DATA(insert OID = 1516 ( "+" PGUID 0 b t f 718 600 718 0 0 0 0 circle_add_pt - - )); +DATA(insert OID = 1516 ( "+" PGUID 0 b t f 718 600 718 0 0 0 0 circle_add_pt - - )); DATA(insert OID = 1517 ( "-" PGUID 0 b t f 718 600 718 0 0 0 0 circle_sub_pt - - )); -DATA(insert OID = 1518 ( "*" PGUID 0 b t f 718 600 718 0 0 0 0 circle_mul_pt - - )); +DATA(insert OID = 1518 ( "*" PGUID 0 b t f 718 600 718 0 0 0 0 circle_mul_pt - - )); DATA(insert OID = 1519 ( "/" PGUID 0 b t f 718 600 718 0 0 0 0 circle_div_pt - - )); DATA(insert OID = 1520 ( "<->" PGUID 0 b t f 718 718 701 1520 0 0 0 circle_distance - - )); DATA(insert OID = 1521 ( "#" PGUID 0 l t f 0 604 23 0 0 0 0 poly_npoints - - )); -DATA(insert OID = 1522 ( "<->" PGUID 0 b t f 600 718 701 0 0 0 0 dist_pc - - )); -DATA(insert OID = 1523 ( "<->" PGUID 0 b t f 718 604 701 0 0 0 0 dist_cpoly - - )); +DATA(insert OID = 1522 ( "<->" PGUID 0 b t f 600 718 701 0 0 0 0 dist_pc - - )); +DATA(insert OID = 1523 ( "<->" PGUID 0 b t f 718 604 701 0 0 0 0 dist_cpoly - - )); /* additional geometric operators - thomas 1997-07-09 */ -DATA(insert OID = 1524 ( "<->" PGUID 0 b t f 628 603 701 0 0 0 0 dist_lb - - )); +DATA(insert OID = 1524 ( "<->" PGUID 0 b t f 628 603 701 0 0 0 0 dist_lb - - )); DATA(insert OID = 1525 ( "?#" PGUID 0 b t f 601 601 16 1525 0 0 0 lseg_intersect - - )); DATA(insert OID = 1526 ( "?||" PGUID 0 b t f 601 601 16 1526 0 0 0 lseg_parallel - - )); DATA(insert OID = 1527 ( "?-|" PGUID 0 b t f 601 601 16 1527 0 0 0 lseg_perp - - )); -DATA(insert OID = 1528 ( "?-" PGUID 0 l t f 0 601 16 0 0 0 0 lseg_horizontal - - )); -DATA(insert OID = 1529 ( "?|" PGUID 0 l t f 0 601 16 0 0 0 0 lseg_vertical - - )); +DATA(insert OID = 1528 ( "?-" PGUID 0 l t f 0 601 16 0 0 0 0 lseg_horizontal - - )); +DATA(insert OID = 1529 ( "?|" PGUID 0 l t f 0 601 16 0 0 0 0 lseg_vertical - - )); DATA(insert OID = 1535 ( "=" PGUID 0 b t f 601 601 16 1535 1586 0 0 lseg_eq eqsel eqjoinsel )); DATA(insert OID = 1536 ( "#" PGUID 0 b t f 601 601 600 1536 0 0 0 lseg_interpt - - )); -DATA(insert OID = 1537 ( "?#" PGUID 0 b t f 601 628 16 0 0 0 0 inter_sl - - )); -DATA(insert OID = 1538 ( "?#" PGUID 0 b t f 601 603 16 0 0 0 0 inter_sb - - )); -DATA(insert OID = 1539 ( "?#" PGUID 0 b t f 628 603 16 0 0 0 0 inter_lb - - )); +DATA(insert OID = 1537 ( "?#" PGUID 0 b t f 601 628 16 0 0 0 0 inter_sl - - )); +DATA(insert OID = 1538 ( "?#" PGUID 0 b t f 601 603 16 0 0 0 0 inter_sb - - )); +DATA(insert OID = 1539 ( "?#" PGUID 0 b t f 628 603 16 0 0 0 0 inter_lb - - )); DATA(insert OID = 1546 ( "@" PGUID 0 b t f 600 628 16 0 0 0 0 on_pl - - )); DATA(insert OID = 1547 ( "@" PGUID 0 b t f 600 601 16 0 0 0 0 on_ps - - )); @@ -622,8 +622,8 @@ DATA(insert OID = 1591 ( "@-@" PGUID 0 l t f 0 601 701 0 0 0 0 lseg_leng DATA(insert OID = 1611 ( "?#" PGUID 0 b t f 628 628 16 1611 0 0 0 line_intersect - - )); DATA(insert OID = 1612 ( "?||" PGUID 0 b t f 628 628 16 1612 0 0 0 line_parallel - - )); DATA(insert OID = 1613 ( "?-|" PGUID 0 b t f 628 628 16 1613 0 0 0 line_perp - - )); -DATA(insert OID = 1614 ( "?-" PGUID 0 l t f 0 628 16 0 0 0 0 line_horizontal - - )); -DATA(insert OID = 1615 ( "?|" PGUID 0 l t f 0 628 16 0 0 0 0 line_vertical - - )); +DATA(insert OID = 1614 ( "?-" PGUID 0 l t f 0 628 16 0 0 0 0 line_horizontal - - )); +DATA(insert OID = 1615 ( "?|" PGUID 0 l t f 0 628 16 0 0 0 0 line_vertical - - )); DATA(insert OID = 1616 ( "=" PGUID 0 b t f 628 628 16 1616 0 0 0 line_eq eqsel eqjoinsel )); DATA(insert OID = 1617 ( "#" PGUID 0 b t f 628 628 600 1617 0 0 0 line_interpt - - )); @@ -642,10 +642,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 intltsel intltjoinsel )); DATA(insert OID = 1205 ( ">" PGUID 0 b t f 869 869 16 1203 1204 0 0 network_gt intgtsel intgtjoinsel )); DATA(insert OID = 1206 ( ">=" PGUID 0 b t f 869 869 16 1204 1203 0 0 network_ge intgtsel intgtjoinsel )); -DATA(insert OID = 931 ( "<<" PGUID 0 b t f 869 869 16 933 934 0 0 network_sub - - )); -DATA(insert OID = 932 ( "<<=" PGUID 0 b t f 869 869 16 934 933 0 0 network_subeq - - )); -DATA(insert OID = 933 ( ">>" PGUID 0 b t f 869 869 16 931 932 0 0 network_sup - - )); -DATA(insert OID = 934 ( ">>=" PGUID 0 b t f 869 869 16 932 931 0 0 network_supeq - - )); +DATA(insert OID = 931 ( "<<" PGUID 0 b t f 869 869 16 933 934 0 0 network_sub - - )); +DATA(insert OID = 932 ( "<<=" PGUID 0 b t f 869 869 16 934 933 0 0 network_subeq - - )); +DATA(insert OID = 933 ( ">>" PGUID 0 b t f 869 869 16 931 932 0 0 network_sup - - )); +DATA(insert OID = 934 ( ">>=" PGUID 0 b t f 869 869 16 932 931 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 )); @@ -654,24 +654,24 @@ DATA(insert OID = 822 ( "<" PGUID 0 b t f 650 650 16 824 825 0 0 network_lt DATA(insert OID = 823 ( "<=" PGUID 0 b t f 650 650 16 825 824 0 0 network_le intltsel intltjoinsel )); DATA(insert OID = 824 ( ">" PGUID 0 b t f 650 650 16 822 823 0 0 network_gt intgtsel intgtjoinsel )); DATA(insert OID = 825 ( ">=" PGUID 0 b t f 650 650 16 823 822 0 0 network_ge intgtsel intgtjoinsel )); -DATA(insert OID = 826 ( "<<" PGUID 0 b t f 650 650 16 828 1004 0 0 network_sub - - )); -DATA(insert OID = 827 ( "<<=" PGUID 0 b t f 650 650 16 1004 828 0 0 network_subeq - - )); -DATA(insert OID = 828 ( ">>" PGUID 0 b t f 650 650 16 826 827 0 0 network_sup - - )); -DATA(insert OID = 1004 ( ">>=" PGUID 0 b t f 650 650 16 827 826 0 0 network_supeq - - )); +DATA(insert OID = 826 ( "<<" PGUID 0 b t f 650 650 16 828 1004 0 0 network_sub - - )); +DATA(insert OID = 827 ( "<<=" PGUID 0 b t f 650 650 16 1004 828 0 0 network_subeq - - )); +DATA(insert OID = 828 ( ">>" PGUID 0 b t f 650 650 16 826 827 0 0 network_sup - - )); +DATA(insert OID = 1004 ( ">>=" PGUID 0 b t f 650 650 16 827 826 0 0 network_supeq - - )); /* NUMERIC type - OID's 1700-1799 */ 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 intltsel intltjoinsel )); -DATA(insert OID = 1755 ( "<=" PGUID 0 b t f 1700 1700 16 1757 1756 0 0 numeric_le intltsel intltjoinsel )); -DATA(insert OID = 1756 ( ">" PGUID 0 b t f 1700 1700 16 1754 1755 0 0 numeric_gt intgtsel intgtjoinsel )); -DATA(insert OID = 1757 ( ">=" PGUID 0 b t f 1700 1700 16 1755 1754 0 0 numeric_ge intgtsel intgtjoinsel )); -DATA(insert OID = 1758 ( "+" PGUID 0 b t f 1700 1700 1700 1758 0 0 0 numeric_add - - )); -DATA(insert OID = 1759 ( "-" PGUID 0 b t f 1700 1700 1700 0 0 0 0 numeric_sub - - )); -DATA(insert OID = 1760 ( "*" PGUID 0 b t f 1700 1700 1700 1760 0 0 0 numeric_mul - - )); -DATA(insert OID = 1761 ( "/" PGUID 0 b t f 1700 1700 1700 0 0 0 0 numeric_div - - )); -DATA(insert OID = 1762 ( "%" PGUID 0 b t f 1700 1700 1700 0 0 0 0 numeric_mod - - )); -DATA(insert OID = 1763 ( "@" PGUID 0 l t f 0 1700 1700 0 0 0 0 numeric_abs - - )); +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 intltsel intltjoinsel )); +DATA(insert OID = 1755 ( "<=" PGUID 0 b t f 1700 1700 16 1757 1756 0 0 numeric_le intltsel intltjoinsel )); +DATA(insert OID = 1756 ( ">" PGUID 0 b t f 1700 1700 16 1754 1755 0 0 numeric_gt intgtsel intgtjoinsel )); +DATA(insert OID = 1757 ( ">=" PGUID 0 b t f 1700 1700 16 1755 1754 0 0 numeric_ge intgtsel intgtjoinsel )); +DATA(insert OID = 1758 ( "+" PGUID 0 b t f 1700 1700 1700 1758 0 0 0 numeric_add - - )); +DATA(insert OID = 1759 ( "-" PGUID 0 b t f 1700 1700 1700 0 0 0 0 numeric_sub - - )); +DATA(insert OID = 1760 ( "*" PGUID 0 b t f 1700 1700 1700 1760 0 0 0 numeric_mul - - )); +DATA(insert OID = 1761 ( "/" PGUID 0 b t f 1700 1700 1700 0 0 0 0 numeric_div - - )); +DATA(insert OID = 1762 ( "%" PGUID 0 b t f 1700 1700 1700 0 0 0 0 numeric_mod - - )); +DATA(insert OID = 1763 ( "@" PGUID 0 l t f 0 1700 1700 0 0 0 0 numeric_abs - - )); diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 5c2aedbb9af..292f8fac389 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_proc.h,v 1.98 1999/05/09 02:22:16 tgl Exp $ + * $Id: pg_proc.h,v 1.99 1999/05/25 16:13:47 momjian Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -295,7 +295,7 @@ DATA(insert OID = 138 ( box_center PGUID 11 f t f 1 f 600 "603" 100 1 0 100 DESCR("center of"); DATA(insert OID = 139 ( areasel PGUID 11 f t f 5 f 701 "26 26 21 0 23" 100 0 0 100 areasel - )); DESCR("selectivity"); -DATA(insert OID = 140 ( areajoinsel PGUID 11 f t f 5 f 701 "26 26 21 26 21" 100 0 0 100 areajoinsel - )); +DATA(insert OID = 140 ( areajoinsel PGUID 11 f t f 5 f 701 "26 26 21 26 21" 100 0 0 100 areajoinsel - )); DESCR("selectivity"); DATA(insert OID = 141 ( int4mul PGUID 11 f t f 2 f 23 "23 23" 100 0 0 100 int4mul - )); DESCR("multiply"); @@ -1077,9 +1077,9 @@ DESCR("convert text to int2"); DATA(insert OID = 819 ( text_int4 PGUID 11 f t f 1 f 23 "25" 100 0 0 100 text_int4 -)); DESCR("convert text to int4"); -DATA(insert OID = 838 ( text_float8 PGUID 11 f t f 1 f 701 "25" 100 0 0 100 text_float8 -)); +DATA(insert OID = 838 ( text_float8 PGUID 11 f t f 1 f 701 "25" 100 0 0 100 text_float8 -)); DESCR("convert text to float8"); -DATA(insert OID = 839 ( text_float4 PGUID 11 f t f 1 f 700 "25" 100 0 0 100 text_float4 -)); +DATA(insert OID = 839 ( text_float4 PGUID 11 f t f 1 f 700 "25" 100 0 0 100 text_float4 -)); DESCR("convert text to float4"); DATA(insert OID = 840 ( float8_text PGUID 11 f t f 1 f 25 "701" 100 0 0 100 float8_text -)); DESCR("convert float8 to text"); @@ -1300,11 +1300,11 @@ DATA(insert OID = 1037 ( aclcontains PGUID 11 f t f 2 f 16 "1034 1033" 100 0 DESCR("matches regex., case-sensitive"); DATA(insert OID = 1038 ( seteval PGUID 11 f t f 1 f 23 "26" 100 0 0 100 seteval - )); DESCR(""); -DATA(insert OID = 1044 ( bpcharin PGUID 11 f t f 3 f 1042 "0 0 23" 100 0 0 100 bpcharin - )); +DATA(insert OID = 1044 ( bpcharin PGUID 11 f t f 3 f 1042 "0 0 23" 100 0 0 100 bpcharin - )); DESCR("(internal)"); DATA(insert OID = 1045 ( bpcharout PGUID 11 f t f 1 f 23 "0" 100 0 0 100 bpcharout - )); DESCR("(internal)"); -DATA(insert OID = 1046 ( varcharin PGUID 11 f t f 3 f 1043 "0 0 23" 100 0 0 100 varcharin - )); +DATA(insert OID = 1046 ( varcharin PGUID 11 f t f 3 f 1043 "0 0 23" 100 0 0 100 varcharin - )); DESCR("(internal)"); DATA(insert OID = 1047 ( varcharout PGUID 11 f t f 1 f 23 "0" 100 0 0 100 varcharout - )); DESCR("(internal)"); @@ -2030,9 +2030,9 @@ DESCR("is line vertical?"); DATA(insert OID = 1603 ( isparallel PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 line_parallel - )); DESCR("are lines parallel?"); -DATA(insert OID = 1604 ( float8 PGUID 11 f t f 1 f 701 "25" 100 0 0 100 text_float8 - )); +DATA(insert OID = 1604 ( float8 PGUID 11 f t f 1 f 701 "25" 100 0 0 100 text_float8 - )); DESCR("convert text to float8"); -DATA(insert OID = 1605 ( float4 PGUID 11 f t f 1 f 700 "25" 100 0 0 100 text_float4 - )); +DATA(insert OID = 1605 ( float4 PGUID 11 f t f 1 f 700 "25" 100 0 0 100 text_float4 - )); DESCR("convert text to float4"); DATA(insert OID = 1606 ( text PGUID 11 f t f 1 f 25 "701" 100 0 0 100 float8_text - )); DESCR("convert float8 to text"); @@ -2041,11 +2041,11 @@ DESCR("convert float4 to text"); DATA(insert OID = 1619 ( varchar PGUID 11 f t f 1 f 1043 "23" 100 0 0 100 int4_text - )); DESCR("convert int4 to varchar"); -DATA(insert OID = 1620 ( int4 PGUID 11 f t f 1 f 23 "1043" 100 0 0 100 text_int4 - )); +DATA(insert OID = 1620 ( int4 PGUID 11 f t f 1 f 23 "1043" 100 0 0 100 text_int4 - )); DESCR("convert varchar to int4"); -DATA(insert OID = 1621 ( text PGUID 11 f t f 1 f 25 "20" 100 0 0 100 int8_text - )); +DATA(insert OID = 1621 ( text PGUID 11 f t f 1 f 25 "20" 100 0 0 100 int8_text - )); DESCR("convert int8 to text"); -DATA(insert OID = 1622 ( int8 PGUID 11 f t f 1 f 20 "25" 100 0 0 100 text_int8 - )); +DATA(insert OID = 1622 ( int8 PGUID 11 f t f 1 f 20 "25" 100 0 0 100 text_int8 - )); DESCR("convert text to int8"); DATA(insert OID = 1623 ( varchar PGUID 11 f t f 1 f 1043 "20" 100 0 0 100 int8_text - )); DESCR("convert int8 to varchar"); @@ -2116,21 +2116,21 @@ DESCR("(internal)"); DATA(insert OID = 437 ( macaddr_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 macaddr_out - )); DESCR("(internal)"); -DATA(insert OID = 830 ( macaddr_eq PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100 macaddr_eq - )); +DATA(insert OID = 830 ( macaddr_eq PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100 macaddr_eq - )); DESCR("equal"); -DATA(insert OID = 831 ( macaddr_lt PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100 macaddr_lt - )); +DATA(insert OID = 831 ( macaddr_lt PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100 macaddr_lt - )); DESCR("less-than"); -DATA(insert OID = 832 ( macaddr_le PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100 macaddr_le - )); +DATA(insert OID = 832 ( macaddr_le PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100 macaddr_le - )); DESCR("less-than-or-equal"); -DATA(insert OID = 833 ( macaddr_gt PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100 macaddr_gt - )); +DATA(insert OID = 833 ( macaddr_gt PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100 macaddr_gt - )); DESCR("greater-than"); -DATA(insert OID = 834 ( macaddr_ge PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100 macaddr_ge - )); +DATA(insert OID = 834 ( macaddr_ge PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100 macaddr_ge - )); DESCR("greater-than-or-equal"); -DATA(insert OID = 835 ( macaddr_ne PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100 macaddr_ne - )); +DATA(insert OID = 835 ( macaddr_ne PGUID 11 f t f 2 f 16 "829 829" 100 0 0 100 macaddr_ne - )); DESCR("not equal"); -DATA(insert OID = 836 ( macaddr_cmp PGUID 11 f t f 2 f 23 "829 829" 100 0 0 100 macaddr_cmp - )); +DATA(insert OID = 836 ( macaddr_cmp PGUID 11 f t f 2 f 23 "829 829" 100 0 0 100 macaddr_cmp - )); DESCR("less-equal-greater"); -DATA(insert OID = 837 ( macaddr_manuf PGUID 11 f t f 1 f 25 "829" 100 0 0 100 macaddr_manuf - )); +DATA(insert OID = 837 ( macaddr_manuf PGUID 11 f t f 1 f 25 "829" 100 0 0 100 macaddr_manuf - )); DESCR("MAC manufacturer"); /* for inet type support */ @@ -2140,33 +2140,33 @@ DATA(insert OID = 911 ( inet_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 inet_ DESCR("(internal)"); /* for cidr type support */ -DATA(insert OID = 1267 ( cidr_in PGUID 11 f t f 1 f 650 "0" 100 0 0 100 cidr_in - )); +DATA(insert OID = 1267 ( cidr_in PGUID 11 f t f 1 f 650 "0" 100 0 0 100 cidr_in - )); DESCR("(internal)"); DATA(insert OID = 1416 ( cidr_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 cidr_out - )); DESCR("(internal)"); /* these are used for both inet and cidr */ -DATA(insert OID = 920 ( network_eq PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_eq - )); +DATA(insert OID = 920 ( network_eq PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_eq - )); DESCR("equal"); -DATA(insert OID = 921 ( network_lt PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_lt - )); +DATA(insert OID = 921 ( network_lt PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_lt - )); DESCR("less-than"); -DATA(insert OID = 922 ( network_le PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_le - )); +DATA(insert OID = 922 ( network_le PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_le - )); DESCR("less-than-or-equal"); -DATA(insert OID = 923 ( network_gt PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_gt - )); +DATA(insert OID = 923 ( network_gt PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_gt - )); DESCR("greater-than"); -DATA(insert OID = 924 ( network_ge PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_ge - )); +DATA(insert OID = 924 ( network_ge PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_ge - )); DESCR("greater-than-or-equal"); -DATA(insert OID = 925 ( network_ne PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_ne - )); +DATA(insert OID = 925 ( network_ne PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_ne - )); DESCR("not equal"); -DATA(insert OID = 926 ( network_cmp PGUID 11 f t f 2 f 23 "869 869" 100 0 0 100 network_cmp - )); +DATA(insert OID = 926 ( network_cmp PGUID 11 f t f 2 f 23 "869 869" 100 0 0 100 network_cmp - )); DESCR("less-equal-greater"); -DATA(insert OID = 927 ( network_sub PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_sub - )); +DATA(insert OID = 927 ( network_sub PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_sub - )); DESCR("is-subnet"); -DATA(insert OID = 928 ( network_subeq PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_subeq - )); +DATA(insert OID = 928 ( network_subeq PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_subeq - )); DESCR("is-subnet-or-equal"); -DATA(insert OID = 929 ( network_sup PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_sup - )); +DATA(insert OID = 929 ( network_sup PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_sup - )); DESCR("is-supernet"); -DATA(insert OID = 930 ( network_supeq PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_supeq - )); +DATA(insert OID = 930 ( network_supeq PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 network_supeq - )); DESCR("is-supernet-or-equal"); /* inet/cidr versions */ @@ -2200,33 +2200,33 @@ DATA(insert OID = 1702 ( numeric_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 nu DESCR("(internal)"); DATA(insert OID = 1703 ( numeric PGUID 11 f t f 2 f 1700 "1700 23" 100 0 0 100 numeric - )); DESCR("(internal)"); -DATA(insert OID = 1704 ( numeric_abs PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_abs - )); +DATA(insert OID = 1704 ( numeric_abs PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_abs - )); DESCR("absolute value"); -DATA(insert OID = 1705 ( abs PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_abs - )); +DATA(insert OID = 1705 ( abs PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_abs - )); DESCR("absolute value"); -DATA(insert OID = 1706 ( numeric_sign PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_sign - )); +DATA(insert OID = 1706 ( numeric_sign PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_sign - )); DESCR("sign of value"); -DATA(insert OID = 1707 ( sign PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_sign - )); +DATA(insert OID = 1707 ( sign PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_sign - )); DESCR("sign of value"); DATA(insert OID = 1708 ( numeric_round PGUID 11 f t f 2 f 1700 "1700 23" 100 0 0 100 numeric_round - )); DESCR("value rounded to 'scale'"); DATA(insert OID = 1709 ( round PGUID 11 f t f 2 f 1700 "1700 23" 100 0 0 100 numeric_round - )); DESCR("value rounded to 'scale'"); -DATA(insert OID = 1710 ( round PGUID 14 f t f 1 f 1700 "1700" 100 0 0 100 "select numeric_round($1,0)" - )); +DATA(insert OID = 1710 ( round PGUID 14 f t f 1 f 1700 "1700" 100 0 0 100 "select numeric_round($1,0)" - )); DESCR("value rounded to 'scale' of zero"); DATA(insert OID = 1711 ( numeric_trunc PGUID 11 f t f 2 f 1700 "1700 23" 100 0 0 100 numeric_trunc - )); DESCR("value truncated to 'scale'"); DATA(insert OID = 1712 ( trunc PGUID 11 f t f 2 f 1700 "1700 23" 100 0 0 100 numeric_trunc - )); DESCR("value truncated to 'scale'"); -DATA(insert OID = 1713 ( trunc PGUID 14 f t f 1 f 1700 "1700" 100 0 0 100 "select numeric_trunc($1,0)" - )); +DATA(insert OID = 1713 ( trunc PGUID 14 f t f 1 f 1700 "1700" 100 0 0 100 "select numeric_trunc($1,0)" - )); DESCR("value truncated to 'scale' of zero"); -DATA(insert OID = 1714 ( numeric_ceil PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_ceil - )); +DATA(insert OID = 1714 ( numeric_ceil PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_ceil - )); DESCR("smallest integer >= value"); -DATA(insert OID = 1715 ( ceil PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_ceil - )); +DATA(insert OID = 1715 ( ceil PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_ceil - )); DESCR("smallest integer >= value"); -DATA(insert OID = 1716 ( numeric_floor PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_floor - )); +DATA(insert OID = 1716 ( numeric_floor PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_floor - )); DESCR("largest integer <= value"); -DATA(insert OID = 1717 ( floor PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_floor - )); +DATA(insert OID = 1717 ( floor PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_floor - )); DESCR("largest integer <= value"); DATA(insert OID = 1718 ( numeric_eq PGUID 11 f t f 2 f 16 "1700 1700" 100 0 0 100 numeric_eq - )); DESCR("equal"); @@ -2252,17 +2252,17 @@ DATA(insert OID = 1728 ( numeric_mod PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 DESCR("modulus"); DATA(insert OID = 1729 ( mod PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100 numeric_mod - )); DESCR("modulus"); -DATA(insert OID = 1730 ( numeric_sqrt PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_sqrt - )); +DATA(insert OID = 1730 ( numeric_sqrt PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_sqrt - )); DESCR("square root"); -DATA(insert OID = 1731 ( sqrt PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_sqrt - )); +DATA(insert OID = 1731 ( sqrt PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_sqrt - )); DESCR("square root"); -DATA(insert OID = 1732 ( numeric_exp PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_exp - )); +DATA(insert OID = 1732 ( numeric_exp PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_exp - )); DESCR("e raised to the power of n"); -DATA(insert OID = 1733 ( exp PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_exp - )); +DATA(insert OID = 1733 ( exp PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_exp - )); DESCR("e raised to the power of n"); -DATA(insert OID = 1734 ( numeric_ln PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_ln - )); +DATA(insert OID = 1734 ( numeric_ln PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_ln - )); DESCR("natural logarithm of n"); -DATA(insert OID = 1735 ( ln PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_ln - )); +DATA(insert OID = 1735 ( ln PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_ln - )); DESCR("natural logarithm of n"); DATA(insert OID = 1736 ( numeric_log PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100 numeric_log - )); DESCR("logarithm base m of n"); @@ -2296,9 +2296,9 @@ DATA(insert OID = 1750 ( numeric_float8 PGUID 11 f t f 1 f 701 "1700" 100 0 0 DESCR("(internal)"); DATA(insert OID = 1751 ( float8 PGUID 11 f t f 1 f 701 "1700" 100 0 0 100 numeric_float8 - )); DESCR("(internal)"); -DATA(insert OID = 1764 ( numeric_inc PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_inc - )); +DATA(insert OID = 1764 ( numeric_inc PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_inc - )); DESCR("increment by one"); -DATA(insert OID = 1765 ( numeric_dec PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_dec - )); +DATA(insert OID = 1765 ( numeric_dec PGUID 11 f t f 1 f 1700 "1700" 100 0 0 100 numeric_dec - )); DESCR("decrement by one"); DATA(insert OID = 1766 ( numeric_smaller PGUID 11 f t f 2 f 1700 "1700 1700" 100 0 0 100 numeric_smaller - )); DESCR("smaller of two numbers"); diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index 06e3733f80a..0bd12530c9f 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_type.h,v 1.61 1999/05/10 04:02:07 momjian Exp $ + * $Id: pg_type.h,v 1.62 1999/05/25 16:13:48 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -54,19 +54,20 @@ CATALOG(pg_type) BOOTSTRAP /* * typbyval determines whether internal Postgres routines pass a value * of this type by value or by reference. Only char, short, and int- - * equivalent items can be passed by value, so if the type is not - * 1, 2, or 4 bytes long, Postgres does not have the option of passing - * by value and so typbyval had better be FALSE. Variable-length types - * are always passed by reference. - * Note that typbyval can be false even if the length would allow - * pass-by-value; this is currently true for type float4, for example. + * equivalent items can be passed by value, so if the type is not 1, + * 2, or 4 bytes long, Postgres does not have the option of passing by + * value and so typbyval had better be FALSE. Variable-length types + * are always passed by reference. Note that typbyval can be false + * even if the length would allow pass-by-value; this is currently + * true for type float4, for example. */ char typtype; /* - * typtype is 'b' for a basic type and 'c' for a catalog type (ie a class). - * If typtype is 'c', typrelid is the OID of the class' entry in pg_class. - * (Why do we need an entry in pg_type for classes, anyway?) + * typtype is 'b' for a basic type and 'c' for a catalog type (ie a + * class). If typtype is 'c', typrelid is the OID of the class' entry + * in pg_class. (Why do we need an entry in pg_type for classes, + * anyway?) */ bool typisdefined; char typdelim; @@ -301,7 +302,7 @@ DESCR("money '$d,ddd.cc'"); DATA(insert OID = 791 ( _money PGUID -1 -1 f b t \054 0 790 array_in array_out array_in array_out i _null_ )); /* OIDS 800 - 899 */ -DATA(insert OID = 829 ( macaddr PGUID 6 -1 f b t \054 0 0 macaddr_in macaddr_out macaddr_in macaddr_out i _null_ )); +DATA(insert OID = 829 ( macaddr PGUID 6 -1 f b t \054 0 0 macaddr_in macaddr_out macaddr_in macaddr_out i _null_ )); DESCR("MAC address"); DATA(insert OID = 869 ( inet PGUID -1 -1 f b t \054 0 0 inet_in inet_out inet_in inet_out i _null_ )); DESCR("Host address"); @@ -344,7 +345,7 @@ DATA(insert OID = 1027 ( _polygon PGUID -1 -1 f b t \054 0 604 array_in array 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_ )); -DATA(insert OID = 1040 ( _macaddr PGUID -1 -1 f b t \054 0 829 array_in array_out array_in array_out i _null_ )); +DATA(insert OID = 1040 ( _macaddr PGUID -1 -1 f b t \054 0 829 array_in array_out array_in array_out i _null_ )); DATA(insert OID = 1041 ( _inet PGUID -1 -1 f b t \054 0 869 array_in array_out array_in array_out i _null_ )); DATA(insert OID = 651 ( _cidr PGUID -1 -1 f b t \054 0 650 array_in array_out array_in array_out i _null_ )); DATA(insert OID = 1042 ( bpchar PGUID -1 -1 f b t \054 0 18 bpcharin bpcharout bpcharin bpcharout i _null_ )); diff --git a/src/include/commands/command.h b/src/include/commands/command.h index 8929363aa2c..68bdd93e15a 100644 --- a/src/include/commands/command.h +++ b/src/include/commands/command.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: command.h,v 1.12 1999/02/13 23:21:18 momjian Exp $ + * $Id: command.h,v 1.13 1999/05/25 16:13:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ extern MemoryContext PortalExecutorHeapMemory; /* - * PerformPortalFetch + * PerformPortalFetch * Performs the POSTQUEL function FETCH. Fetches count (or all if 0) * tuples in portal with name in the forward direction iff goForward. * @@ -30,7 +30,7 @@ extern void PerformPortalFetch(char *name, bool forward, int count, char *tag, CommandDest dest); /* - * PerformPortalClose + * PerformPortalClose * Performs the POSTQUEL function CLOSE. */ extern void PerformPortalClose(char *name, CommandDest dest); @@ -38,12 +38,12 @@ extern void PerformPortalClose(char *name, CommandDest dest); extern void PortalCleanup(Portal portal); /* - * PerformAddAttribute + * PerformAddAttribute * Performs the POSTQUEL function ADD. */ extern void PerformAddAttribute(char *relationName, char *userName, bool inh, ColumnDef *colDef); -extern void LockTableCommand(LockStmt *lockstmt); +extern void LockTableCommand(LockStmt * lockstmt); #endif /* COMMAND_H */ diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index 3b76f3da356..8efe1ba3864 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: vacuum.h,v 1.18 1999/03/28 20:32:38 vadim Exp $ + * $Id: vacuum.h,v 1.19 1999/05/25 16:13:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -97,33 +97,33 @@ typedef VRelListData *VRelList; typedef struct VTupleLinkData { - ItemPointerData new_tid; - ItemPointerData this_tid; -} VTupleLinkData; + ItemPointerData new_tid; + ItemPointerData this_tid; +} VTupleLinkData; typedef VTupleLinkData *VTupleLink; typedef struct VTupleMoveData { - ItemPointerData tid; /* tuple ID */ - VPageDescr vpd; /* where to move */ - bool cleanVpd; /* clean vpd before using */ -} VTupleMoveData; + ItemPointerData tid; /* tuple ID */ + VPageDescr vpd; /* where to move */ + bool cleanVpd; /* clean vpd before using */ +} VTupleMoveData; typedef VTupleMoveData *VTupleMove; typedef struct VRelStats { - Oid relid; - int num_tuples; - int num_pages; - Size min_tlen; - Size max_tlen; - bool hasindex; - int va_natts; /* number of attrs being analyzed */ - VacAttrStats *vacattrstats; - int num_vtlinks; - VTupleLink vtlinks; + Oid relid; + int num_tuples; + int num_pages; + Size min_tlen; + Size max_tlen; + bool hasindex; + int va_natts; /* number of attrs being analyzed */ + VacAttrStats *vacattrstats; + int num_vtlinks; + VTupleLink vtlinks; } VRelStats; extern bool VacuumRunning; diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 456bade9796..d9bce44a03f 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: executor.h,v 1.32 1999/04/16 21:27:23 tgl Exp $ + * $Id: executor.h,v 1.33 1999/05/25 16:13:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -83,14 +83,16 @@ extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot); * prototypes from functions in execMain.c */ extern TupleDesc ExecutorStart(QueryDesc *queryDesc, EState *estate); -extern TupleTableSlot *ExecutorRun(QueryDesc *queryDesc, EState *estate, - int feature, Node *limoffset, Node *limcount); +extern TupleTableSlot *ExecutorRun(QueryDesc *queryDesc, EState *estate, + int feature, Node *limoffset, Node *limcount); extern void ExecutorEnd(QueryDesc *queryDesc, EState *estate); -extern void ExecConstraints(char *caller, Relation rel, HeapTuple tuple, - EState *estate); +extern void ExecConstraints(char *caller, Relation rel, HeapTuple tuple, + EState *estate); + #ifdef QUERY_LIMIT -extern int ExecutorLimit(int limit); -extern int ExecutorGetLimit(void); +extern int ExecutorLimit(int limit); +extern int ExecutorGetLimit(void); + #endif /* diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index 751b5efee10..493210ba012 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hashjoin.h,v 1.11 1999/05/18 21:33:04 tgl Exp $ + * $Id: hashjoin.h,v 1.12 1999/05/25 16:13:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ * hash-join hash table structures * * Each active hashjoin has a HashJoinTable control block which is - * palloc'd in the executor's context. All other storage needed for + * palloc'd in the executor's context. All other storage needed for * the hashjoin is kept in a private "named portal", one for each hashjoin. * This makes it easy and fast to release the storage when we don't need it * anymore. @@ -41,9 +41,10 @@ typedef struct HashJoinTupleData { - struct HashJoinTupleData *next; /* link to next tuple in same bucket */ - HeapTupleData htup; /* tuple header */ -} HashJoinTupleData; + struct HashJoinTupleData *next; /* link to next tuple in same + * bucket */ + HeapTupleData htup; /* tuple header */ +} HashJoinTupleData; typedef HashJoinTupleData *HashJoinTuple; @@ -51,40 +52,45 @@ typedef struct HashTableData { int nbuckets; /* buckets in use during this batch */ int totalbuckets; /* total number of (virtual) buckets */ - HashJoinTuple *buckets; /* buckets[i] is head of list of tuples */ + HashJoinTuple *buckets; /* buckets[i] is head of list of tuples */ /* buckets array is per-batch storage, as are all the tuples */ int nbatch; /* number of batches; 0 means 1-pass join */ int curbatch; /* current batch #, or 0 during 1st pass */ - /* all these arrays are allocated for the life of the hash join, - * but only if nbatch > 0: + /* + * all these arrays are allocated for the life of the hash join, but + * only if nbatch > 0: */ - BufFile **innerBatchFile; /* buffered virtual temp file per batch */ - BufFile **outerBatchFile; /* buffered virtual temp file per batch */ - long *outerBatchSize; /* count of tuples in each outer batch file */ - long *innerBatchSize; /* count of tuples in each inner batch file */ + BufFile **innerBatchFile; /* buffered virtual temp file per batch */ + BufFile **outerBatchFile; /* buffered virtual temp file per batch */ + long *outerBatchSize; /* count of tuples in each outer batch + * file */ + long *innerBatchSize; /* count of tuples in each inner batch + * file */ - /* During 1st scan of inner relation, we get tuples from executor. - * If nbatch > 0 then tuples that don't belong in first nbuckets logical - * buckets get dumped into inner-batch temp files. - * The same statements apply for the 1st scan of the outer relation, - * except we write tuples to outer-batch temp files. - * If nbatch > 0 then we do the following for each batch: - * 1. Read tuples from inner batch file, load into hash buckets. - * 2. Read tuples from outer batch file, match to hash buckets and output. + /* + * During 1st scan of inner relation, we get tuples from executor. If + * nbatch > 0 then tuples that don't belong in first nbuckets logical + * buckets get dumped into inner-batch temp files. The same statements + * apply for the 1st scan of the outer relation, except we write + * tuples to outer-batch temp files. If nbatch > 0 then we do the + * following for each batch: 1. Read tuples from inner batch file, + * load into hash buckets. 2. Read tuples from outer batch file, match + * to hash buckets and output. */ - /* Ugly kluge: myPortal ought to be declared as type Portal (ie, PortalD*) - * but if we try to include utils/portal.h here, we end up with a - * circular dependency of include files! Until the various node.h files - * are restructured in a cleaner way, we have to fake it. The most - * reliable fake seems to be to declare myPortal as void * and then - * cast it to the right things in nodeHash.c. + /* + * Ugly kluge: myPortal ought to be declared as type Portal (ie, + * PortalD*) but if we try to include utils/portal.h here, we end up + * with a circular dependency of include files! Until the various + * node.h files are restructured in a cleaner way, we have to fake it. + * The most reliable fake seems to be to declare myPortal as void * + * and then cast it to the right things in nodeHash.c. */ - void *myPortal; /* where to keep working storage */ - MemoryContext hashCxt; /* context for whole-hash-join storage */ - MemoryContext batchCxt; /* context for this-batch-only storage */ + void *myPortal; /* where to keep working storage */ + MemoryContext hashCxt; /* context for whole-hash-join storage */ + MemoryContext batchCxt; /* context for this-batch-only storage */ } HashTableData; typedef HashTableData *HashJoinTable; diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h index 8239b865e1f..5bc3c336799 100644 --- a/src/include/executor/nodeGroup.h +++ b/src/include/executor/nodeGroup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeGroup.h,v 1.9 1999/02/13 23:21:25 momjian Exp $ + * $Id: nodeGroup.h,v 1.10 1999/05/25 16:13:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,6 +22,7 @@ extern bool ExecInitGroup(Group *node, EState *estate, Plan *parent); extern int ExecCountSlotsGroup(Group *node); extern void ExecEndGroup(Group *node); extern void ExecReScanGroup(Group *node, ExprContext *exprCtxt, Plan *parent); + /***S*I***/ extern void ExecReScanGroup(Group *node, ExprContext *exprCtxt, Plan *parent); diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index 2e198242573..4544d6416e3 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHash.h,v 1.12 1999/05/18 21:33:05 tgl Exp $ + * $Id: nodeHash.h,v 1.13 1999/05/25 16:13:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,11 +27,11 @@ extern void ExecEndHash(Hash *node); extern HashJoinTable ExecHashTableCreate(Hash *node); extern void ExecHashTableDestroy(HashJoinTable hashtable); extern void ExecHashTableInsert(HashJoinTable hashtable, ExprContext *econtext, - Var *hashkey); + Var *hashkey); extern int ExecHashGetBucket(HashJoinTable hashtable, ExprContext *econtext, - Var *hashkey); + Var *hashkey); extern HeapTuple ExecScanHashBucket(HashJoinState *hjstate, List *hjclauses, - ExprContext *econtext); + ExprContext *econtext); extern void ExecHashTableReset(HashJoinTable hashtable, long ntuples); extern void ExecReScanHash(Hash *node, ExprContext *exprCtxt, Plan *parent); diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index 7b6c8a6e845..a6fff84b682 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHashjoin.h,v 1.12 1999/05/18 21:33:05 tgl Exp $ + * $Id: nodeHashjoin.h,v 1.13 1999/05/25 16:13:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ extern TupleTableSlot *ExecHashJoin(HashJoin *node); extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent); extern int ExecCountSlotsHashJoin(HashJoin *node); extern void ExecEndHashJoin(HashJoin *node); -extern void ExecHashJoinSaveTuple(HeapTuple heapTuple, BufFile *file); +extern void ExecHashJoinSaveTuple(HeapTuple heapTuple, BufFile * file); extern void ExecReScanHashJoin(HashJoin *node, ExprContext *exprCtxt, Plan *parent); #endif /* NODEHASHJOIN_H */ diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h index 82f9e793725..7a701896725 100644 --- a/src/include/executor/nodeNestloop.h +++ b/src/include/executor/nodeNestloop.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeNestloop.h,v 1.9 1999/02/13 23:21:27 momjian Exp $ + * $Id: nodeNestloop.h,v 1.10 1999/05/25 16:13:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,6 +22,6 @@ extern bool ExecInitNestLoop(NestLoop *node, EState *estate, Plan *parent); extern int ExecCountSlotsNestLoop(NestLoop *node); extern void ExecEndNestLoop(NestLoop *node); extern void ExecReScanNestLoop(NestLoop *node, ExprContext *exprCtxt, - Plan *parent); + Plan *parent); #endif /* NODENESTLOOP_H */ diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index 104bf24aac4..ea9bda89b85 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -68,12 +68,12 @@ typedef struct extern DLLIMPORT uint32 SPI_processed; extern DLLIMPORT SPITupleTable *SPI_tuptable; -extern DLLIMPORT int SPI_result; +extern DLLIMPORT int SPI_result; extern int SPI_connect(void); extern int SPI_finish(void); -extern void SPI_push(void); -extern void SPI_pop(void); +extern void SPI_push(void); +extern void SPI_pop(void); extern int SPI_exec(char *src, int tcount); extern int SPI_execp(void *plan, Datum *values, char *Nulls, int tcount); extern void *SPI_prepare(char *src, int nargs, Oid *argtypes); diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h index ece8a5a1c74..2046dd45cb2 100644 --- a/src/include/executor/spi_priv.h +++ b/src/include/executor/spi_priv.h @@ -3,7 +3,7 @@ * spi.c * Server Programming Interface private declarations * - * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.3 1999/05/13 07:28:58 tgl Exp $ + * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.4 1999/05/25 16:13:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,4 +35,4 @@ typedef struct #define _SPI_CPLAN_PROCXT 1 #define _SPI_CPLAN_TOPCXT 2 -#endif /* SPI_PRIV_H */ +#endif /* SPI_PRIV_H */ diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index 8ca01ef8e64..de582ba387c 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tuptable.h,v 1.11 1999/02/23 07:36:31 thomas Exp $ + * $Id: tuptable.h,v 1.12 1999/05/25 16:13:58 momjian Exp $ * * NOTES * The tuple table interface is getting pretty ugly. @@ -51,13 +51,13 @@ */ typedef struct TupleTableSlot { - NodeTag type; - HeapTuple val; - bool ttc_shouldFree; - bool ttc_descIsNew; - TupleDesc ttc_tupleDescriptor; - Buffer ttc_buffer; - int ttc_whichplan; + NodeTag type; + HeapTuple val; + bool ttc_shouldFree; + bool ttc_descIsNew; + TupleDesc ttc_tupleDescriptor; + Buffer ttc_buffer; + int ttc_whichplan; } TupleTableSlot; /* ---------------- diff --git a/src/include/lib/fstack.h b/src/include/lib/fstack.h index bf2e051561a..4432b4186d3 100644 --- a/src/include/lib/fstack.h +++ b/src/include/lib/fstack.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: fstack.h,v 1.7 1999/02/13 23:21:30 momjian Exp $ + * $Id: fstack.h,v 1.8 1999/05/25 16:13:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ /* - * FixedItem + * FixedItem * Fixed format stackable item chain component. * * Note: @@ -43,7 +43,7 @@ struct FixedItemData }; /* - * FixedStack + * FixedStack * Fixed format stack. */ typedef struct FixedStackData @@ -56,7 +56,7 @@ typedef struct FixedStackData typedef FixedStackData *FixedStack; /* - * FixedStackInit + * FixedStackInit * Iniitializes stack for structures with given fixed component offset. * * Exceptions: @@ -65,7 +65,7 @@ typedef FixedStackData *FixedStack; extern void FixedStackInit(FixedStack stack, Offset offset); /* - * FixedStackPop + * FixedStackPop * Returns pointer to top structure on stack or NULL if empty stack. * * Exceptions: @@ -74,7 +74,7 @@ extern void FixedStackInit(FixedStack stack, Offset offset); Pointer FixedStackPop(FixedStack stack); /* - * FixedStackPush + * FixedStackPush * Places structure associated with pointer onto top of stack. * * Exceptions: @@ -84,7 +84,7 @@ Pointer FixedStackPop(FixedStack stack); extern void FixedStackPush(FixedStack stack, Pointer pointer); /* - * FixedStackGetTop + * FixedStackGetTop * Returns pointer to top structure of a stack. This item is not poped. * * Note: @@ -97,7 +97,7 @@ extern void FixedStackPush(FixedStack stack, Pointer pointer); extern Pointer FixedStackGetTop(FixedStack stack); /* - * FixedStackGetNext + * FixedStackGetNext * Returns pointer to next structure after pointer of a stack. * * Note: diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h index 6b86fd6552e..dbf901c67e6 100644 --- a/src/include/lib/stringinfo.h +++ b/src/include/lib/stringinfo.h @@ -9,7 +9,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: stringinfo.h,v 1.11 1999/04/25 03:19:27 tgl Exp $ + * $Id: stringinfo.h,v 1.12 1999/05/25 16:13:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -55,7 +55,7 @@ typedef StringInfoData *StringInfo; * * NOTE: some routines build up a string using StringInfo, and then * release the StringInfoData but return the data string itself to their - * caller. At that point the data string looks like a plain palloc'd + * caller. At that point the data string looks like a plain palloc'd * string. *------------------------- */ @@ -82,7 +82,7 @@ extern void initStringInfo(StringInfo str); * CAUTION: the current implementation has a 1K limit on the amount of text * generated in a single call (not on the total string length). */ -extern void appendStringInfo(StringInfo str, const char *fmt, ...); +extern void appendStringInfo(StringInfo str, const char *fmt,...); /*------------------------ * appendStringInfoChar @@ -97,7 +97,7 @@ extern void appendStringInfoChar(StringInfo str, char ch); * if necessary. */ extern void appendBinaryStringInfo(StringInfo str, - const char *data, int datalen); + const char *data, int datalen); /*------------------------ * stringStringInfo diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index 873992739ee..cd9f1ccde62 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: libpq.h,v 1.28 1999/04/25 03:19:13 tgl Exp $ + * $Id: libpq.h,v 1.29 1999/05/25 16:14:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,7 @@ /* ---------------- - * PQArgBlock + * PQArgBlock * Information (pointer to array of this structure) required * for the PQfn() call. * ---------------- @@ -39,7 +39,7 @@ typedef struct } PQArgBlock; /* ---------------- - * TypeBlock + * TypeBlock * Information about an attribute. * ---------------- */ @@ -53,7 +53,7 @@ typedef struct TypeBlock } TypeBlock; /* ---------------- - * TupleBlock + * TupleBlock * Data of a tuple. * ---------------- */ @@ -69,7 +69,7 @@ typedef struct TupleBlock } TupleBlock; /* ---------------- - * GroupBuffer + * GroupBuffer * A group of tuples with the same attributes. * ---------------- */ @@ -83,7 +83,7 @@ typedef struct GroupBuffer } GroupBuffer; /* ---------------- - * PortalBuffer + * PortalBuffer * Data structure of a portal buffer. * ---------------- */ @@ -96,7 +96,7 @@ typedef struct PortalBuffer } PortalBuffer; /* ---------------- - * PortalEntry + * PortalEntry * an entry in the global portal table * * Note: the portalcxt is only meaningful for PQcalls made from @@ -220,7 +220,7 @@ extern PortalEntry *be_newportal(void); extern void be_typeinit(PortalEntry *entry, TupleDesc attrs, int natts); extern void be_printtup(HeapTuple tuple, TupleDesc typeinfo, - DestReceiver* self); + DestReceiver * self); /* in be-pqexec.c */ @@ -246,7 +246,7 @@ extern int pq_peekbyte(void); extern int pq_putbytes(const char *s, size_t len); extern int pq_flush(void); extern int pq_putmessage(char msgtype, const char *s, size_t len); -extern void pq_startcopyout(void); -extern void pq_endcopyout(bool errorAbort); +extern void pq_startcopyout(void); +extern void pq_endcopyout(bool errorAbort); #endif /* LIBPQ_H */ diff --git a/src/include/libpq/pqformat.h b/src/include/libpq/pqformat.h index b546c36c5e7..4daf7179cf5 100644 --- a/src/include/libpq/pqformat.h +++ b/src/include/libpq/pqformat.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pqformat.h,v 1.3 1999/04/25 21:50:58 tgl Exp $ + * $Id: pqformat.h,v 1.4 1999/05/25 16:14:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,12 +17,12 @@ #define pq_beginmessage(buf) initStringInfo(buf) -extern void pq_sendbyte(StringInfo buf, int byt); -extern void pq_sendbytes(StringInfo buf, const char *data, int datalen); -extern void pq_sendcountedtext(StringInfo buf, const char *str, int slen); -extern void pq_sendstring(StringInfo buf, const char *str); -extern void pq_sendint(StringInfo buf, int i, int b); -extern void pq_endmessage(StringInfo buf); +extern void pq_sendbyte(StringInfo buf, int byt); +extern void pq_sendbytes(StringInfo buf, const char *data, int datalen); +extern void pq_sendcountedtext(StringInfo buf, const char *str, int slen); +extern void pq_sendstring(StringInfo buf, const char *str); +extern void pq_sendint(StringInfo buf, int i, int b); +extern void pq_endmessage(StringInfo buf); extern int pq_puttextmessage(char msgtype, const char *str); diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index 55e19a1a538..5e28b9a4f31 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -1,4 +1,4 @@ -/* $Id: pg_wchar.h,v 1.7 1999/03/24 06:53:28 ishii Exp $ */ +/* $Id: pg_wchar.h,v 1.8 1999/05/25 16:14:04 momjian Exp $ */ #ifndef PG_WCHAR_H #define PG_WCHAR_H @@ -61,7 +61,7 @@ typedef unsigned int pg_wchar; #define LC_ISO8859_5 0x8d /* ISO8859 Latin 5 */ #define LC_JISX0201K 0x89 /* Japanese 1 byte kana */ #define LC_JISX0201R 0x8a /* Japanese 1 byte Roman */ -#define LC_KOI8_R 0x8c /* Cyrillic KOI8-R */ +#define LC_KOI8_R 0x8c /* Cyrillic KOI8-R */ #define LC_GB2312_80 0x91 /* Chinese */ #define LC_JISX0208 0x92 /* Japanese Kanji */ #define LC_KS5601 0x93 /* Korean */ diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index a77ae25e3c3..9a1b8334d4a 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -11,7 +11,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: miscadmin.h,v 1.38 1999/05/22 17:47:47 tgl Exp $ + * $Id: miscadmin.h,v 1.39 1999/05/25 16:13:23 momjian Exp $ * * NOTES * some of the information in this file will be moved to @@ -93,8 +93,8 @@ extern char CTZName[]; extern char FloatFormat[]; extern char DateFormat[]; -extern bool disableFsync; -extern bool allowSystemTableMods; +extern bool disableFsync; +extern bool allowSystemTableMods; extern int SortMem; extern Oid LastOidProcessed; /* for query rewrite */ diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index cdc713eafe1..134fa3e833f 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execnodes.h,v 1.28 1999/05/18 21:34:26 tgl Exp $ + * $Id: execnodes.h,v 1.29 1999/05/25 16:14:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -194,28 +194,28 @@ typedef struct JunkFilter */ typedef struct EState { - NodeTag type; - ScanDirection es_direction; - Snapshot es_snapshot; - List *es_range_table; - RelationInfo *es_result_relation_info; - List **es_result_relation_constraints; - Relation es_into_relation_descriptor; - ParamListInfo es_param_list_info; - ParamExecData *es_param_exec_vals; /* this is for subselects */ - int es_BaseId; - TupleTable es_tupleTable; - JunkFilter *es_junkFilter; - int *es_refcount; - uint32 es_processed; /* # of tuples processed */ - Oid es_lastoid; /* last oid processed (by INSERT) */ - List *es_rowMark; /* not good place, but there is no other */ + NodeTag type; + ScanDirection es_direction; + Snapshot es_snapshot; + List *es_range_table; + RelationInfo *es_result_relation_info; + List **es_result_relation_constraints; + Relation es_into_relation_descriptor; + ParamListInfo es_param_list_info; + ParamExecData *es_param_exec_vals; /* this is for subselects */ + int es_BaseId; + TupleTable es_tupleTable; + JunkFilter *es_junkFilter; + int *es_refcount; + uint32 es_processed; /* # of tuples processed */ + Oid es_lastoid; /* last oid processed (by INSERT) */ + List *es_rowMark; /* not good place, but there is no other */ /* Below is to re-evaluate plan qual in READ COMMITTED mode */ - struct Plan *es_origPlan; - Pointer es_evalPlanQual; - bool *es_evTupleNull; - HeapTuple *es_evTuple; - bool es_useEvalPlan; + struct Plan *es_origPlan; + Pointer es_evalPlanQual; + bool *es_evTupleNull; + HeapTuple *es_evTuple; + bool es_useEvalPlan; } EState; /* ---------------- @@ -404,16 +404,16 @@ typedef struct CommonScanState */ typedef struct IndexScanState { - CommonState cstate; /* its first field is NodeTag */ - int iss_NumIndices; - int iss_IndexPtr; - int iss_MarkIndexPtr; - ScanKey *iss_ScanKeys; - int *iss_NumScanKeys; - Pointer iss_RuntimeKeyInfo; - RelationPtr iss_RelationDescs; - IndexScanDescPtr iss_ScanDescs; - HeapTupleData iss_htup; + CommonState cstate; /* its first field is NodeTag */ + int iss_NumIndices; + int iss_IndexPtr; + int iss_MarkIndexPtr; + ScanKey *iss_ScanKeys; + int *iss_NumScanKeys; + Pointer iss_RuntimeKeyInfo; + RelationPtr iss_RelationDescs; + IndexScanDescPtr iss_ScanDescs; + HeapTupleData iss_htup; } IndexScanState; @@ -517,10 +517,10 @@ typedef struct MergeJoinState typedef struct HashJoinState { JoinState jstate; /* its first field is NodeTag */ - HashJoinTable hj_HashTable; - int hj_CurBucketNo; - HashJoinTuple hj_CurTuple; - Var *hj_InnerHashKey; + HashJoinTable hj_HashTable; + int hj_CurBucketNo; + HashJoinTuple hj_CurTuple; + Var *hj_InnerHashKey; TupleTableSlot *hj_OuterTupleSlot; TupleTableSlot *hj_HashTupleSlot; } HashJoinState; @@ -689,16 +689,17 @@ typedef struct HashState */ typedef struct TeeState { - CommonState cstate; /* its first field is NodeTag */ - int tee_leftPlace, - tee_rightPlace, - tee_lastPlace; - char *tee_bufferRelname; - Relation tee_bufferRel; + CommonState cstate; /* its first field is NodeTag */ + int tee_leftPlace, + tee_rightPlace, + tee_lastPlace; + char *tee_bufferRelname; + Relation tee_bufferRel; MemoryContext tee_mcxt; - HeapScanDesc tee_leftScanDesc, - tee_rightScanDesc; + HeapScanDesc tee_leftScanDesc, + tee_rightScanDesc; } TeeState; + #endif #endif /* EXECNODES_H */ diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index 178afdff185..4cc34024a7c 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: makefuncs.h,v 1.17 1999/05/17 17:03:42 momjian Exp $ + * $Id: makefuncs.h,v 1.18 1999/05/25 16:14:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,35 +18,35 @@ #include <utils/fcache.h> extern Oper *makeOper(Oid opno, - Oid opid, - Oid opresulttype, - int opsize, - FunctionCachePtr op_fcache); + Oid opid, + Oid opresulttype, + int opsize, + FunctionCachePtr op_fcache); extern Var *makeVar(Index varno, - AttrNumber varattno, - Oid vartype, - int32 vartypmod, - Index varlevelsup, - Index varnoold, - AttrNumber varoattno); + AttrNumber varattno, + Oid vartype, + int32 vartypmod, + Index varlevelsup, + Index varnoold, + AttrNumber varoattno); extern TargetEntry *makeTargetEntry(Resdom *resdom, Node *expr); extern Resdom *makeResdom(AttrNumber resno, - Oid restype, - int32 restypmod, - char *resname, - Index reskey, - Oid reskeyop, - bool resjunk); + Oid restype, + int32 restypmod, + char *resname, + Index reskey, + Oid reskeyop, + bool resjunk); extern Const *makeConst(Oid consttype, - int constlen, - Datum constvalue, - bool constisnull, - bool constbyval, - bool constisset, - bool constiscast); + int constlen, + Datum constvalue, + bool constisnull, + bool constbyval, + bool constisset, + bool constiscast); #endif /* MAKEFUNC_H */ diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h index a44e1fb31a7..7259cb1b0f7 100644 --- a/src/include/nodes/memnodes.h +++ b/src/include/nodes/memnodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: memnodes.h,v 1.11 1999/03/07 23:03:31 tgl Exp $ + * $Id: memnodes.h,v 1.12 1999/05/25 16:14:09 momjian Exp $ * * XXX the typedefs in this file are different from the other ???nodes.h; * they are pointers to structures instead of the structures themselves. @@ -23,7 +23,7 @@ #include <nodes/nodes.h> /* - * MemoryContext + * MemoryContext * A logical context in which memory allocations occur. * * The types of memory contexts can be thought of as members of the @@ -95,7 +95,7 @@ typedef struct PortalHeapMemoryData } *PortalHeapMemory; /* - * MemoryContextIsValid + * MemoryContextIsValid * True iff memory context is valid. */ #define MemoryContextIsValid(context) \ diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index fed516ccfb8..441ffd9b01c 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.72 1999/05/12 15:02:04 wieck Exp $ + * $Id: parsenodes.h,v 1.73 1999/05/25 16:14:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,8 +60,8 @@ typedef struct Query * BY */ Node *havingQual; /* qualification of each group */ - /***S*I***/ - List *intersectClause; + /***S*I***/ + List *intersectClause; List *unionClause; /* unions are linked under the previous * query */ @@ -590,7 +590,7 @@ typedef struct LockStmt NodeTag type; char *relname; /* relation to lock */ int mode; /* lock mode */ -} LockStmt; +} LockStmt; /***************************************************************************** * Optimizable Statements @@ -614,7 +614,7 @@ typedef struct InsertStmt List *unionClause; /* union subselect parameters */ bool unionall; /* union without unique sort */ /***S*I***/ - List *intersectClause; + List *intersectClause; List *forUpdate; /* FOR UPDATE clause */ } InsertStmt; @@ -748,7 +748,7 @@ typedef struct CaseExpr Node *arg; /* implicit equality comparison argument */ List *args; /* the arguments (list of WHEN clauses) */ Node *defresult; /* the default result (ELSE clause) */ -} CaseExpr; +} CaseExpr; /* * CaseWhen - an argument to a CASE expression @@ -758,7 +758,7 @@ typedef struct CaseWhen NodeTag type; Node *expr; /* comparison expression */ Node *result; /* substitution result */ -} CaseWhen; +} CaseWhen; /* * ColumnDef - column definition (used in various creates) @@ -896,7 +896,7 @@ typedef struct JoinExpr RangeVar *larg; Node *rarg; List *quals; -} JoinExpr; +} JoinExpr; /**************************************************************************** @@ -964,14 +964,14 @@ typedef struct GroupClause Index tleGroupref; /* reference into targetlist */ } GroupClause; -#define ROW_MARK_FOR_UPDATE (1 << 0) -#define ROW_ACL_FOR_UPDATE (1 << 1) +#define ROW_MARK_FOR_UPDATE (1 << 0) +#define ROW_ACL_FOR_UPDATE (1 << 1) typedef struct RowMark { - NodeTag type; - Index rti; /* index in Query->rtable */ - bits8 info; /* as above */ -} RowMark; + NodeTag type; + Index rti; /* index in Query->rtable */ + bits8 info; /* as above */ +} RowMark; #endif /* PARSENODES_H */ diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 0805665b065..ffa45b0bfe9 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: plannodes.h,v 1.25 1999/05/18 21:34:26 tgl Exp $ + * $Id: plannodes.h,v 1.26 1999/05/25 16:14:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -264,7 +264,7 @@ typedef struct Noname Plan plan; Oid nonameid; int keycount; -} Noname; +} Noname; /* ---------------- * materialization node @@ -339,6 +339,7 @@ typedef struct Tee * Tee may be different than the parent * plans */ } Tee; + #endif /* --------------------- diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index d19673f6353..8028e07a94c 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: primnodes.h,v 1.27 1999/05/17 17:03:44 momjian Exp $ + * $Id: primnodes.h,v 1.28 1999/05/25 16:14:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -273,7 +273,7 @@ typedef struct Aggref Node *target; int aggno; bool usenulls; -} Aggref; +} Aggref; /* ---------------- * SubLink diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 2d47243c405..4f45a6cafcc 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: relation.h,v 1.30 1999/05/12 15:02:08 wieck Exp $ + * $Id: relation.h,v 1.31 1999/05/25 16:14:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -84,7 +84,7 @@ typedef struct RelOptInfo /* materialization information */ List *targetlist; List *pathlist; /* Path structures */ - struct Path *cheapestpath; + struct Path *cheapestpath; bool pruneable; /* used solely by indices: */ @@ -100,7 +100,7 @@ typedef struct RelOptInfo List *restrictinfo; /* RestrictInfo structures */ List *joininfo; /* JoinInfo structures */ List *innerjoin; -} RelOptInfo; +} RelOptInfo; extern Var *get_expr(TargetEntry *foo); extern Var *get_groupclause_expr(GroupClause *groupClause, List *targetList); @@ -129,7 +129,7 @@ typedef struct PathOrder { Oid *sortop; MergeOrder *merge; - } ord; + } ord; } PathOrder; typedef struct Path @@ -141,12 +141,12 @@ typedef struct Path NodeTag pathtype; - PathOrder *pathorder; + PathOrder *pathorder; - List *pathkeys; /* This is a List of List of Var nodes. - * See the top of optimizer/path/pathkeys.c - * for more information. - */ + List *pathkeys; /* This is a List of List of Var nodes. + * See the top of + * optimizer/path/pathkeys.c for more + * information. */ Cost outerjoincost; Relids joinid; List *loc_restrictinfo; @@ -157,7 +157,8 @@ typedef struct IndexPath Path path; List *indexid; List *indexqual; - int *indexkeys; /* to transform heap attnos into index ones */ + int *indexkeys; /* to transform heap attnos into index + * ones */ } IndexPath; typedef struct NestPath @@ -166,7 +167,7 @@ typedef struct NestPath List *pathinfo; Path *outerjoinpath; Path *innerjoinpath; -} NestPath; +} NestPath; typedef NestPath JoinPath; @@ -222,7 +223,7 @@ typedef struct RestrictInfo /* hashjoin only */ Oid hashjoinoperator; Relids restrictinfojoinid; -} RestrictInfo; +} RestrictInfo; typedef struct JoinMethod { @@ -235,13 +236,13 @@ typedef struct HashInfo { JoinMethod jmethod; Oid hashop; -} HashInfo; +} HashInfo; typedef struct MergeInfo { JoinMethod jmethod; MergeOrder *m_ordering; -} MergeInfo; +} MergeInfo; typedef struct JoinInfo { @@ -250,7 +251,7 @@ typedef struct JoinInfo List *jinfo_restrictinfo; bool mergejoinable; bool hashjoinable; -} JoinInfo; +} JoinInfo; typedef struct Iter { @@ -261,10 +262,10 @@ typedef struct Iter } Iter; /* - * Stream: + * Stream: * A stream represents a root-to-leaf path in a plan tree (i.e. a tree of * JoinPaths and Paths). The stream includes pointers to all Path nodes, - * as well as to any clauses that reside above Path nodes. This structure + * as well as to any clauses that reside above Path nodes. This structure * is used to make Path nodes and clauses look similar, so that Predicate * Migration can run. * diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index 6332729d45b..5766e8933e0 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: clauses.h,v 1.16 1999/02/18 00:49:46 momjian Exp $ + * $Id: clauses.h,v 1.17 1999/05/25 16:14:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,7 +38,7 @@ extern Expr *make_andclause(List *andclauses); extern bool case_clause(Node *clause); extern List *pull_constant_clauses(List *quals, List **constantQual); -extern void clause_get_relids_vars(Node *clause, Relids *relids, List **vars); +extern void clause_get_relids_vars(Node *clause, Relids * relids, List **vars); extern int NumRelids(Node *clause); extern bool contains_not(Node *clause); extern bool is_joinable(Node *clause); diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index 2b752711a68..5146900e4d7 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: cost.h,v 1.18 1999/05/01 19:47:39 tgl Exp $ + * $Id: cost.h,v 1.19 1999/05/25 16:14:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,8 +43,8 @@ extern Cost cost_mergejoin(Cost outercost, Cost innercost, extern Cost cost_hashjoin(Cost outercost, Cost innercost, List *outerkeys, List *innerkeys, int outersize, int innersize, int outerwidth, int innerwidth); -extern int compute_rel_size(RelOptInfo *rel); -extern int compute_rel_width(RelOptInfo *rel); +extern int compute_rel_size(RelOptInfo * rel); +extern int compute_rel_width(RelOptInfo * rel); extern int compute_joinrel_size(JoinPath *joinpath); extern int page_size(int tuples, int width); diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h index aba1d86096b..c2eba475035 100644 --- a/src/include/optimizer/geqo.h +++ b/src/include/optimizer/geqo.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo.h,v 1.14 1999/05/17 00:25:32 tgl Exp $ + * $Id: geqo.h,v 1.15 1999/05/25 16:14:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,10 +57,10 @@ /* should be 1.5 <= SELECTION_BIAS <= 2.0 */ /* parameter values set in geqo_params.c */ -extern int PoolSize; -extern int Generations; -extern long RandomSeed; -extern double SelectionBias; +extern int PoolSize; +extern int Generations; +extern long RandomSeed; +extern double SelectionBias; /* routines in geqo_main.c */ extern RelOptInfo *geqo(Query *root); @@ -72,6 +72,6 @@ extern void geqo_params(int string_length); extern void geqo_eval_startup(void); extern Cost geqo_eval(Query *root, Gene *tour, int num_gene); extern RelOptInfo *gimme_tree(Query *root, Gene *tour, int rel_count, - int num_gene, RelOptInfo *old_rel); + int num_gene, RelOptInfo * old_rel); #endif /* GEQO_H */ diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index 2039703b602..1e610ba8d08 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_misc.h,v 1.9 1999/02/13 23:21:46 momjian Exp $ + * $Id: geqo_misc.h,v 1.10 1999/05/25 16:14:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,7 @@ extern void print_pool(FILE *fp, Pool *pool, int start, int stop); extern void print_gen(FILE *fp, Pool *pool, int generation); extern void print_edge_table(FILE *fp, Edge *edge_table, int num_gene); -extern void geqo_print_rel(Query *root, RelOptInfo *rel); +extern void geqo_print_rel(Query *root, RelOptInfo * rel); extern void geqo_print_path(Query *root, Path *path, int indent); extern void geqo_print_joinclauses(Query *root, List *clauses); diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h index 0241a3f98f1..51e15d2507c 100644 --- a/src/include/optimizer/internal.h +++ b/src/include/optimizer/internal.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: internal.h,v 1.19 1999/05/16 19:45:36 tgl Exp $ + * $Id: internal.h,v 1.20 1999/05/25 16:14:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ * System-dependent tuning constants * */ -#define _CPU_PAGE_WEIGHT_ 0.033 /* CPU-heap-to-page cost weighting factor */ +#define _CPU_PAGE_WEIGHT_ 0.033/* CPU-heap-to-page cost weighting factor */ #define _CPU_INDEX_PAGE_WEIGHT_ 0.017 /* CPU-index-to-page cost * weighting factor */ #define _MAX_KEYS_ INDEX_MAX_KEYS /* maximum number of keys in an diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h index a38af83c5cb..2b4e214e24e 100644 --- a/src/include/optimizer/joininfo.h +++ b/src/include/optimizer/joininfo.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: joininfo.h,v 1.10 1999/02/13 23:21:49 momjian Exp $ + * $Id: joininfo.h,v 1.11 1999/05/25 16:14:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ #include "nodes/primnodes.h" extern JoinInfo *joininfo_member(List *join_relids, List *joininfo_list); -extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids); +extern JoinInfo *find_joininfo_node(RelOptInfo * this_rel, List *join_relids); extern Var *other_join_clause_var(Var *var, Expr *clause); #endif /* JOININFO_H */ diff --git a/src/include/optimizer/keys.h b/src/include/optimizer/keys.h index fad0117c3a3..cccdb7bfbbb 100644 --- a/src/include/optimizer/keys.h +++ b/src/include/optimizer/keys.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: keys.h,v 1.13 1999/02/19 02:05:18 momjian Exp $ + * $Id: keys.h,v 1.14 1999/05/25 16:14:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,7 +16,7 @@ #include "nodes/nodes.h" #include "nodes/relation.h" -extern bool match_indexkey_operand(int indexkey, Var *operand, RelOptInfo *rel); +extern bool match_indexkey_operand(int indexkey, Var *operand, RelOptInfo * rel); extern Var *extract_join_key(JoinKey *jk, int outer_or_inner); extern bool pathkeys_match(List *keys1, List *keys2, int *better_key); extern List *collect_index_pathkeys(int *index_keys, List *tlist); diff --git a/src/include/optimizer/ordering.h b/src/include/optimizer/ordering.h index 1b642127e4f..30b262b9e37 100644 --- a/src/include/optimizer/ordering.h +++ b/src/include/optimizer/ordering.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: ordering.h,v 1.13 1999/02/13 23:21:49 momjian Exp $ + * $Id: ordering.h,v 1.14 1999/05/25 16:14:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,10 +16,10 @@ #include <nodes/relation.h> extern bool pathorder_match(PathOrder *path_ordering1, - PathOrder *path_ordering2, int *better_sort); + PathOrder *path_ordering2, int *better_sort); extern bool equal_path_merge_ordering(Oid *path_ordering, MergeOrder *merge_ordering); extern bool equal_merge_ordering(MergeOrder *merge_ordering1, - MergeOrder *merge_ordering2); + MergeOrder *merge_ordering2); #endif /* ORDERING_H */ diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index 1a52453d0df..2a864d591a5 100644 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pathnode.h,v 1.15 1999/02/18 00:49:46 momjian Exp $ + * $Id: pathnode.h,v 1.16 1999/05/25 16:14:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,22 +21,22 @@ * prototypes for pathnode.c */ extern bool path_is_cheaper(Path *path1, Path *path2); -extern Path *set_cheapest(RelOptInfo *parent_rel, List *pathlist); -extern List *add_pathlist(RelOptInfo *parent_rel, List *unique_paths, +extern Path *set_cheapest(RelOptInfo * parent_rel, List *pathlist); +extern List *add_pathlist(RelOptInfo * parent_rel, List *unique_paths, List *new_paths); -extern Path *create_seqscan_path(RelOptInfo *rel); -extern IndexPath *create_index_path(Query *root, RelOptInfo *rel, RelOptInfo *index, +extern Path *create_seqscan_path(RelOptInfo * rel); +extern IndexPath *create_index_path(Query *root, RelOptInfo * rel, RelOptInfo * index, List *restriction_clauses, bool is_join_scan); -extern NestPath *create_nestloop_path(RelOptInfo *joinrel, RelOptInfo *outer_rel, +extern NestPath *create_nestloop_path(RelOptInfo * joinrel, RelOptInfo * outer_rel, Path *outer_path, Path *inner_path, List *pathkeys); -extern MergePath *create_mergejoin_path(RelOptInfo *joinrel, int outersize, +extern MergePath *create_mergejoin_path(RelOptInfo * joinrel, int outersize, int innersize, int outerwidth, int innerwidth, Path *outer_path, Path *inner_path, List *pathkeys, MergeOrder *order, List *mergeclauses, List *outersortkeys, List *innersortkeys); -extern HashPath *create_hashjoin_path(RelOptInfo *joinrel, int outersize, +extern HashPath *create_hashjoin_path(RelOptInfo * joinrel, int outersize, int innersize, int outerwidth, int innerwidth, Path *outer_path, - Path *inner_path, List *pathkeys, Oid operator, List *hashclauses, + Path *inner_path, List *pathkeys, Oid operator, List *hashclauses, List *outerkeys, List *innerkeys); /* @@ -49,6 +49,6 @@ extern RelOptInfo *get_join_rel(Query *root, Relids relid); /* * prototypes for indexnode.h */ -extern List *find_relation_indices(Query *root, RelOptInfo *rel); +extern List *find_relation_indices(Query *root, RelOptInfo * rel); #endif /* PATHNODE_H */ diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index 603efd7e52c..1a92130e860 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: paths.h,v 1.27 1999/04/03 00:18:26 tgl Exp $ + * $Id: paths.h,v 1.28 1999/05/25 16:14:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,9 +27,9 @@ extern RelOptInfo *make_one_rel(Query *root, List *rels); * indxpath.h * routines to generate index paths */ -extern List *create_index_paths(Query *root, RelOptInfo *rel, List *indices, - List *restrictinfo_list, - List *joininfo_list); +extern List *create_index_paths(Query *root, RelOptInfo * rel, List *indices, + List *restrictinfo_list, + List *joininfo_list); /* * joinpath.h @@ -41,27 +41,27 @@ extern void update_rels_pathlist_for_joins(Query *root, List *joinrels); /* * orindxpath.h */ -extern List *create_or_index_paths(Query *root, RelOptInfo *rel, List *clauses); +extern List *create_or_index_paths(Query *root, RelOptInfo * rel, List *clauses); /* * hashutils.h * routines to deal with hash keys and clauses */ extern List *group_clauses_by_hashop(List *restrictinfo_list, - Relids inner_relids); + Relids inner_relids); /* * joinutils.h * generic join method key/clause routines */ extern bool order_joinkeys_by_pathkeys(List *pathkeys, - List *joinkeys, List *joinclauses, int outer_or_inner, - List **matchedJoinKeysPtr, - List **matchedJoinClausesPtr); + List *joinkeys, List *joinclauses, int outer_or_inner, + List **matchedJoinKeysPtr, + List **matchedJoinClausesPtr); extern List *make_pathkeys_from_joinkeys(List *joinkeys, List *tlist, - int outer_or_inner); + int outer_or_inner); extern Path *get_cheapest_path_for_joinkeys(List *joinkeys, - PathOrder *ordering, List *paths, int outer_or_inner); + PathOrder *ordering, List *paths, int outer_or_inner); extern List *new_join_pathkeys(List *outer_pathkeys, List *join_rel_tlist, List *joinclauses); @@ -70,20 +70,20 @@ extern List *new_join_pathkeys(List *outer_pathkeys, * routines to deal with merge keys and clauses */ extern List *group_clauses_by_order(List *restrictinfo_list, - Relids inner_relids); + Relids inner_relids); extern MergeInfo *match_order_mergeinfo(PathOrder *ordering, - List *mergeinfo_list); + List *mergeinfo_list); /* * joinrels.h * routines to determine which relations to join */ extern List *make_rels_by_joins(Query *root, List *old_rels); -extern List *make_rels_by_clause_joins(Query *root, RelOptInfo *old_rel, - List *joininfo_list, Relids only_relids); -extern List *make_rels_by_clauseless_joins(RelOptInfo *old_rel, - List *inner_rels); -extern RelOptInfo *make_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinInfo *joininfo); +extern List *make_rels_by_clause_joins(Query *root, RelOptInfo * old_rel, + List *joininfo_list, Relids only_relids); +extern List *make_rels_by_clauseless_joins(RelOptInfo * old_rel, + List *inner_rels); +extern RelOptInfo *make_join_rel(RelOptInfo * outer_rel, RelOptInfo * inner_rel, JoinInfo * joininfo); extern List *new_join_tlist(List *tlist, int first_resdomno); extern RelOptInfo *get_cheapest_complete_rel(List *join_rel_list); diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index e3848330dbc..71c11b7b876 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: planmain.h,v 1.25 1999/05/12 15:02:22 wieck Exp $ + * $Id: planmain.h,v 1.26 1999/05/25 16:14:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,20 +51,20 @@ extern void add_missing_vars_to_tlist(Query *root, List *tlist); */ extern void set_tlist_references(Plan *plan); extern List *join_references(List *clauses, List *outer_tlist, - List *inner_tlist); + List *inner_tlist); extern List *index_outerjoin_references(List *inner_indxqual, List *outer_tlist, Index inner_relid); extern void replace_tlist_with_subplan_refs(List *tlist, - Index subvarno, - List *subplanTargetList); + Index subvarno, + List *subplanTargetList); extern void replace_vars_with_subplan_refs(Node *clause, - Index subvarno, - List *subplanTargetList); + Index subvarno, + List *subplanTargetList); extern bool set_agg_tlist_references(Agg *aggNode); extern void del_agg_tlist_references(List *tlist); extern void check_having_for_ungrouped_vars(Node *clause, - List *groupClause, - List *targetList); + List *groupClause, + List *targetList); extern void transformKeySetQuery(Query *origNode); #endif /* PLANMAIN_H */ diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h index 88cedc3f686..9b1346c31d0 100644 --- a/src/include/optimizer/restrictinfo.h +++ b/src/include/optimizer/restrictinfo.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: restrictinfo.h,v 1.2 1999/02/13 23:21:52 momjian Exp $ + * $Id: restrictinfo.h,v 1.3 1999/05/25 16:14:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,7 +16,7 @@ #include "nodes/pg_list.h" #include "nodes/relation.h" -extern bool valid_or_clause(RestrictInfo *restrictinfo); +extern bool valid_or_clause(RestrictInfo * restrictinfo); extern List *get_actual_clauses(List *restrictinfo_list); extern void get_relattvals(List *restrictinfo_list, List **attnos, List **values, List **flags); diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index 9066478183e..b4d3d212562 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tlist.h,v 1.16 1999/02/15 05:56:07 momjian Exp $ + * $Id: tlist.h,v 1.17 1999/05/25 16:14:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ extern TargetEntry *tlistentry_member(Var *var, List *targetlist); extern Expr *matching_tlist_var(Var *var, List *targetlist); -extern void add_var_to_tlist(RelOptInfo *rel, Var *var); +extern void add_var_to_tlist(RelOptInfo * rel, Var *var); extern TargetEntry *create_tl_element(Var *var, int resdomno); extern List *get_actual_tlist(List *tlist); extern Resdom *tlist_member(Var *var, List *tlist); diff --git a/src/include/optimizer/xfunc.h b/src/include/optimizer/xfunc.h index e96c5474813..7c5082746c6 100644 --- a/src/include/optimizer/xfunc.h +++ b/src/include/optimizer/xfunc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: xfunc.h,v 1.16 1999/02/18 00:49:48 momjian Exp $ + * $Id: xfunc.h,v 1.17 1999/05/25 16:14:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,10 +49,10 @@ extern int XfuncMode; /* defined in tcop/postgres.c */ #define is_join(pathnode) (length(get_relids(get_parent(pathnode))) > 1 ? 1 : 0) /* function prototypes from planner/path/xfunc.c */ -extern void xfunc_trypullup(RelOptInfo *rel); +extern void xfunc_trypullup(RelOptInfo * rel); extern int xfunc_shouldpull(Path *childpath, JoinPath *parentpath, - int whichchild, RestrictInfo *maxcinfopt); -extern RestrictInfo *xfunc_pullup(Path *childpath, JoinPath *parentpath, RestrictInfo *cinfo, + int whichchild, RestrictInfo * maxcinfopt); +extern RestrictInfo *xfunc_pullup(Path *childpath, JoinPath *parentpath, RestrictInfo * cinfo, int whichchild, int clausetype); extern Cost xfunc_rank(Expr *clause); extern Cost xfunc_expense(Query *queryInfo, Expr *clause); @@ -69,7 +69,7 @@ extern List *xfunc_primary_join(JoinPath *pathnode); extern Cost xfunc_get_path_cost(Path *pathnode); extern Cost xfunc_total_path_cost(JoinPath *pathnode); extern Cost xfunc_expense_per_tuple(JoinPath *joinnode, int whichchild); -extern void xfunc_fixvars(Expr *clause, RelOptInfo *rel, int varno); +extern void xfunc_fixvars(Expr *clause, RelOptInfo * rel, int varno); extern int xfunc_cinfo_compare(void *arg1, void *arg2); extern int xfunc_clause_compare(void *arg1, void *arg2); extern void xfunc_disjunct_sort(List *clause_list); @@ -78,7 +78,7 @@ extern int xfunc_func_width(RegProcedure funcid, List *args); extern int xfunc_tuple_width(Relation rd); extern int xfunc_num_join_clauses(JoinPath *path); extern List *xfunc_LispRemove(List *foo, List *bar); -extern bool xfunc_copyrel(RelOptInfo *from, RelOptInfo ** to); +extern bool xfunc_copyrel(RelOptInfo * from, RelOptInfo ** to); /* * function prototypes for path/predmig.c diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index af775c84f89..74f48ef4311 100644 --- a/src/include/parser/analyze.h +++ b/src/include/parser/analyze.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: analyze.h,v 1.6 1999/05/13 07:29:17 tgl Exp $ + * $Id: analyze.h,v 1.7 1999/05/25 16:14:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,6 +15,7 @@ #include <parser/parse_node.h> extern List *parse_analyze(List *pl, ParseState *parentParseState); + /***S*I***/ extern void create_select_list(Node *ptr, List **select_list, bool *unionall_present); extern Node *A_Expr_to_Expr(Node *ptr, bool *intersect_present); diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index e68e5ac735a..125b1109772 100644 --- a/src/include/parser/parse_agg.h +++ b/src/include/parser/parse_agg.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_agg.h,v 1.8 1999/01/24 00:28:37 momjian Exp $ + * $Id: parse_agg.h,v 1.9 1999/05/25 16:14:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ #include <nodes/primnodes.h> #include <parser/parse_node.h> -extern void AddAggToParseState(ParseState *pstate, Aggref *aggref); +extern void AddAggToParseState(ParseState *pstate, Aggref * aggref); extern void parseCheckAggregates(ParseState *pstate, Query *qry); extern Aggref *ParseAgg(ParseState *pstate, char *aggname, Oid basetype, List *target, int precedence); diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index d8cc6b7697d..2a664ed8c12 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_coerce.h,v 1.10 1999/05/22 04:12:29 momjian Exp $ + * $Id: parse_coerce.h,v 1.11 1999/05/25 16:14:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,8 +67,8 @@ typedef enum CATEGORY * This allows us to cheat and directly exchange values without * going through the trouble of calling a conversion function. * Remove equivalencing of FLOAT8 and DATETIME. They really are not - * close enough in behavior, with the DATETIME reserved values - * and special formatting. - thomas 1999-01-24 + * close enough in behavior, with the DATETIME reserved values + * and special formatting. - thomas 1999-01-24 */ #define IS_BINARY_COMPATIBLE(a,b) \ (((a) == BPCHAROID && (b) == TEXTOID) \ @@ -122,6 +122,6 @@ 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); #endif /* PARSE_COERCE_H */ diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index e21c2e6c06a..b83929358c5 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_func.h,v 1.14 1999/02/13 23:21:57 momjian Exp $ + * $Id: parse_func.h,v 1.15 1999/05/25 16:14:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,14 +42,12 @@ typedef struct _CandidateList struct _CandidateList *next; } *CandidateList; -extern Node * -ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, +extern Node *ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, int *curr_resno, int precedence); -extern Node * -ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, +extern Node *ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, int *curr_resno, int precedence); extern void -func_error(char *caller, char *funcname, int nargs, Oid *argtypes, char *msg); + func_error(char *caller, char *funcname, int nargs, Oid *argtypes, char *msg); #endif /* PARSE_FUNC_H */ diff --git a/src/include/port/bsd.h b/src/include/port/bsd.h index f24f4f83b57..68858e5ff16 100644 --- a/src/include/port/bsd.h +++ b/src/include/port/bsd.h @@ -31,10 +31,12 @@ #if defined(__powerpc__) #define HAS_TEST_AND_SET typedef unsigned int slock_t; + #endif #if defined(__mips__) /* # undef HAS_TEST_AND_SET */ #endif #if !defined(__powerpc__) typedef unsigned char slock_t; + #endif diff --git a/src/include/port/svr4.h b/src/include/port/svr4.h index 4d76f28da71..a460c825c63 100644 --- a/src/include/port/svr4.h +++ b/src/include/port/svr4.h @@ -13,4 +13,5 @@ #include <abi_mutex.h> typedef abilock_t slock_t; + #endif diff --git a/src/include/port/win.h b/src/include/port/win.h index b82984e1e32..15a89a0e43e 100644 --- a/src/include/port/win.h +++ b/src/include/port/win.h @@ -6,6 +6,6 @@ typedef unsigned char slock_t; #define O_DIROPEN 0x100000 /* should be in sys/fcntl.h */ #endif -#define tzname _tzname /* should be in time.h?*/ +#define tzname _tzname /* should be in time.h? */ #define USE_POSIX_TIME -#define HAVE_INT_TIMEZONE /* has int _timezone */ +#define HAVE_INT_TIMEZONE /* has int _timezone */ diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h index dfa4cc57113..be2feae6cac 100644 --- a/src/include/rewrite/rewriteHandler.h +++ b/src/include/rewrite/rewriteHandler.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteHandler.h,v 1.8 1999/02/13 23:22:00 momjian Exp $ + * $Id: rewriteHandler.h,v 1.9 1999/05/25 16:14:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,9 +34,11 @@ typedef struct _rewrite_meta_knowledge RewriteInfo; extern List *QueryRewrite(Query *parsetree); + /***S*I***/ extern Query *Except_Intersect_Rewrite(Query *parsetree); extern void create_list(Node *ptr, List **intersect_list); extern Node *intersect_tree_analyze(Node *tree, Node *first_select, Node *parsetree); extern void check_targetlists_are_compatible(List *prev_target, List *current_target); + #endif /* REWRITEHANDLER_H */ diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h index e41a2267083..c258bb1103b 100644 --- a/src/include/rewrite/rewriteManip.h +++ b/src/include/rewrite/rewriteManip.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteManip.h,v 1.14 1999/05/12 15:02:28 wieck Exp $ + * $Id: rewriteManip.h,v 1.15 1999/05/25 16:14:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,7 +25,7 @@ void AddQual(Query *parsetree, Node *qual); void AddHavingQual(Query *parsetree, Node *havingQual); void AddNotQual(Query *parsetree, Node *qual); -void AddNotHavingQual(Query *parsetree, Node *havingQual); +void AddNotHavingQual(Query *parsetree, Node *havingQual); void AddGroupClause(Query *parsetree, List *group_by, List *tlist); void FixNew(RewriteInfo *info, Query *parsetree); diff --git a/src/include/storage/block.h b/src/include/storage/block.h index ac0df00de5a..a2650c82a48 100644 --- a/src/include/storage/block.h +++ b/src/include/storage/block.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: block.h,v 1.8 1999/02/13 23:22:02 momjian Exp $ + * $Id: block.h,v 1.9 1999/05/25 16:14:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,21 +61,21 @@ typedef BlockIdData *BlockId; /* block identifier */ */ /* - * BlockNumberIsValid + * BlockNumberIsValid * True iff blockNumber is valid. */ #define BlockNumberIsValid(blockNumber) \ ((bool) ((int32) (blockNumber) != InvalidBlockNumber)) /* - * BlockIdIsValid + * BlockIdIsValid * True iff the block identifier is valid. */ #define BlockIdIsValid(blockId) \ ((bool) PointerIsValid(blockId)) /* - * BlockIdSet + * BlockIdSet * Sets a block identifier to the specified value. */ #define BlockIdSet(blockId, blockNumber) \ @@ -86,7 +86,7 @@ typedef BlockIdData *BlockId; /* block identifier */ ) /* - * BlockIdCopy + * BlockIdCopy * Copy a block identifier. */ #define BlockIdCopy(toBlockId, fromBlockId) \ @@ -98,7 +98,7 @@ typedef BlockIdData *BlockId; /* block identifier */ ) /* - * BlockIdEquals + * BlockIdEquals * Check for block number equality. */ #define BlockIdEquals(blockId1, blockId2) \ @@ -106,7 +106,7 @@ typedef BlockIdData *BlockId; /* block identifier */ (blockId1)->bi_lo == (blockId2)->bi_lo) /* - * BlockIdGetBlockNumber + * BlockIdGetBlockNumber * Retrieve the block number from a block identifier. */ #define BlockIdGetBlockNumber(blockId) \ diff --git a/src/include/storage/buf.h b/src/include/storage/buf.h index a38ee2315e4..0ce0edb9073 100644 --- a/src/include/storage/buf.h +++ b/src/include/storage/buf.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: buf.h,v 1.5 1999/02/13 23:22:03 momjian Exp $ + * $Id: buf.h,v 1.6 1999/05/25 16:14:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,19 +19,19 @@ typedef long Buffer; /* - * BufferIsInvalid + * BufferIsInvalid * True iff the buffer is invalid. */ #define BufferIsInvalid(buffer) ((buffer) == InvalidBuffer) /* - * BufferIsUnknown + * BufferIsUnknown * True iff the buffer is unknown. */ #define BufferIsUnknown(buffer) ((buffer) == UnknownBuffer) /* - * BufferIsLocal + * BufferIsLocal * True iff the buffer is local (not visible to other servers). */ #define BufferIsLocal(buffer) ((buffer) < 0) diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h index ed625f525c3..7d257e33e60 100644 --- a/src/include/storage/buf_internals.h +++ b/src/include/storage/buf_internals.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: buf_internals.h,v 1.28 1999/02/13 23:22:03 momjian Exp $ + * $Id: buf_internals.h,v 1.29 1999/05/25 16:14:38 momjian Exp $ * * NOTE * If BUFFERPAGE0 is defined, then 0 will be used as a @@ -106,17 +106,17 @@ struct sbufdesc bool w_lock; /* context exclusively locked */ char sb_dbname[NAMEDATALEN]; /* name of db in which buf belongs */ - char sb_relname[NAMEDATALEN];/* name of reln */ + char sb_relname[NAMEDATALEN]; /* name of reln */ }; /* * Buffer lock infos in BufferLocks below. * We have to free these locks in elog(ERROR)... */ -#define BL_IO_IN_PROGRESS (1 << 0) /* unimplemented */ -#define BL_R_LOCK (1 << 1) -#define BL_RI_LOCK (1 << 2) -#define BL_W_LOCK (1 << 3) +#define BL_IO_IN_PROGRESS (1 << 0) /* unimplemented */ +#define BL_R_LOCK (1 << 1) +#define BL_RI_LOCK (1 << 2) +#define BL_W_LOCK (1 << 3) /* * mao tracing buffer allocation diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index e9ba960a064..55b735a6a99 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: bufmgr.h,v 1.25 1999/02/13 23:22:04 momjian Exp $ + * $Id: bufmgr.h,v 1.26 1999/05/25 16:14:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -55,7 +55,7 @@ typedef bits16 BufferLock; #define BufferDescriptorGetBuffer(bdesc) ((bdesc)->buf_id + 1) /* - * BufferIsPinned + * BufferIsPinned * True iff the buffer is pinned (and therefore valid) * * Note: @@ -76,13 +76,13 @@ extern int ShowPinTrace; /* * Buffer context lock modes */ -#define BUFFER_LOCK_UNLOCK 0 -#define BUFFER_LOCK_SHARE 1 -#define BUFFER_LOCK_EXCLUSIVE 2 +#define BUFFER_LOCK_UNLOCK 0 +#define BUFFER_LOCK_SHARE 1 +#define BUFFER_LOCK_EXCLUSIVE 2 /* - * BufferIsValid + * BufferIsValid * True iff the refcnt of the local buffer is > 0 * Note: * BufferIsValid(InvalidBuffer) is False. @@ -117,7 +117,7 @@ extern int ShowPinTrace; ) /* - * BufferGetBlock + * BufferGetBlock * Returns a reference to a disk page image associated with a buffer. * * Note: diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h index 47c0a2c6119..5c8574a4509 100644 --- a/src/include/storage/bufpage.h +++ b/src/include/storage/bufpage.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: bufpage.h,v 1.21 1999/02/13 23:22:04 momjian Exp $ + * $Id: bufpage.h,v 1.22 1999/05/25 16:14:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,7 +75,7 @@ */ /* - * PageIsValid + * PageIsValid * True iff page is valid. */ #define PageIsValid(page) PointerIsValid(page) @@ -154,7 +154,7 @@ typedef enum */ /* - * PageIsUsed + * PageIsUsed * True iff the page size is used. * * Note: @@ -167,7 +167,7 @@ typedef enum ) /* - * PageIsEmpty + * PageIsEmpty * returns true iff no itemid has been allocated on the page */ #define PageIsEmpty(page) \ @@ -175,14 +175,14 @@ typedef enum (sizeof(PageHeaderData) - sizeof(ItemIdData)) ? true : false) /* - * PageIsNew + * PageIsNew * returns true iff page is not initialized (by PageInit) */ #define PageIsNew(page) (((PageHeader) (page))->pd_upper == 0) /* - * PageGetItemId + * PageGetItemId * Returns an item identifier of a page. */ #define PageGetItemId(page, offsetNumber) \ @@ -194,7 +194,7 @@ typedef enum */ /* - * PageSizeIsValid + * PageSizeIsValid * True iff the page size is valid. * * XXX currently all page sizes are "valid" but we only actually @@ -206,7 +206,7 @@ typedef enum #define PageSizeIsValid(pageSize) ((pageSize) == BLCKSZ) /* - * PageGetPageSize + * PageGetPageSize * Returns the page size of a page. * * this can only be called on a formatted page (unlike @@ -217,7 +217,7 @@ typedef enum ((Size) ((PageHeader) (page))->pd_opaque.od_pagesize) /* - * PageSetPageSize + * PageSetPageSize * Sets the page size of a page. */ #define PageSetPageSize(page, size) \ @@ -228,7 +228,7 @@ typedef enum * ---------------- */ /* - * PageGetSpecialSize + * PageGetSpecialSize * Returns size of special space on a page. * * Note: @@ -238,7 +238,7 @@ typedef enum ((uint16) (PageGetPageSize(page) - ((PageHeader)(page))->pd_special)) /* - * PageGetSpecialPointer + * PageGetSpecialPointer * Returns pointer to special space on a page. * * Note: @@ -251,7 +251,7 @@ typedef enum ) /* - * PageGetItem + * PageGetItem * Retrieves an item on the given page. * * Note: @@ -266,7 +266,7 @@ typedef enum ) /* - * BufferGetPageSize + * BufferGetPageSize * Returns the page size within a buffer. * * Notes: @@ -283,13 +283,13 @@ typedef enum ) /* - * BufferGetPage + * BufferGetPage * Returns the page associated with a buffer. */ #define BufferGetPage(buffer) ((Page)BufferGetBlock(buffer)) /* - * PageGetMaxOffsetNumber + * PageGetMaxOffsetNumber * Returns the maximum offset number used by the given page. * * NOTE: The offset is invalid if the page is non-empty. diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index a867775743c..0493b3ccc7b 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: fd.h,v 1.13 1999/05/09 00:52:06 tgl Exp $ + * $Id: fd.h,v 1.14 1999/05/25 16:14:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -91,11 +91,11 @@ extern void FreeFile(FILE *); * atop virtual Files... */ 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 BufFileFlush(BufFile *file); -extern long BufFileSeek(BufFile *file, long offset, int whence); +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 BufFileFlush(BufFile * file); +extern long BufFileSeek(BufFile * file, long offset, int whence); /* Miscellaneous support routines */ extern int FileNameUnlink(char *filename); diff --git a/src/include/storage/itemid.h b/src/include/storage/itemid.h index 88d856a35c4..c6bea0eea9c 100644 --- a/src/include/storage/itemid.h +++ b/src/include/storage/itemid.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: itemid.h,v 1.8 1999/02/13 23:22:06 momjian Exp $ + * $Id: itemid.h,v 1.9 1999/05/25 16:14:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,13 +57,13 @@ typedef struct ItemIdData *ItemId; ((itemId)->lp_flags) /* - * ItemIdIsValid + * ItemIdIsValid * True iff disk item identifier is valid. */ #define ItemIdIsValid(itemId) PointerIsValid(itemId) /* - * ItemIdIsUsed + * ItemIdIsUsed * True iff disk item identifier is in use. * * Note: diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h index 3e3c1d2a55d..4f6a131f741 100644 --- a/src/include/storage/itemptr.h +++ b/src/include/storage/itemptr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: itemptr.h,v 1.10 1999/02/13 23:22:06 momjian Exp $ + * $Id: itemptr.h,v 1.11 1999/05/25 16:14:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,14 +37,14 @@ typedef ItemPointerData *ItemPointer; */ /* - * ItemPointerIsValid + * ItemPointerIsValid * True iff the disk item pointer is not NULL. */ #define ItemPointerIsValid(pointer) \ ((bool) (PointerIsValid(pointer) && ((pointer)->ip_posid != 0))) /* - * ItemPointerGetBlockNumber + * ItemPointerGetBlockNumber * Returns the block number of a disk item pointer. */ #define ItemPointerGetBlockNumber(pointer) \ @@ -54,7 +54,7 @@ typedef ItemPointerData *ItemPointer; ) /* - * ItemPointerGetOffsetNumber + * ItemPointerGetOffsetNumber * Returns the offset number of a disk item pointer. */ #define ItemPointerGetOffsetNumber(pointer) \ @@ -64,7 +64,7 @@ typedef ItemPointerData *ItemPointer; ) /* - * ItemPointerSet + * ItemPointerSet * Sets a disk item pointer to the specified block and offset. */ #define ItemPointerSet(pointer, blockNumber, offNum) \ @@ -75,7 +75,7 @@ typedef ItemPointerData *ItemPointer; ) /* - * ItemPointerSetBlockNumber + * ItemPointerSetBlockNumber * Sets a disk item pointer to the specified block. */ #define ItemPointerSetBlockNumber(pointer, blockNumber) \ @@ -85,7 +85,7 @@ typedef ItemPointerData *ItemPointer; ) /* - * ItemPointerSetOffsetNumber + * ItemPointerSetOffsetNumber * Sets a disk item pointer to the specified offset. */ #define ItemPointerSetOffsetNumber(pointer, offsetNumber) \ @@ -95,7 +95,7 @@ typedef ItemPointerData *ItemPointer; ) /* - * ItemPointerCopy + * ItemPointerCopy * Copies the contents of one disk item pointer to another. */ #define ItemPointerCopy(fromPointer, toPointer) \ @@ -106,7 +106,7 @@ typedef ItemPointerData *ItemPointer; ) /* - * ItemPointerSetInvalid + * ItemPointerSetInvalid * Sets a disk item pointer to be invalid. */ #define ItemPointerSetInvalid(pointer) \ diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index ab084eb94fd..744ff537c0a 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lock.h,v 1.26 1999/05/13 15:55:44 momjian Exp $ + * $Id: lock.h,v 1.27 1999/05/25 16:14:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,8 +64,8 @@ typedef struct LTAG Oid dbId; union { - BlockNumber blkno; - TransactionId xid; + BlockNumber blkno; + TransactionId xid; } objId; uint16 lockmethod; /* needed by user locks */ } LOCKTAG; @@ -124,7 +124,7 @@ typedef struct LOCKMETHODTABLE * we store is the number of locks of each type (holders) and the * total number of locks (nHolding) held by the transaction. * - * NOTE: + * NOTE: * There were some problems with the fact that currently TransactionIdData * is a 5 byte entity and compilers long word aligning of structure fields. * If the 3 byte padding is put in front of the actual xid data then the diff --git a/src/include/storage/off.h b/src/include/storage/off.h index ee3434c4f9f..63a3e1b54c3 100644 --- a/src/include/storage/off.h +++ b/src/include/storage/off.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: off.h,v 1.6 1999/02/13 23:22:08 momjian Exp $ + * $Id: off.h,v 1.7 1999/05/25 16:14:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,7 @@ typedef uint16 OffsetNumber; */ /* - * OffsetNumberIsValid + * OffsetNumberIsValid * True iff the offset number is valid. */ #define OffsetNumberIsValid(offsetNumber) \ @@ -40,8 +40,8 @@ typedef uint16 OffsetNumber; (offsetNumber <= MaxOffsetNumber))) /* - * OffsetNumberNext - * OffsetNumberPrev + * OffsetNumberNext + * OffsetNumberPrev * Increments/decrements the argument. These macros look pointless * but they help us disambiguate the different manipulations on * OffsetNumbers (e.g., sometimes we substract one from an diff --git a/src/include/storage/page.h b/src/include/storage/page.h index d661266ffe4..4ee4e06d382 100644 --- a/src/include/storage/page.h +++ b/src/include/storage/page.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: page.h,v 1.5 1999/02/13 23:22:09 momjian Exp $ + * $Id: page.h,v 1.6 1999/05/25 16:14:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,7 +16,7 @@ typedef Pointer Page; /* - * PageIsValid + * PageIsValid * True iff page is valid. */ #define PageIsValid(page) PointerIsValid(page) diff --git a/src/include/storage/pagenum.h b/src/include/storage/pagenum.h index 56ccf1c1ab3..91cf23b5ce0 100644 --- a/src/include/storage/pagenum.h +++ b/src/include/storage/pagenum.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pagenum.h,v 1.7 1999/02/13 23:22:09 momjian Exp $ + * $Id: pagenum.h,v 1.8 1999/05/25 16:14:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ typedef uint32 LogicalPageNumber; #define InvalidLogicalPageNumber 0 /* - * LogicalPageNumberIsValid + * LogicalPageNumberIsValid * True iff the logical page number is valid. */ #define LogicalPageNumberIsValid(pageNumber) \ diff --git a/src/include/storage/pos.h b/src/include/storage/pos.h index fa6feb148cc..91d85c68c55 100644 --- a/src/include/storage/pos.h +++ b/src/include/storage/pos.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pos.h,v 1.6 1999/02/13 23:22:09 momjian Exp $ + * $Id: pos.h,v 1.7 1999/05/25 16:14:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,28 +32,28 @@ typedef PositionIdData *PositionId; */ /* - * PositionIdIsValid + * PositionIdIsValid * True iff the position identifier is valid. */ #define PositionIdIsValid(positionId) \ PointerIsValid(positionId) /* - * PositionIdSetInvalid + * PositionIdSetInvalid * Make an invalid position. */ #define PositionIdSetInvalid(positionId) \ *(positionId) = (bits16) 0 /* - * PositionIdSet + * PositionIdSet * Sets a position identifier to the specified value. */ #define PositionIdSet(positionId, offsetNumber) \ *(positionId) = (offsetNumber) /* - * PositionIdGetOffsetNumber + * PositionIdGetOffsetNumber * Retrieve the offset number from a position identifier. */ #define PositionIdGetOffsetNumber(positionId) \ diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 3dcf1e281b5..0caef8fa90c 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: proc.h,v 1.22 1999/05/13 15:55:45 momjian Exp $ + * $Id: proc.h,v 1.23 1999/05/25 16:14:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,7 +76,9 @@ typedef struct procglobal SHMEM_OFFSET freeProcs; IPCKey currKey; int32 freeSemMap[MAX_PROC_SEMS / PROC_NSEMS_PER_SET]; - /* In each freeSemMap entry, the PROC_NSEMS_PER_SET lsbs flag whether + + /* + * In each freeSemMap entry, the PROC_NSEMS_PER_SET lsbs flag whether * individual semaphores are in use, and the next higher bit is set to * show that the entire set is allocated. */ @@ -117,8 +119,8 @@ extern bool ProcRemove(int pid); /* make static in storage/lmgr/proc.c -- jolly */ extern void ProcQueueInit(PROC_QUEUE *queue); -extern int ProcSleep(PROC_QUEUE *queue, LOCKMETHODCTL *lockctl, int token, - LOCK *lock); +extern int ProcSleep(PROC_QUEUE *queue, LOCKMETHODCTL * lockctl, int token, + LOCK *lock); extern PROC *ProcWakeup(PROC *proc, int errType); extern int ProcLockWakeup(PROC_QUEUE *queue, LOCKMETHOD lockmethod, LOCK *lock); diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h index 7f5ed84aacd..e39e3e3bd7b 100644 --- a/src/include/storage/shmem.h +++ b/src/include/storage/shmem.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: shmem.h,v 1.16 1999/04/02 04:51:05 tgl Exp $ + * $Id: shmem.h,v 1.17 1999/05/25 16:14:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -71,7 +71,7 @@ extern SHMEM_OFFSET ShmemPIDDestroy(int pid); extern long *ShmemInitStruct(char *name, unsigned long size, bool *foundPtr); extern bool TransactionIdIsInProgress(TransactionId xid); -extern void GetXmaxRecent(TransactionId *XmaxRecent); +extern void GetXmaxRecent(TransactionId *XmaxRecent); typedef int TableID; diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index 522eb5e220b..d92969a85b0 100644 --- a/src/include/storage/sinvaladt.h +++ b/src/include/storage/sinvaladt.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: sinvaladt.h,v 1.12 1999/02/19 06:06:39 tgl Exp $ + * $Id: sinvaladt.h,v 1.13 1999/05/25 16:14:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -70,8 +70,7 @@ typedef struct SISeg Offset endEntryChain; /* (offset relative to B) */ int numEntries; int maxNumEntries; - ProcState procState[MAXBACKENDS]; /* reflects the - * invalidation state */ + ProcState procState[MAXBACKENDS]; /* reflects the invalidation state */ /* here starts the entry section, controlled by offsets */ } SISeg; diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h index 941e913eaae..dd5e447bccb 100644 --- a/src/include/tcop/dest.h +++ b/src/include/tcop/dest.h @@ -33,7 +33,7 @@ * The DestReceiver object returned by DestToFunction may be a statically * allocated object (for destination types that require no local state) * or can be a palloc'd object that has DestReceiver as its first field - * and contains additional fields (see printtup.c for an example). These + * and contains additional fields (see printtup.c for an example). These * additional fields are then accessible to the DestReceiver functions * by casting the DestReceiver* pointer passed to them. * The palloc'd object is pfree'd by the DestReceiver's cleanup function. @@ -44,7 +44,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dest.h,v 1.18 1999/02/13 23:22:11 momjian Exp $ + * $Id: dest.h,v 1.19 1999/05/25 16:14:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -78,22 +78,23 @@ typedef enum */ typedef struct _DestReceiver DestReceiver; -struct _DestReceiver { +struct _DestReceiver +{ /* Called for each tuple to be output: */ - void (*receiveTuple) (HeapTuple tuple, TupleDesc typeinfo, - DestReceiver* self); + void (*receiveTuple) (HeapTuple tuple, TupleDesc typeinfo, + DestReceiver * self); /* Initialization and teardown: */ - void (*setup) (DestReceiver* self, TupleDesc typeinfo); - void (*cleanup) (DestReceiver* self); + void (*setup) (DestReceiver * self, TupleDesc typeinfo); + void (*cleanup) (DestReceiver * self); /* Private fields might appear beyond this point... */ }; /* The primary destination management functions */ extern void BeginCommand(char *pname, int operation, TupleDesc attinfo, - bool isIntoRel, bool isIntoPortal, char *tag, - CommandDest dest); -extern DestReceiver* DestToFunction(CommandDest dest); + bool isIntoRel, bool isIntoPortal, char *tag, + CommandDest dest); +extern DestReceiver *DestToFunction(CommandDest dest); extern void EndCommand(char *commandTag, CommandDest dest); /* Additional functions that go with destination management, more or less. */ diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index 41bcaa43f39..535d974b9aa 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tcopprot.h,v 1.19 1999/05/13 07:29:22 tgl Exp $ + * $Id: tcopprot.h,v 1.20 1999/05/25 16:14:48 momjian Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -22,7 +22,7 @@ #include "executor/execdesc.h" #include "parser/parse_node.h" -/* Autoconf's test for HAVE_SIGSETJMP fails on Linux 2.0.x because the test +/* Autoconf's test for HAVE_SIGSETJMP fails on Linux 2.0.x because the test * explicitly disallows sigsetjmp being a #define, which is how it * is declared in Linux. So, to avoid compiler warnings about * sigsetjmp() being redefined, let's not redefine unless necessary. @@ -36,13 +36,13 @@ #define sigsetjmp(x,y) setjmp(x) #define siglongjmp longjmp #endif -extern DLLIMPORT sigjmp_buf Warn_restart; +extern DLLIMPORT sigjmp_buf Warn_restart; extern bool InError; #ifndef BOOTSTRAP_INCLUDE extern List *pg_parse_and_plan(char *query_string, Oid *typev, int nargs, - List **queryListP, CommandDest dest, - bool aclOverride); + List **queryListP, CommandDest dest, + bool aclOverride); extern void pg_exec_query(char *query_string); extern void pg_exec_query_acl_override(char *query_string); extern void diff --git a/src/include/utils/array.h b/src/include/utils/array.h index f0566ca6f93..e6c8c6c3112 100644 --- a/src/include/utils/array.h +++ b/src/include/utils/array.h @@ -10,7 +10,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: array.h,v 1.17 1999/05/03 23:48:25 tgl Exp $ + * $Id: array.h,v 1.18 1999/05/25 16:14:49 momjian Exp $ * * NOTES * XXX the data array should be LONGALIGN'd -- notice that the array @@ -127,8 +127,8 @@ extern char *array_assgn(ArrayType *array, int n, int *upperIndx, int *lowerIndx, ArrayType *newArr, int reftype, int len, bool *isNull); extern ArrayType *array_map(ArrayType *v, Oid type, - char * (*fn)(), - Oid retType, int nargs, ...); + char *(*fn) (), + Oid retType, int nargs,...); extern int array_eq(ArrayType *array1, ArrayType *array2); extern int _LOtransfer(char **destfd, int size, int nitems, char **srcfd, int isSrcLO, int isDestLO); diff --git a/src/include/utils/bit.h b/src/include/utils/bit.h index 1431a2d2279..ed3355df4e8 100644 --- a/src/include/utils/bit.h +++ b/src/include/utils/bit.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: bit.h,v 1.5 1999/02/13 23:22:15 momjian Exp $ + * $Id: bit.h,v 1.6 1999/05/25 16:14:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,19 +19,19 @@ typedef uint32 BitIndex; #define BitsPerByte 8 /* - * BitArraySetBit + * BitArraySetBit * Sets (to 1) the value of a bit in a bit array. */ extern void BitArraySetBit(BitArray bitArray, BitIndex bitIndex); /* - * BitArrayClearBit + * BitArrayClearBit * Clears (to 0) the value of a bit in a bit array. */ extern void BitArrayClearBit(BitArray bitArray, BitIndex bitIndex); /* - * BitArrayBitIsSet + * BitArrayBitIsSet * True iff the bit is set (1) in a bit array. */ extern bool BitArrayBitIsSet(BitArray bitArray, BitIndex bitIndex); diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 71fb63c77fe..0fe0487b474 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.78 1999/05/03 19:10:31 momjian Exp $ + * $Id: builtins.h,v 1.79 1999/05/25 16:14:52 momjian Exp $ * * NOTES * This should normally only be included by fmgr.h. @@ -63,7 +63,7 @@ extern int8 charmul(int8 arg1, int8 arg2); extern int8 chardiv(int8 arg1, int8 arg2); extern bool cideq(int8 arg1, int8 arg2); extern int8 text_char(text *arg1); -extern text* char_text(int8 arg1); +extern text *char_text(int8 arg1); /* int.c */ extern int32 int2in(char *num); @@ -164,7 +164,7 @@ extern void ltoa(int32 l, char *a); */ extern int32 btint2cmp(int16 a, int16 b); extern int32 btint4cmp(int32 a, int32 b); -extern int32 btint8cmp(int64 *a, int64 *b); +extern int32 btint8cmp(int64 * a, int64 * b); extern int32 btint24cmp(int16 a, int32 b); extern int32 btint42cmp(int32 a, int16 b); extern int32 btfloat4cmp(float32 a, float32 b); @@ -524,50 +524,50 @@ extern text *translate(text *string, char from, char to); /* acl.c */ /* inet_net_ntop.c */ -char *inet_net_ntop(int af, const void *src, int bits, char *dst, size_t size); -char *inet_cidr_ntop(int af, const void *src, int bits, char *dst, size_t size); +char *inet_net_ntop(int af, const void *src, int bits, char *dst, size_t size); +char *inet_cidr_ntop(int af, const void *src, int bits, char *dst, size_t size); /* inet_net_pton.c */ -int inet_net_pton(int af, const char *src, void *dst, size_t size); +int inet_net_pton(int af, const char *src, void *dst, size_t size); /* network.c */ inet *inet_in(char *str); -char *inet_out(inet * addr); +char *inet_out(inet *addr); inet *cidr_in(char *str); char *cidr_out(inet *addr); -bool network_lt(inet * a1, inet * a2); -bool network_le(inet * a1, inet * a2); -bool network_eq(inet * a1, inet * a2); -bool network_ge(inet * a1, inet * a2); -bool network_gt(inet * a1, inet * a2); -bool network_ne(inet * a1, inet * a2); -bool network_sub(inet * a1, inet * a2); -bool network_subeq(inet * a1, inet * a2); -bool network_sup(inet * a1, inet * a2); -bool network_supeq(inet * a1, inet * a2); -int4 network_cmp(inet * a1, inet * a2); - -text *network_network(inet * addr); -text *network_netmask(inet * addr); -int4 network_masklen(inet * addr); -text *network_broadcast(inet * addr); -text *network_host(inet * addr); +bool network_lt(inet *a1, inet *a2); +bool network_le(inet *a1, inet *a2); +bool network_eq(inet *a1, inet *a2); +bool network_ge(inet *a1, inet *a2); +bool network_gt(inet *a1, inet *a2); +bool network_ne(inet *a1, inet *a2); +bool network_sub(inet *a1, inet *a2); +bool network_subeq(inet *a1, inet *a2); +bool network_sup(inet *a1, inet *a2); +bool network_supeq(inet *a1, inet *a2); +int4 network_cmp(inet *a1, inet *a2); + +text *network_network(inet *addr); +text *network_netmask(inet *addr); +int4 network_masklen(inet *addr); +text *network_broadcast(inet *addr); +text *network_host(inet *addr); /* mac.c */ macaddr *macaddr_in(char *str); -char *macaddr_out(macaddr * addr); -bool macaddr_lt(macaddr * a1, macaddr * a2); -bool macaddr_le(macaddr * a1, macaddr * a2); -bool macaddr_eq(macaddr * a1, macaddr * a2); -bool macaddr_ge(macaddr * a1, macaddr * a2); -bool macaddr_gt(macaddr * a1, macaddr * a2); -bool macaddr_ne(macaddr * a1, macaddr * a2); -int4 macaddr_cmp(macaddr * a1, macaddr * a2); -text *macaddr_manuf(macaddr * addr); +char *macaddr_out(macaddr *addr); +bool macaddr_lt(macaddr *a1, macaddr *a2); +bool macaddr_le(macaddr *a1, macaddr *a2); +bool macaddr_eq(macaddr *a1, macaddr *a2); +bool macaddr_ge(macaddr *a1, macaddr *a2); +bool macaddr_gt(macaddr *a1, macaddr *a2); +bool macaddr_ne(macaddr *a1, macaddr *a2); +int4 macaddr_cmp(macaddr *a1, macaddr *a2); +text *macaddr_manuf(macaddr *addr); /* numeric.c */ Numeric numeric_in(char *str, int dummy, int32 typmod); -char *numeric_out(Numeric num); +char *numeric_out(Numeric num); Numeric numeric(Numeric num, int32 typmod); Numeric numeric_abs(Numeric num); Numeric numeric_sign(Numeric num); @@ -604,7 +604,3 @@ float64 numeric_float8(Numeric num); #endif /* BUILTINS_H */ - - - - diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h index 9bd391b5500..d217c8aa87f 100644 --- a/src/include/utils/dt.h +++ b/src/include/utils/dt.h @@ -8,7 +8,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dt.h,v 1.39 1999/04/15 02:24:23 thomas Exp $ + * $Id: dt.h,v 1.40 1999/05/25 16:14:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -268,13 +268,13 @@ extern int datetime_is_epoch(double j); * Include check for leap year. */ -extern int day_tab[2][13]; +extern int day_tab[2][13]; #define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0)) /* Julian date support for date2j() and j2date() * Set the minimum year to one greater than the year of the first valid day - * to avoid having to check year and day both. - tgl 97/05/08 + * to avoid having to check year and day both. - tgl 97/05/08 */ #define JULIAN_MINYEAR (-4713) diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h index 808f5210e1e..34cd7f29f03 100644 --- a/src/include/utils/geo_decls.h +++ b/src/include/utils/geo_decls.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geo_decls.h,v 1.22 1999/03/28 01:56:11 tgl Exp $ + * $Id: geo_decls.h,v 1.23 1999/05/25 16:14:54 momjian Exp $ * * NOTE * These routines do *not* use the float types from adt/. @@ -363,6 +363,6 @@ extern double circle_dt(CIRCLE *circle1, CIRCLE *circle2); extern float64 areasel(Oid opid, Oid relid, AttrNumber attno, char *value, int32 flag); extern float64 areajoinsel(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 4e5676eb887..c717d9bd486 100644 --- a/src/include/utils/hsearch.h +++ b/src/include/utils/hsearch.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hsearch.h,v 1.11 1999/02/22 06:16:46 tgl Exp $ + * $Id: hsearch.h,v 1.12 1999/05/25 16:14:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ * Constants * * A hash table has a top-level "directory", each of whose entries points - * to a "segment" of ssize bucket headers. The maximum number of hash + * to a "segment" of ssize bucket headers. The maximum number of hash * buckets is thus dsize * ssize (but dsize may be expansible). Of course, * the number of records in the table can be larger, but we don't want a * whole lot of records per bucket or performance goes down. @@ -27,11 +27,11 @@ * expanded because it must stay at a fixed address. */ #define DEF_SEGSIZE 256 -#define DEF_SEGSIZE_SHIFT 8 /* log2(SEGSIZE) */ +#define DEF_SEGSIZE_SHIFT 8/* log2(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 PRIME1 37 /* for the hash function */ #define PRIME2 1048583 @@ -64,7 +64,8 @@ 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 */ + long max_dsize; /* 'dsize' limit if directory is fixed + * size */ BUCKET_INDEX freeBucketIndex; /* index of first free bucket */ #ifdef HASH_STATISTICS diff --git a/src/include/utils/inet.h b/src/include/utils/inet.h index 23ac35582cc..252d1dd1053 100644 --- a/src/include/utils/inet.h +++ b/src/include/utils/inet.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: inet.h,v 1.3 1999/02/13 23:22:23 momjian Exp $ + * $Id: inet.h,v 1.4 1999/05/25 16:14:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ typedef struct unsigned char type; union { - unsigned int ipv4_addr; /* network byte order */ + unsigned int ipv4_addr; /* network byte order */ /* add IPV6 address type here */ } addr; } inet_struct; @@ -42,7 +42,7 @@ typedef struct macaddr unsigned char d; unsigned char e; unsigned char f; -} macaddr; +} macaddr; typedef struct manufacturer @@ -51,9 +51,8 @@ typedef struct manufacturer unsigned char b; unsigned char c; char *name; -} manufacturer; +} manufacturer; extern manufacturer manufacturers[]; #endif /* MAC_H */ - diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h index db2e9edb520..6a1f134bbf6 100644 --- a/src/include/utils/int8.h +++ b/src/include/utils/int8.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: int8.h,v 1.12 1999/03/15 01:43:05 tgl Exp $ + * $Id: int8.h,v 1.13 1999/05/25 16:14:55 momjian Exp $ * * NOTES * These data types are supported on all 64-bit architectures, and may @@ -94,13 +94,13 @@ extern int32 int84(int64 * val); #if NOT_USED extern int64 *int28 (int16 val); extern int16 int82(int64 * val); + #endif extern float64 i8tod(int64 * val); extern int64 *dtoi8(float64 val); -extern text *int8_text(int64 *val); +extern text *int8_text(int64 * val); extern int64 *text_int8(text *str); #endif /* INT8_H */ - diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h index cce6ec865b8..ed8ae2e332d 100644 --- a/src/include/utils/mcxt.h +++ b/src/include/utils/mcxt.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: mcxt.h,v 1.14 1999/03/22 16:45:28 momjian Exp $ + * $Id: mcxt.h,v 1.15 1999/05/25 16:14:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ extern MemoryContext TopMemoryContext; /* - * MaxAllocSize + * MaxAllocSize * Arbitrary limit on size of allocations. * * Note: diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index e95aec57c90..59f473b910a 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -15,7 +15,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: memutils.h,v 1.24 1999/05/22 23:19:36 tgl Exp $ + * $Id: memutils.h,v 1.25 1999/05/25 16:14:56 momjian Exp $ * * NOTES * some of the information in this file will be moved to @@ -133,13 +133,13 @@ extern void OrderedElemPushInto(OrderedElem elem, OrderedSet Set); */ /* - * AllocPointer + * AllocPointer * Aligned pointer which may be a member of an allocation set. */ typedef Pointer AllocPointer; /* - * AllocMode + * AllocMode * Mode of allocation for an allocation set. * * Note: @@ -156,56 +156,58 @@ typedef enum AllocMode #define DefaultAllocMode DynamicAllocMode /* - * AllocBlock + * AllocBlock * Small pieces of memory are taken from bigger blocks of * memory with a size aligned to a power of two. These * pieces are not free's separately, instead they are reused * for the next allocation of a fitting size. */ -typedef struct AllocBlockData { - struct AllocSetData *aset; - struct AllocBlockData *next; - char *freeptr; - char *endptr; -} AllocBlockData; +typedef struct AllocBlockData +{ + struct AllocSetData *aset; + struct AllocBlockData *next; + char *freeptr; + char *endptr; +} AllocBlockData; typedef AllocBlockData *AllocBlock; /* - * AllocChunk + * AllocChunk * The prefix of each piece of memory in an AllocBlock */ -typedef struct AllocChunkData { +typedef struct AllocChunkData +{ /* aset is the owning aset if allocated, or the freelist link if free */ - void *aset; + void *aset; /* size is always the chunk size */ - Size size; -} AllocChunkData; + Size size; +} AllocChunkData; typedef AllocChunkData *AllocChunk; /* - * AllocSet + * AllocSet * Allocation set. */ typedef struct AllocSetData { - struct AllocBlockData *blocks; + struct AllocBlockData *blocks; #define ALLOCSET_NUM_FREELISTS 8 - struct AllocChunkData *freelist[ALLOCSET_NUM_FREELISTS]; + struct AllocChunkData *freelist[ALLOCSET_NUM_FREELISTS]; /* Note: this will change in the future to support other modes */ } AllocSetData; typedef AllocSetData *AllocSet; /* - * AllocPointerIsValid + * AllocPointerIsValid * True iff pointer is valid allocation pointer. */ #define AllocPointerIsValid(pointer) PointerIsValid(pointer) /* - * AllocSetIsValid + * AllocSetIsValid * True iff set is valid allocation set. */ #define AllocSetIsValid(set) PointerIsValid(set) @@ -238,7 +240,7 @@ extern void AllocSetDump(AllocSet set); typedef int LibCCopyLength; /* - * MemoryCopy + * MemoryCopy * Copies fixed length block of memory to another. */ #define MemoryCopy(toBuffer, fromBuffer, length)\ diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h index fca6b628770..ace0e135fde 100644 --- a/src/include/utils/nabstime.h +++ b/src/include/utils/nabstime.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nabstime.h,v 1.19 1999/03/14 16:44:02 momjian Exp $ + * $Id: nabstime.h,v 1.20 1999/05/25 16:14:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,7 +25,7 @@ */ /* The original typedefs are bogus - they assume that the system's 'time_t' * type is of size 32-bits. Under AlphaLinux, time_t is a long int, which - * is 64-bits. Therefore, typedef these both as simply 'time_t', and let + * is 64-bits. Therefore, typedef these both as simply 'time_t', and let * the OS define what the size really is. -- RME 3/5/99 */ typedef time_t AbsoluteTime; @@ -96,7 +96,7 @@ typedef TimeIntervalData *TimeInterval; extern AbsoluteTime GetCurrentAbsoluteTime(void); /* - * getSystemTime + * getSystemTime * Returns system time. */ #define getSystemTime() \ diff --git a/src/include/utils/numeric.h b/src/include/utils/numeric.h index 24c85a5659e..888677f71ac 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.4 1999/02/13 23:22:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/utils/numeric.h,v 1.5 1999/05/25 16:14:56 momjian Exp $ * * ---------- */ @@ -24,10 +24,10 @@ #define NUMERIC_DEFAULT_PRECISION 30 #define NUMERIC_DEFAULT_SCALE 6 -#define NUMERIC_MAX_DISPLAY_SCALE NUMERIC_MAX_PRECISION -#define NUMERIC_MIN_DISPLAY_SCALE NUMERIC_DEFAULT_SCALE + 4 +#define NUMERIC_MAX_DISPLAY_SCALE NUMERIC_MAX_PRECISION +#define NUMERIC_MIN_DISPLAY_SCALE NUMERIC_DEFAULT_SCALE + 4 -#define NUMERIC_MAX_RESULT_SCALE (NUMERIC_MAX_PRECISION * 2) +#define NUMERIC_MAX_RESULT_SCALE (NUMERIC_MAX_PRECISION * 2) #define NUMERIC_MIN_RESULT_SCALE (NUMERIC_DEFAULT_PRECISION + 4) #define NUMERIC_UNPACKED_DATASIZE (NUMERIC_MAX_PRECISION * 2 + 4) @@ -38,12 +38,12 @@ * ---------- */ #define NUMERIC_SIGN_MASK 0xC000 -#define NUMERIC_POS 0x0000 +#define NUMERIC_POS 0x0000 #define NUMERIC_NEG 0x4000 #define NUMERIC_NAN 0xC000 #define NUMERIC_SIGN(n) ((n)->n_sign_dscale & NUMERIC_SIGN_MASK) #define NUMERIC_DSCALE(n) ((n)->n_sign_dscale & ~NUMERIC_SIGN_MASK) -#define NUMERIC_IS_NAN(n) (NUMERIC_SIGN(n) != NUMERIC_POS && \ +#define NUMERIC_IS_NAN(n) (NUMERIC_SIGN(n) != NUMERIC_POS && \ NUMERIC_SIGN(n) != NUMERIC_NEG) @@ -51,17 +51,17 @@ * The Numeric data type stored in the database * ---------- */ -typedef struct NumericData { - int32 varlen; /* Variable size */ - int16 n_weight; /* Weight of 1st digit */ - uint16 n_rscale; /* Result scale */ - uint16 n_sign_dscale; /* Sign + display scale */ - unsigned char n_data[1]; /* Digit data */ -} NumericData; +typedef struct NumericData +{ + int32 varlen; /* Variable size */ + int16 n_weight; /* Weight of 1st digit */ + uint16 n_rscale; /* Result scale */ + uint16 n_sign_dscale; /* Sign + display scale */ + unsigned char n_data[1]; /* Digit data */ +} NumericData; typedef NumericData *Numeric; #define NUMERIC_HDRSZ (sizeof(int32) + sizeof(uint16) * 3) -#endif /* _PG_NUMERIC_H_ */ - +#endif /* _PG_NUMERIC_H_ */ diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index 5c9a31a4504..69ad079bb29 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: palloc.h,v 1.8 1999/02/13 23:22:26 momjian Exp $ + * $Id: palloc.h,v 1.9 1999/05/25 16:14:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,23 +17,23 @@ #ifdef PALLOC_IS_MALLOC -# define palloc(s) malloc(s) -# define pfree(p) free(p) -# define repalloc(p,s) realloc((p),(s)) +#define palloc(s) malloc(s) +#define pfree(p) free(p) +#define repalloc(p,s) realloc((p),(s)) -#else /* ! PALLOC_IS_MALLOC */ +#else /* ! PALLOC_IS_MALLOC */ /* ---------- * In the case we use memory contexts, use macro's for palloc() etc. * ---------- */ -# include "utils/mcxt.h" +#include "utils/mcxt.h" -# define palloc(s) ((void *)MemoryContextAlloc(CurrentMemoryContext,(Size)(s))) -# define pfree(p) MemoryContextFree(CurrentMemoryContext,(Pointer)(p)) -# define repalloc(p,s) ((void *)MemoryContextRealloc(CurrentMemoryContext,(Pointer)(p),(Size)(s))) +#define palloc(s) ((void *)MemoryContextAlloc(CurrentMemoryContext,(Size)(s))) +#define pfree(p) MemoryContextFree(CurrentMemoryContext,(Pointer)(p)) +#define repalloc(p,s) ((void *)MemoryContextRealloc(CurrentMemoryContext,(Pointer)(p),(Size)(s))) -#endif /* PALLOC_IS_MALLOC */ +#endif /* PALLOC_IS_MALLOC */ /* like strdup except uses palloc */ extern char *pstrdup(char *pointer); diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 59e82868ff9..9d2677c4548 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: portal.h,v 1.12 1999/02/13 23:22:27 momjian Exp $ + * $Id: portal.h,v 1.13 1999/05/25 16:14:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,7 +53,7 @@ struct PortalD }; /* - * PortalIsValid + * PortalIsValid * True iff portal is valid. */ #define PortalIsValid(p) PointerIsValid(p) diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h index 32661031a5c..b9590cef618 100644 --- a/src/include/utils/psort.h +++ b/src/include/utils/psort.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: psort.h,v 1.18 1999/05/09 00:53:18 tgl Exp $ + * $Id: psort.h,v 1.19 1999/05/25 16:14:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ struct tape { int tp_dummy; /* (D) */ int tp_fib; /* (A) */ - BufFile *tp_file; /* (TAPE) */ + BufFile *tp_file; /* (TAPE) */ struct tape *tp_prev; }; @@ -56,7 +56,7 @@ typedef struct Psortstate struct leftist *Tuples; - BufFile *psort_grab_file; + BufFile *psort_grab_file; long psort_current; /* could be file offset, or array index */ long psort_saved; /* could be file offset, or array index */ bool using_tape_files; diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index 9eba94a9da8..4b2ee9de96f 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rel.h,v 1.22 1999/02/13 23:22:29 momjian Exp $ + * $Id: rel.h,v 1.23 1999/05/25 16:14:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -52,7 +52,7 @@ typedef struct RelationData bool rd_myxactonly; /* uses the local buffer mgr */ bool rd_isnailed; /* rel is nailed in cache */ bool rd_isnoname; /* rel has no name */ - bool rd_nonameunlinked; /* noname rel already unlinked */ + bool rd_nonameunlinked; /* noname rel already unlinked */ Form_pg_am rd_am; /* AM tuple */ Form_pg_class rd_rel; /* RELATION tuple */ Oid rd_id; /* relations's object id */ @@ -77,13 +77,13 @@ typedef Relation *RelationPtr; #define InvalidRelation ((Relation)NULL) /* - * RelationIsValid + * RelationIsValid * True iff relation descriptor is valid. */ #define RelationIsValid(relation) PointerIsValid(relation) /* - * RelationGetSystemPort + * RelationGetSystemPort * Returns system port of a relation. * * Note: @@ -92,14 +92,14 @@ typedef Relation *RelationPtr; #define RelationGetSystemPort(relation) ((relation)->rd_fd) /* - * RelationGetLockInfo + * RelationGetLockInfo * Returns the lock information structure in the reldesc * */ #define RelationGetLockInfo(relation) ((relation)->lockInfo) /* - * RelationHasReferenceCountZero + * RelationHasReferenceCountZero * True iff relation reference count is zero. * * Note: @@ -109,25 +109,25 @@ typedef Relation *RelationPtr; ((bool)((relation)->rd_refcnt == 0)) /* - * RelationSetReferenceCount + * RelationSetReferenceCount * Sets relation reference count. */ #define RelationSetReferenceCount(relation,count) ((relation)->rd_refcnt = count) /* - * RelationIncrementReferenceCount + * RelationIncrementReferenceCount * Increments relation reference count. */ #define RelationIncrementReferenceCount(relation) ((relation)->rd_refcnt += 1); /* - * RelationDecrementReferenceCount + * RelationDecrementReferenceCount * Decrements relation reference count. */ #define RelationDecrementReferenceCount(relation) ((relation)->rd_refcnt -= 1) /* - * RelationGetForm + * RelationGetForm * Returns relation attribute values for a relation. * * Note: @@ -137,7 +137,7 @@ typedef Relation *RelationPtr; /* - * RelationGetRelid + * RelationGetRelid * * returns the object id of the relation * @@ -145,7 +145,7 @@ typedef Relation *RelationPtr; #define RelationGetRelid(relation) ((relation)->rd_id) /* - * RelationGetFile + * RelationGetFile * * Returns the open File decscriptor */ @@ -153,21 +153,21 @@ typedef Relation *RelationPtr; /* - * RelationGetRelationName + * RelationGetRelationName * * Returns a Relation Name */ #define RelationGetRelationName(relation) (&(relation)->rd_rel->relname) /* - * RelationGetRelationName + * RelationGetRelationName * * Returns a the number of attributes. */ #define RelationGetNumberOfAttributes(relation) ((relation)->rd_rel->relnatts) /* - * RelationGetDescr + * RelationGetDescr * Returns tuple descriptor for a relation. * * Note: diff --git a/src/include/utils/temprel.h b/src/include/utils/temprel.h index 2953a943cce..1b832235102 100644 --- a/src/include/utils/temprel.h +++ b/src/include/utils/temprel.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: temprel.h,v 1.2 1999/02/13 23:22:32 momjian Exp $ + * $Id: temprel.h,v 1.3 1999/05/25 16:14:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,10 +16,9 @@ #include "access/htup.h" #include "access/attnum.h" -void create_temp_relation(char *relname, HeapTuple pg_class_tuple); -void remove_all_temp_relations(void); -void remove_temp_relation(Oid relid); -HeapTuple get_temp_rel_by_name(char *user_relname); +void create_temp_relation(char *relname, HeapTuple pg_class_tuple); +void remove_all_temp_relations(void); +void remove_temp_relation(Oid relid); +HeapTuple get_temp_rel_by_name(char *user_relname); #endif /* TEMPREL_H */ - diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index 5fe617b8c0b..1cc67f0ea5b 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tqual.h,v 1.20 1999/02/13 23:22:33 momjian Exp $ + * $Id: tqual.h,v 1.21 1999/05/25 16:14:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,11 +18,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; @@ -30,9 +30,9 @@ typedef SnapshotData *Snapshot; #define SnapshotNow ((Snapshot) 0x0) #define SnapshotSelf ((Snapshot) 0x1) -extern Snapshot SnapshotDirty; -extern Snapshot QuerySnapshot; -extern Snapshot SerializableSnapshot; +extern Snapshot SnapshotDirty; +extern Snapshot QuerySnapshot; +extern Snapshot SerializableSnapshot; #define IsSnapshotNow(snapshot) ((Snapshot) snapshot == SnapshotNow) #define IsSnapshotSelf(snapshot) ((Snapshot) snapshot == SnapshotSelf) @@ -42,7 +42,7 @@ extern TransactionId HeapSpecialTransactionId; extern CommandId HeapSpecialCommandId; /* - * HeapTupleSatisfiesVisibility + * HeapTupleSatisfiesVisibility * True iff heap tuple satsifies a time qual. * * Note: @@ -87,22 +87,22 @@ extern CommandId HeapSpecialCommandId; ) \ ) -#define HeapTupleMayBeUpdated 0 -#define HeapTupleInvisible 1 +#define HeapTupleMayBeUpdated 0 +#define HeapTupleInvisible 1 #define HeapTupleSelfUpdated 2 #define HeapTupleUpdated 3 #define HeapTupleBeingUpdated 4 -extern bool HeapTupleSatisfiesItself(HeapTupleHeader tuple); -extern bool HeapTupleSatisfiesNow(HeapTupleHeader tuple); -extern bool HeapTupleSatisfiesDirty(HeapTupleHeader tuple); -extern bool HeapTupleSatisfiesSnapshot(HeapTupleHeader tuple, Snapshot snapshot); -extern int HeapTupleSatisfiesUpdate(HeapTuple tuple); +extern bool HeapTupleSatisfiesItself(HeapTupleHeader tuple); +extern bool HeapTupleSatisfiesNow(HeapTupleHeader tuple); +extern bool HeapTupleSatisfiesDirty(HeapTupleHeader tuple); +extern bool HeapTupleSatisfiesSnapshot(HeapTupleHeader tuple, Snapshot snapshot); +extern int HeapTupleSatisfiesUpdate(HeapTuple tuple); extern void setheapoverride(bool on); extern Snapshot GetSnapshotData(bool serializable); -extern void SetQuerySnapshot(void); -extern void FreeXactSnapshot(void); +extern void SetQuerySnapshot(void); +extern void FreeXactSnapshot(void); #endif /* TQUAL_H */ diff --git a/src/include/utils/trace.h b/src/include/utils/trace.h index 29bda724862..8dce7013d40 100644 --- a/src/include/utils/trace.h +++ b/src/include/utils/trace.h @@ -27,7 +27,7 @@ char *tprintf_timestamp(void); #define TIMESTAMP_SIZE 0 #endif -extern int tprintf1(const char *fmt, ...); +extern int tprintf1(const char *fmt,...); extern int tprintf(int flag, const char *fmt,...); extern int eprintf(const char *fmt,...); extern int option_flag(int flag); @@ -77,12 +77,12 @@ extern int pg_options[NUM_PG_OPTIONS]; #ifdef __GNUC__ #define PRINTF(args...) tprintf1(args) -#define EPRINTF(args...) eprintf(args) +#define EPRINTF(args...) eprintf(args) #define TPRINTF(flag, args...) tprintf(flag, args) #else #define PRINTF tprintf1 #define EPRINTF eprintf -#define TPRINTF tprintf +#define TPRINTF tprintf #endif #endif /* TRACE_H */ |