diff options
| author | Bruce Momjian <bruce@momjian.us> | 2006-10-04 00:30:14 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2006-10-04 00:30:14 +0000 |
| commit | f99a569a2ee3763b4ae174e81250c95ca0fdcbb6 (patch) | |
| tree | 76e6371fe8b347c73d7020c0bc54b9fba519dc10 /src/include | |
| parent | 451e419e9852cdf9d7e7cefc09d5355abb3405e9 (diff) | |
| download | postgresql-f99a569a2ee3763b4ae174e81250c95ca0fdcbb6.tar.gz postgresql-f99a569a2ee3763b4ae174e81250c95ca0fdcbb6.zip | |
pgindent run for 8.2.
Diffstat (limited to 'src/include')
96 files changed, 797 insertions, 773 deletions
diff --git a/src/include/access/gin.h b/src/include/access/gin.h index 8bdb030c208..7035635e686 100644 --- a/src/include/access/gin.h +++ b/src/include/access/gin.h @@ -1,9 +1,9 @@ /*-------------------------------------------------------------------------- * gin.h - * header file for postgres inverted index access method implementation. + * header file for postgres inverted index access method implementation. * - * Copyright (c) 2006, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/src/include/access/gin.h,v 1.7 2006/09/10 20:14:20 tgl Exp $ + * Copyright (c) 2006, PostgreSQL Global Development Group + * $PostgreSQL: pgsql/src/include/access/gin.h,v 1.8 2006/10/04 00:30:06 momjian Exp $ *-------------------------------------------------------------------------- */ @@ -25,51 +25,53 @@ /* * amproc indexes for inverted indexes. */ -#define GIN_COMPARE_PROC 1 -#define GIN_EXTRACTVALUE_PROC 2 -#define GIN_EXTRACTQUERY_PROC 3 -#define GIN_CONSISTENT_PROC 4 -#define GINNProcs 4 +#define GIN_COMPARE_PROC 1 +#define GIN_EXTRACTVALUE_PROC 2 +#define GIN_EXTRACTQUERY_PROC 3 +#define GIN_CONSISTENT_PROC 4 +#define GINNProcs 4 typedef XLogRecPtr GinNSN; /* * Page opaque data in a inverted index page. */ -typedef struct GinPageOpaqueData { - uint16 flags; - OffsetNumber maxoff; /* number entries on GIN_DATA page: - number of heap ItemPointer on GIN_DATA|GIN_LEAF page - and number of records on GIN_DATA & ~GIN_LEAF page - */ - BlockNumber rightlink; +typedef struct GinPageOpaqueData +{ + uint16 flags; + OffsetNumber maxoff; /* number entries on GIN_DATA page: number of + * heap ItemPointer on GIN_DATA|GIN_LEAF page + * and number of records on GIN_DATA & + * ~GIN_LEAF page */ + BlockNumber rightlink; } GinPageOpaqueData; typedef GinPageOpaqueData *GinPageOpaque; #define GIN_ROOT_BLKNO (0) -typedef struct { - BlockIdData child_blkno; /* use it instead of BlockNumber to - save space on page */ - ItemPointerData key; +typedef struct +{ + BlockIdData child_blkno; /* use it instead of BlockNumber to save space + * on page */ + ItemPointerData key; } PostingItem; -#define PostingItemGetBlockNumber(pointer) \ +#define PostingItemGetBlockNumber(pointer) \ BlockIdGetBlockNumber(&(pointer)->child_blkno) -#define PostingItemSetBlockNumber(pointer, blockNumber) \ +#define PostingItemSetBlockNumber(pointer, blockNumber) \ BlockIdSet(&((pointer)->child_blkno), (blockNumber)) /* * Page opaque data in a inverted index page. */ -#define GIN_DATA (1 << 0) -#define GIN_LEAF (1 << 1) -#define GIN_DELETED (1 << 2) +#define GIN_DATA (1 << 0) +#define GIN_LEAF (1 << 1) +#define GIN_DELETED (1 << 2) /* - * Works on page + * Works on page */ #define GinPageGetOpaque(page) ( (GinPageOpaque) PageGetSpecialPointer(page) ) @@ -103,15 +105,15 @@ typedef struct { #define GinSetNPosting(itup,n) ItemPointerSetOffsetNumber(&(itup)->t_tid,(n)) #define GIN_TREE_POSTING ((OffsetNumber)0xffff) #define GinIsPostingTree(itup) ( GinGetNPosting(itup)==GIN_TREE_POSTING ) -#define GinSetPostingTree(itup, blkno) ( GinSetNPosting((itup),GIN_TREE_POSTING ), ItemPointerSetBlockNumber(&(itup)->t_tid, blkno) ) -#define GinGetPostingTree(itup) GinItemPointerGetBlockNumber(&(itup)->t_tid) +#define GinSetPostingTree(itup, blkno) ( GinSetNPosting((itup),GIN_TREE_POSTING ), ItemPointerSetBlockNumber(&(itup)->t_tid, blkno) ) +#define GinGetPostingTree(itup) GinItemPointerGetBlockNumber(&(itup)->t_tid) -#define GinGetOrigSizePosting(itup) GinItemPointerGetBlockNumber(&(itup)->t_tid) +#define GinGetOrigSizePosting(itup) GinItemPointerGetBlockNumber(&(itup)->t_tid) #define GinSetOrigSizePosting(itup,n) ItemPointerSetBlockNumber(&(itup)->t_tid,(n)) #define GinGetPosting(itup) ( (ItemPointer)(( ((char*)(itup)) + SHORTALIGN(GinGetOrigSizePosting(itup)) )) ) #define GinMaxItemSize \ - ((BLCKSZ - SizeOfPageHeaderData - \ + ((BLCKSZ - SizeOfPageHeaderData - \ MAXALIGN(sizeof(GinPageOpaqueData))) / 3 - sizeof(ItemIdData)) @@ -121,8 +123,8 @@ typedef struct { #define GinDataPageGetData(page) \ (PageGetContents(page)+MAXALIGN(sizeof(ItemPointerData))) #define GinDataPageGetRightBound(page) ((ItemPointer)PageGetContents(page)) -#define GinSizeOfItem(page) ( (GinPageIsLeaf(page)) ? sizeof(ItemPointerData) : sizeof(PostingItem) ) -#define GinDataPageGetItem(page,i) ( GinDataPageGetData(page) + ((i)-1) * GinSizeOfItem(page) ) +#define GinSizeOfItem(page) ( (GinPageIsLeaf(page)) ? sizeof(ItemPointerData) : sizeof(PostingItem) ) +#define GinDataPageGetItem(page,i) ( GinDataPageGetData(page) + ((i)-1) * GinSizeOfItem(page) ) #define GinDataPageGetFreeSpace(page) \ ( BLCKSZ - SizeOfPageHeaderData - MAXALIGN(sizeof(GinPageOpaqueData)) - \ @@ -131,11 +133,12 @@ typedef struct { -#define GIN_UNLOCK BUFFER_LOCK_UNLOCK -#define GIN_SHARE BUFFER_LOCK_SHARE +#define GIN_UNLOCK BUFFER_LOCK_UNLOCK +#define GIN_SHARE BUFFER_LOCK_SHARE #define GIN_EXCLUSIVE BUFFER_LOCK_EXCLUSIVE -typedef struct GinState { +typedef struct GinState +{ FmgrInfo compareFn; FmgrInfo extractValueFn; FmgrInfo extractQueryFn; @@ -150,80 +153,88 @@ typedef struct GinState { #define XLOG_GIN_CREATE_PTREE 0x10 -typedef struct ginxlogCreatePostingTree { - RelFileNode node; - BlockNumber blkno; - uint32 nitem; +typedef struct ginxlogCreatePostingTree +{ + RelFileNode node; + BlockNumber blkno; + uint32 nitem; /* follows list of heap's ItemPointer */ } ginxlogCreatePostingTree; #define XLOG_GIN_INSERT 0x20 -typedef struct ginxlogInsert { - RelFileNode node; - BlockNumber blkno; - BlockNumber updateBlkno; - OffsetNumber offset; - bool isDelete; - bool isData; - bool isLeaf; - OffsetNumber nitem; - - /* follows: tuples or ItemPointerData or PostingItem or list of ItemPointerData*/ +typedef struct ginxlogInsert +{ + RelFileNode node; + BlockNumber blkno; + BlockNumber updateBlkno; + OffsetNumber offset; + bool isDelete; + bool isData; + bool isLeaf; + OffsetNumber nitem; + + /* + * follows: tuples or ItemPointerData or PostingItem or list of + * ItemPointerData + */ } ginxlogInsert; -#define XLOG_GIN_SPLIT 0x30 +#define XLOG_GIN_SPLIT 0x30 -typedef struct ginxlogSplit { - RelFileNode node; - BlockNumber lblkno; - BlockNumber rootBlkno; - BlockNumber rblkno; - BlockNumber rrlink; - OffsetNumber separator; - OffsetNumber nitem; +typedef struct ginxlogSplit +{ + RelFileNode node; + BlockNumber lblkno; + BlockNumber rootBlkno; + BlockNumber rblkno; + BlockNumber rrlink; + OffsetNumber separator; + OffsetNumber nitem; - bool isData; - bool isLeaf; - bool isRootSplit; + bool isData; + bool isLeaf; + bool isRootSplit; - BlockNumber leftChildBlkno; - BlockNumber updateBlkno; + BlockNumber leftChildBlkno; + BlockNumber updateBlkno; - ItemPointerData rightbound; /* used only in posting tree */ + ItemPointerData rightbound; /* used only in posting tree */ /* follows: list of tuple or ItemPointerData or PostingItem */ } ginxlogSplit; -#define XLOG_GIN_VACUUM_PAGE 0x40 +#define XLOG_GIN_VACUUM_PAGE 0x40 -typedef struct ginxlogVacuumPage { - RelFileNode node; - BlockNumber blkno; - OffsetNumber nitem; +typedef struct ginxlogVacuumPage +{ + RelFileNode node; + BlockNumber blkno; + OffsetNumber nitem; /* follows content of page */ } ginxlogVacuumPage; -#define XLOG_GIN_DELETE_PAGE 0x50 +#define XLOG_GIN_DELETE_PAGE 0x50 -typedef struct ginxlogDeletePage { - RelFileNode node; - BlockNumber blkno; - BlockNumber parentBlkno; - OffsetNumber parentOffset; - BlockNumber leftBlkno; - BlockNumber rightLink; +typedef struct ginxlogDeletePage +{ + RelFileNode node; + BlockNumber blkno; + BlockNumber parentBlkno; + OffsetNumber parentOffset; + BlockNumber leftBlkno; + BlockNumber rightLink; } ginxlogDeletePage; /* ginutil.c */ extern Datum ginoptions(PG_FUNCTION_ARGS); -extern void initGinState( GinState *state, Relation index ); +extern void initGinState(GinState *state, Relation index); extern Buffer GinNewBuffer(Relation index); extern void GinInitBuffer(Buffer b, uint32 f); extern void GinInitPage(Page page, uint32 f, Size pageSize); -extern int compareEntries(GinState *ginstate, Datum a, Datum b); -extern Datum* extractEntriesS(GinState *ginstate, Datum value, uint32 *nentries); -extern Datum* extractEntriesSU(GinState *ginstate, Datum value, uint32 *nentries); -extern Page GinPageGetCopyPage( Page page ); +extern int compareEntries(GinState *ginstate, Datum a, Datum b); +extern Datum *extractEntriesS(GinState *ginstate, Datum value, uint32 *nentries); +extern Datum *extractEntriesSU(GinState *ginstate, Datum value, uint32 *nentries); +extern Page GinPageGetCopyPage(Page page); /* gininsert.c */ extern Datum ginbuild(PG_FUNCTION_ARGS); @@ -238,147 +249,157 @@ extern bool gin_safe_restartpoint(void); /* ginbtree.c */ -typedef struct GinBtreeStack { - BlockNumber blkno; - Buffer buffer; - OffsetNumber off; - /* predictNumber contains prediction number of pages on current level */ - uint32 predictNumber; +typedef struct GinBtreeStack +{ + BlockNumber blkno; + Buffer buffer; + OffsetNumber off; + /* predictNumber contains prediction number of pages on current level */ + uint32 predictNumber; struct GinBtreeStack *parent; } GinBtreeStack; typedef struct GinBtreeData *GinBtree; -typedef struct GinBtreeData { +typedef struct GinBtreeData +{ /* search methods */ - BlockNumber (*findChildPage)(GinBtree, GinBtreeStack *); - bool (*isMoveRight)(GinBtree, Page); - bool (*findItem)(GinBtree, GinBtreeStack *); + BlockNumber (*findChildPage) (GinBtree, GinBtreeStack *); + bool (*isMoveRight) (GinBtree, Page); + bool (*findItem) (GinBtree, GinBtreeStack *); /* insert methods */ - OffsetNumber (*findChildPtr)(GinBtree, Page, BlockNumber, OffsetNumber); - BlockNumber (*getLeftMostPage)(GinBtree, Page); - bool (*isEnoughSpace)(GinBtree, Buffer, OffsetNumber); - void (*placeToPage)(GinBtree, Buffer, OffsetNumber, XLogRecData**); - Page (*splitPage)(GinBtree, Buffer, Buffer, OffsetNumber, XLogRecData**); - void (*fillRoot)(GinBtree, Buffer, Buffer, Buffer); + OffsetNumber (*findChildPtr) (GinBtree, Page, BlockNumber, OffsetNumber); + BlockNumber (*getLeftMostPage) (GinBtree, Page); + bool (*isEnoughSpace) (GinBtree, Buffer, OffsetNumber); + void (*placeToPage) (GinBtree, Buffer, OffsetNumber, XLogRecData **); + Page (*splitPage) (GinBtree, Buffer, Buffer, OffsetNumber, XLogRecData **); + void (*fillRoot) (GinBtree, Buffer, Buffer, Buffer); - bool searchMode; + bool searchMode; - Relation index; - GinState *ginstate; - bool fullScan; - bool isBuild; + Relation index; + GinState *ginstate; + bool fullScan; + bool isBuild; - BlockNumber rightblkno; + BlockNumber rightblkno; /* Entry options */ - Datum entryValue; - IndexTuple entry; - bool isDelete; + Datum entryValue; + IndexTuple entry; + bool isDelete; /* Data (posting tree) option */ - ItemPointerData *items; - uint32 nitem; - uint32 curitem; + ItemPointerData *items; + uint32 nitem; + uint32 curitem; - PostingItem pitem; + PostingItem pitem; } GinBtreeData; -extern GinBtreeStack* ginPrepareFindLeafPage(GinBtree btree, BlockNumber blkno); -extern GinBtreeStack* ginFindLeafPage(GinBtree btree, GinBtreeStack *stack ); -extern void freeGinBtreeStack( GinBtreeStack *stack ); +extern GinBtreeStack *ginPrepareFindLeafPage(GinBtree btree, BlockNumber blkno); +extern GinBtreeStack *ginFindLeafPage(GinBtree btree, GinBtreeStack *stack); +extern void freeGinBtreeStack(GinBtreeStack *stack); extern void ginInsertValue(GinBtree btree, GinBtreeStack *stack); -extern void findParents( GinBtree btree, GinBtreeStack *stack, BlockNumber rootBlkno); +extern void findParents(GinBtree btree, GinBtreeStack *stack, BlockNumber rootBlkno); /* ginentrypage.c */ extern IndexTuple GinFormTuple(GinState *ginstate, Datum key, ItemPointerData *ipd, uint32 nipd); extern Datum ginGetHighKey(GinState *ginstate, Page page); -extern void prepareEntryScan( GinBtree btree, Relation index, Datum value, GinState *ginstate); +extern void prepareEntryScan(GinBtree btree, Relation index, Datum value, GinState *ginstate); extern void entryFillRoot(GinBtree btree, Buffer root, Buffer lbuf, Buffer rbuf); extern IndexTuple ginPageGetLinkItup(Buffer buf); /* gindatapage.c */ -extern int compareItemPointers( ItemPointer a, ItemPointer b ); -extern void MergeItemPointers( - ItemPointerData *dst, - ItemPointerData *a, uint32 na, - ItemPointerData *b, uint32 nb - ); - -extern void GinDataPageAddItem( Page page, void *data, OffsetNumber offset ); +extern int compareItemPointers(ItemPointer a, ItemPointer b); +extern void +MergeItemPointers( + ItemPointerData *dst, + ItemPointerData *a, uint32 na, + ItemPointerData *b, uint32 nb +); + +extern void GinDataPageAddItem(Page page, void *data, OffsetNumber offset); extern void PageDeletePostingItem(Page page, OffsetNumber offset); -typedef struct { - GinBtreeData btree; - GinBtreeStack *stack; +typedef struct +{ + GinBtreeData btree; + GinBtreeStack *stack; } GinPostingTreeScan; -extern GinPostingTreeScan* prepareScanPostingTree( Relation index, - BlockNumber rootBlkno, bool searchMode); -extern void insertItemPointer(GinPostingTreeScan *gdi, - ItemPointerData *items, uint32 nitem); -extern Buffer scanBeginPostingTree( GinPostingTreeScan *gdi ); +extern GinPostingTreeScan *prepareScanPostingTree(Relation index, + BlockNumber rootBlkno, bool searchMode); +extern void insertItemPointer(GinPostingTreeScan *gdi, + ItemPointerData *items, uint32 nitem); +extern Buffer scanBeginPostingTree(GinPostingTreeScan *gdi); extern void dataFillRoot(GinBtree btree, Buffer root, Buffer lbuf, Buffer rbuf); -extern void prepareDataScan( GinBtree btree, Relation index); +extern void prepareDataScan(GinBtree btree, Relation index); + /* ginscan.c */ typedef struct GinScanEntryData *GinScanEntry; -typedef struct GinScanEntryData { +typedef struct GinScanEntryData +{ /* link to the equals entry in current scan key */ - GinScanEntry master; + GinScanEntry master; - /* link to values reported to consistentFn, - points to GinScanKey->entryRes[i]*/ - bool *pval; + /* + * link to values reported to consistentFn, points to + * GinScanKey->entryRes[i] + */ + bool *pval; - /* entry, got from extractQueryFn */ - Datum entry; + /* entry, got from extractQueryFn */ + Datum entry; /* current ItemPointer to heap, its offset in buffer and buffer */ - ItemPointerData curItem; - OffsetNumber offset; - Buffer buffer; + ItemPointerData curItem; + OffsetNumber offset; + Buffer buffer; /* in case of Posing list */ - ItemPointerData *list; - uint32 nlist; + ItemPointerData *list; + uint32 nlist; - bool isFinished; - bool reduceResult; - uint32 predictNumberResult; + bool isFinished; + bool reduceResult; + uint32 predictNumberResult; } GinScanEntryData; -typedef struct GinScanKeyData { - /* Number of entries in query (got by extractQueryFn) */ - uint32 nentries; +typedef struct GinScanKeyData +{ + /* Number of entries in query (got by extractQueryFn) */ + uint32 nentries; /* array of ItemPointer result, reported to consistentFn */ - bool *entryRes; + bool *entryRes; - /* array of scans per entry */ - GinScanEntry scanEntry; + /* array of scans per entry */ + GinScanEntry scanEntry; /* for calling consistentFn(GinScanKey->entryRes, strategy, query) */ - StrategyNumber strategy; - Datum query; + StrategyNumber strategy; + Datum query; - ItemPointerData curItem; - bool firstCall; - bool isFinished; + ItemPointerData curItem; + bool firstCall; + bool isFinished; } GinScanKeyData; -typedef GinScanKeyData *GinScanKey; +typedef GinScanKeyData *GinScanKey; -typedef struct GinScanOpaqueData { - MemoryContext tempCtx; - GinState ginstate; +typedef struct GinScanOpaqueData +{ + MemoryContext tempCtx; + GinState ginstate; - GinScanKey keys; - uint32 nkeys; + GinScanKey keys; + uint32 nkeys; - GinScanKey markPos; + GinScanKey markPos; } GinScanOpaqueData; typedef GinScanOpaqueData *GinScanOpaque; @@ -391,12 +412,12 @@ extern Datum ginrestrpos(PG_FUNCTION_ARGS); extern void newScanKey(IndexScanDesc scan); /* ginget.c */ -extern DLLIMPORT int GinFuzzySearchLimit; +extern DLLIMPORT int GinFuzzySearchLimit; -#define ItemPointerSetMax(p) ItemPointerSet( (p), (BlockNumber)0xffffffff, (OffsetNumber)0xffff ) -#define ItemPointerIsMax(p) ( ItemPointerGetBlockNumber(p) == (BlockNumber)0xffffffff && ItemPointerGetOffsetNumber(p) == (OffsetNumber)0xffff ) -#define ItemPointerSetMin(p) ItemPointerSet( (p), (BlockNumber)0, (OffsetNumber)0) -#define ItemPointerIsMin(p) ( ItemPointerGetBlockNumber(p) == (BlockNumber)0 && ItemPointerGetOffsetNumber(p) == (OffsetNumber)0 ) +#define ItemPointerSetMax(p) ItemPointerSet( (p), (BlockNumber)0xffffffff, (OffsetNumber)0xffff ) +#define ItemPointerIsMax(p) ( ItemPointerGetBlockNumber(p) == (BlockNumber)0xffffffff && ItemPointerGetOffsetNumber(p) == (OffsetNumber)0xffff ) +#define ItemPointerSetMin(p) ItemPointerSet( (p), (BlockNumber)0, (OffsetNumber)0) +#define ItemPointerIsMin(p) ( ItemPointerGetBlockNumber(p) == (BlockNumber)0 && ItemPointerGetOffsetNumber(p) == (OffsetNumber)0 ) extern Datum gingetmulti(PG_FUNCTION_ARGS); extern Datum gingettuple(PG_FUNCTION_ARGS); @@ -410,31 +431,33 @@ extern Datum ginarrayextract(PG_FUNCTION_ARGS); extern Datum ginarrayconsistent(PG_FUNCTION_ARGS); /* ginbulk.c */ -typedef struct EntryAccumulator { - Datum value; - uint32 length; - uint32 number; +typedef struct EntryAccumulator +{ + Datum value; + uint32 length; + uint32 number; ItemPointerData *list; bool shouldSort; - struct EntryAccumulator *left; - struct EntryAccumulator *right; + struct EntryAccumulator *left; + struct EntryAccumulator *right; } EntryAccumulator; -typedef struct { - GinState *ginstate; - EntryAccumulator *entries; +typedef struct +{ + GinState *ginstate; + EntryAccumulator *entries; uint32 maxdepth; - EntryAccumulator **stack; - uint32 stackpos; - uint32 allocatedMemory; + EntryAccumulator **stack; + uint32 stackpos; + uint32 allocatedMemory; - uint32 length; - EntryAccumulator *entryallocator; + uint32 length; + EntryAccumulator *entryallocator; } BuildAccumulator; extern void ginInitBA(BuildAccumulator *accum); -extern void ginInsertRecordBA( BuildAccumulator *accum, - ItemPointer heapptr, Datum *entries, uint32 nentry ); -extern ItemPointerData* ginGetEntry(BuildAccumulator *accum, Datum *entry, uint32 *n); +extern void ginInsertRecordBA(BuildAccumulator *accum, + ItemPointer heapptr, Datum *entries, uint32 nentry); +extern ItemPointerData *ginGetEntry(BuildAccumulator *accum, Datum *entry, uint32 *n); #endif diff --git a/src/include/access/gist.h b/src/include/access/gist.h index 1b3c042e955..1502af67ec0 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/gist.h,v 1.55 2006/09/10 00:29:34 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/gist.h,v 1.56 2006/10/04 00:30:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -80,7 +80,7 @@ typedef GISTPageOpaqueData *GISTPageOpaque; * PickSplit should check spl_(r|l)datum_exists. If it is 'true', * that corresponding spl_(r|l)datum already defined and * PickSplit should use that value. PickSplit should always set - * spl_(r|l)datum_exists to false: GiST will check value to + * spl_(r|l)datum_exists to false: GiST will check value to * control supportng this feature by PickSplit... */ typedef struct GIST_SPLITVEC @@ -88,12 +88,12 @@ typedef struct GIST_SPLITVEC OffsetNumber *spl_left; /* array of entries that go left */ int spl_nleft; /* size of this array */ Datum spl_ldatum; /* Union of keys in spl_left */ - bool spl_ldatum_exists; /* true, if spl_ldatum already exists. */ + bool spl_ldatum_exists; /* true, if spl_ldatum already exists. */ OffsetNumber *spl_right; /* array of entries that go right */ int spl_nright; /* size of the array */ Datum spl_rdatum; /* Union of keys in spl_right */ - bool spl_rdatum_exists; /* true, if spl_rdatum already exists. */ + bool spl_rdatum_exists; /* true, if spl_rdatum already exists. */ } GIST_SPLITVEC; /* diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h index de917c8b834..0c17fd42117 100644 --- a/src/include/access/gist_private.h +++ b/src/include/access/gist_private.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/gist_private.h,v 1.23 2006/08/07 16:57:57 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/gist_private.h,v 1.24 2006/10/04 00:30:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -144,7 +144,7 @@ typedef struct SplitedPageLayout gistxlogPage block; IndexTupleData *list; int lenlist; - IndexTuple itup; /* union key for page */ + IndexTuple itup; /* union key for page */ Page page; /* to operate */ Buffer buffer; /* to write after all proceed */ @@ -180,19 +180,22 @@ typedef struct GISTInsertStack struct GISTInsertStack *next; } GISTInsertStack; -typedef struct GistSplitVector { - GIST_SPLITVEC splitVector; /* to/from PickSplit method */ +typedef struct GistSplitVector +{ + GIST_SPLITVEC splitVector; /* to/from PickSplit method */ - Datum spl_lattr[INDEX_MAX_KEYS]; /* Union of subkeys in spl_left */ - bool spl_lisnull[INDEX_MAX_KEYS]; - bool spl_leftvalid; + Datum spl_lattr[INDEX_MAX_KEYS]; /* Union of subkeys in + * spl_left */ + bool spl_lisnull[INDEX_MAX_KEYS]; + bool spl_leftvalid; - Datum spl_rattr[INDEX_MAX_KEYS]; /* Union of subkeys in spl_right */ - bool spl_risnull[INDEX_MAX_KEYS]; - bool spl_rightvalid; + Datum spl_rattr[INDEX_MAX_KEYS]; /* Union of subkeys in + * spl_right */ + bool spl_risnull[INDEX_MAX_KEYS]; + bool spl_rightvalid; - bool *spl_equiv; /* equivalent tuples which can be freely - * distributed between left and right pages */ + bool *spl_equiv; /* equivalent tuples which can be freely + * distributed between left and right pages */ } GistSplitVector; #define XLogRecPtrIsInvalid( r ) ( (r).xlogid == 0 && (r).xrecoff == 0 ) @@ -255,7 +258,7 @@ extern bool gist_safe_restartpoint(void); extern IndexTuple gist_form_invalid_tuple(BlockNumber blkno); extern XLogRecData *formUpdateRdata(RelFileNode node, Buffer buffer, - OffsetNumber *todelete, int ntodelete, + OffsetNumber *todelete, int ntodelete, IndexTuple *itup, int ituplen, ItemPointer key); extern XLogRecData *formSplitRdata(RelFileNode node, @@ -271,7 +274,7 @@ extern Datum gistgetmulti(PG_FUNCTION_ARGS); /* gistutil.c */ #define GiSTPageSize \ - ( BLCKSZ - SizeOfPageHeaderData - MAXALIGN(sizeof(GISTPageOpaqueData)) ) + ( BLCKSZ - SizeOfPageHeaderData - MAXALIGN(sizeof(GISTPageOpaqueData)) ) #define GIST_MIN_FILLFACTOR 10 #define GIST_DEFAULT_FILLFACTOR 90 @@ -287,7 +290,7 @@ extern IndexTuple *gistextractpage(Page page, int *len /* out */ ); extern IndexTuple *gistjoinvector( IndexTuple *itvec, int *len, IndexTuple *additvec, int addlen); -extern IndexTupleData* gistfillitupvec(IndexTuple *vec, int veclen, int *memlen); +extern IndexTupleData *gistfillitupvec(IndexTuple *vec, int veclen, int *memlen); extern IndexTuple gistunion(Relation r, IndexTuple *itvec, int len, GISTSTATE *giststate); @@ -312,27 +315,27 @@ extern void gistdentryinit(GISTSTATE *giststate, int nkey, GISTENTRY *e, bool l, bool isNull); extern float gistpenalty(GISTSTATE *giststate, int attno, - GISTENTRY *key1, bool isNull1, - GISTENTRY *key2, bool isNull2); + GISTENTRY *key1, bool isNull1, + GISTENTRY *key2, bool isNull2); extern bool gistMakeUnionItVec(GISTSTATE *giststate, IndexTuple *itvec, int len, int startkey, - Datum *attr, bool *isnull ); + Datum *attr, bool *isnull); extern bool gistKeyIsEQ(GISTSTATE *giststate, int attno, Datum a, Datum b); extern void gistDeCompressAtt(GISTSTATE *giststate, Relation r, IndexTuple tuple, Page p, - OffsetNumber o, GISTENTRY *attdata, bool *isnull); + OffsetNumber o, GISTENTRY *attdata, bool *isnull); -extern void gistMakeUnionKey( GISTSTATE *giststate, int attno, - GISTENTRY *entry1, bool isnull1, - GISTENTRY *entry2, bool isnull2, - Datum *dst, bool *dstisnull ); +extern void gistMakeUnionKey(GISTSTATE *giststate, int attno, + GISTENTRY *entry1, bool isnull1, + GISTENTRY *entry2, bool isnull2, + Datum *dst, bool *dstisnull); /* gistvacuum.c */ extern Datum gistbulkdelete(PG_FUNCTION_ARGS); extern Datum gistvacuumcleanup(PG_FUNCTION_ARGS); /* gistsplit.c */ -extern void gistSplitByKey(Relation r, Page page, IndexTuple *itup, - int len, GISTSTATE *giststate, - GistSplitVector *v, GistEntryVector *entryvec, - int attno); +extern void gistSplitByKey(Relation r, Page page, IndexTuple *itup, + int len, GISTSTATE *giststate, + GistSplitVector *v, GistEntryVector *entryvec, + int attno); #endif /* GIST_PRIVATE_H */ diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index 772a6588fae..b2dd0f3390d 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/heapam.h,v 1.115 2006/08/18 16:09:10 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/heapam.h,v 1.116 2006/10/04 00:30:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -220,7 +220,7 @@ extern void heap_deformtuple(HeapTuple tuple, TupleDesc tupleDesc, Datum *values, char *nulls); extern void heap_freetuple(HeapTuple htup); extern MinimalTuple heap_form_minimal_tuple(TupleDesc tupleDescriptor, - Datum *values, bool *isnull); + Datum *values, bool *isnull); extern void heap_free_minimal_tuple(MinimalTuple mtup); extern MinimalTuple heap_copy_minimal_tuple(MinimalTuple mtup); extern HeapTuple heap_tuple_from_minimal_tuple(MinimalTuple mtup); diff --git a/src/include/access/hio.h b/src/include/access/hio.h index 8cb8f8925f0..d93c27a26dd 100644 --- a/src/include/access/hio.h +++ b/src/include/access/hio.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/hio.h,v 1.32 2006/07/13 17:47:01 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/hio.h,v 1.33 2006/10/04 00:30:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,6 +21,6 @@ extern void RelationPutHeapTuple(Relation relation, Buffer buffer, HeapTuple tuple); extern Buffer RelationGetBufferForTuple(Relation relation, Size len, - Buffer otherBuffer, bool use_fsm); + Buffer otherBuffer, bool use_fsm); #endif /* HIO_H */ diff --git a/src/include/access/htup.h b/src/include/access/htup.h index caac3229f35..edfce82bc04 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.85 2006/07/13 17:47:01 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.86 2006/10/04 00:30:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -356,7 +356,7 @@ do { \ * MinimalTuple is an alternate representation that is used for transient * tuples inside the executor, in places where transaction status information * is not required, the tuple rowtype is known, and shaving off a few bytes - * is worthwhile because we need to store many tuples. The representation + * is worthwhile because we need to store many tuples. The representation * is chosen so that tuple access routines can work with either full or * minimal tuples via a HeapTupleData pointer structure. The access routines * see no difference, except that they must not access the transaction status @@ -367,7 +367,7 @@ do { \ * and thereby prevent accidental use of the nonexistent fields. * * MinimalTupleData contains a length word, some padding, and fields matching - * HeapTupleHeaderData beginning with t_natts. The padding is chosen so that + * HeapTupleHeaderData beginning with t_natts. The padding is chosen so that * offsetof(t_natts) is the same modulo MAXIMUM_ALIGNOF in both structs. * This makes data alignment rules equivalent in both cases. * @@ -431,7 +431,7 @@ typedef MinimalTupleData *MinimalTuple; * limited contexts where the code knows that case #1 will never apply.) * * * Separately allocated minimal tuple: t_data points MINIMAL_TUPLE_OFFSET - * bytes before the start of a MinimalTuple. As with the previous case, + * bytes before the start of a MinimalTuple. As with the previous case, * this can't be told apart from case #1 by inspection; code setting up * or destroying this representation has to know what it's doing. * diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index 33d295a71b2..3350a057b2f 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/nbtree.h,v 1.104 2006/08/24 01:18:34 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/nbtree.h,v 1.105 2006/10/04 00:30:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,10 +35,10 @@ typedef uint16 BTCycleId; * and status. If the page is deleted, we replace the level with the * next-transaction-ID value indicating when it is safe to reclaim the page. * - * We also store a "vacuum cycle ID". When a page is split while VACUUM is + * We also store a "vacuum cycle ID". When a page is split while VACUUM is * processing the index, a nonzero value associated with the VACUUM run is - * stored into both halves of the split page. (If VACUUM is not running, - * both pages receive zero cycleids.) This allows VACUUM to detect whether + * stored into both halves of the split page. (If VACUUM is not running, + * both pages receive zero cycleids.) This allows VACUUM to detect whether * a page was split since it started, with a small probability of false match * if the page was last split some exact multiple of 65536 VACUUMs ago. * Also, during a split, the BTP_SPLIT_END flag is cleared in the left @@ -71,7 +71,7 @@ typedef BTPageOpaqueData *BTPageOpaque; #define BTP_META (1 << 3) /* meta-page */ #define BTP_HALF_DEAD (1 << 4) /* empty, but still in tree */ #define BTP_SPLIT_END (1 << 5) /* rightmost page of split group */ -#define BTP_HAS_GARBAGE (1 << 6) /* page has LP_DELETEd tuples */ +#define BTP_HAS_GARBAGE (1 << 6) /* page has LP_DELETEd tuples */ /* @@ -140,7 +140,7 @@ typedef struct BTMetaPageData ( (i1).ip_blkid.bi_hi == (i2).ip_blkid.bi_hi && \ (i1).ip_blkid.bi_lo == (i2).ip_blkid.bi_lo && \ (i1).ip_posid == (i2).ip_posid ) -#define BTEntrySame(i1, i2) \ +#define BTEntrySame(i1, i2) \ BTTidSame((i1)->t_tid, (i2)->t_tid) @@ -203,7 +203,7 @@ typedef struct BTMetaPageData #define XLOG_BTREE_SPLIT_R_ROOT 0x60 /* as above, new item on right */ #define XLOG_BTREE_DELETE 0x70 /* delete leaf index tuple */ #define XLOG_BTREE_DELETE_PAGE 0x80 /* delete an entire page */ -#define XLOG_BTREE_DELETE_PAGE_META 0x90 /* same, plus update metapage */ +#define XLOG_BTREE_DELETE_PAGE_META 0x90 /* same, plus update metapage */ #define XLOG_BTREE_NEWROOT 0xA0 /* new root page */ /* @@ -368,17 +368,17 @@ typedef BTStackData *BTStack; * BTScanOpaqueData is the btree-private state needed for an indexscan. * This consists of preprocessed scan keys (see _bt_preprocess_keys() for * details of the preprocessing), information about the current location - * of the scan, and information about the marked location, if any. (We use + * of the scan, and information about the marked location, if any. (We use * BTScanPosData to represent the data needed for each of current and marked - * locations.) In addition we can remember some known-killed index entries + * locations.) In addition we can remember some known-killed index entries * that must be marked before we can move off the current page. * * Index scans work a page at a time: we pin and read-lock the page, identify * all the matching items on the page and save them in BTScanPosData, then * release the read-lock while returning the items to the caller for - * processing. This approach minimizes lock/unlock traffic. Note that we + * processing. This approach minimizes lock/unlock traffic. Note that we * keep the pin on the index page until the caller is done with all the items - * (this is needed for VACUUM synchronization, see nbtree/README). When we + * (this is needed for VACUUM synchronization, see nbtree/README). When we * are ready to step to the next page, if the caller has told us any of the * items were killed, we re-lock the page to mark them killed, then unlock. * Finally we drop the pin and step to the next page in the appropriate @@ -420,7 +420,7 @@ typedef struct BTScanPosData int lastItem; /* last valid index in items[] */ int itemIndex; /* current index in items[] */ - BTScanPosItem items[MaxIndexTuplesPerPage]; /* MUST BE LAST */ + BTScanPosItem items[MaxIndexTuplesPerPage]; /* MUST BE LAST */ } BTScanPosData; typedef BTScanPosData *BTScanPos; @@ -439,11 +439,11 @@ typedef struct BTScanOpaqueData int numKilled; /* number of currently stored items */ /* - * If the marked position is on the same page as current position, - * we don't use markPos, but just keep the marked itemIndex in - * markItemIndex (all the rest of currPos is valid for the mark position). - * Hence, to determine if there is a mark, first look at markItemIndex, - * then at markPos. + * If the marked position is on the same page as current position, we + * don't use markPos, but just keep the marked itemIndex in markItemIndex + * (all the rest of currPos is valid for the mark position). Hence, to + * determine if there is a mark, first look at markItemIndex, then at + * markPos. */ int markItemIndex; /* itemIndex, or -1 if not valid */ @@ -457,8 +457,8 @@ typedef BTScanOpaqueData *BTScanOpaque; /* * We use these private sk_flags bits in preprocessed scan keys */ -#define SK_BT_REQFWD 0x00010000 /* required to continue forward scan */ -#define SK_BT_REQBKWD 0x00020000 /* required to continue backward scan */ +#define SK_BT_REQFWD 0x00010000 /* required to continue forward scan */ +#define SK_BT_REQBKWD 0x00020000 /* required to continue backward scan */ /* @@ -528,8 +528,8 @@ extern void _bt_freeskey(ScanKey skey); extern void _bt_freestack(BTStack stack); extern void _bt_preprocess_keys(IndexScanDesc scan); extern bool _bt_checkkeys(IndexScanDesc scan, - Page page, OffsetNumber offnum, - ScanDirection dir, bool *continuescan); + Page page, OffsetNumber offnum, + ScanDirection dir, bool *continuescan); extern void _bt_killitems(IndexScanDesc scan, bool haveLock); extern BTCycleId _bt_vacuum_cycleid(Relation rel); extern BTCycleId _bt_start_vacuum(Relation rel); diff --git a/src/include/access/reloptions.h b/src/include/access/reloptions.h index 82474f4707a..26640697677 100644 --- a/src/include/access/reloptions.h +++ b/src/include/access/reloptions.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/reloptions.h,v 1.1 2006/07/03 22:45:40 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/reloptions.h,v 1.2 2006/10/04 00:30:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,18 +21,18 @@ #include "nodes/pg_list.h" extern Datum transformRelOptions(Datum oldOptions, List *defList, - bool ignoreOids, bool isReset); + bool ignoreOids, bool isReset); extern void parseRelOptions(Datum options, int numkeywords, - const char * const *keywords, - char **values, bool validate); + const char *const * keywords, + char **values, bool validate); extern bytea *default_reloptions(Datum reloptions, bool validate, - int minFillfactor, int defaultFillfactor); + int minFillfactor, int defaultFillfactor); extern bytea *heap_reloptions(char relkind, Datum reloptions, bool validate); extern bytea *index_reloptions(RegProcedure amoptions, Datum reloptions, - bool validate); + bool validate); #endif /* RELOPTIONS_H */ diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index d32ab6d524e..45ac9b82650 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/relscan.h,v 1.49 2006/07/31 20:09:05 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/relscan.h,v 1.50 2006/10/04 00:30:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,12 +27,12 @@ typedef struct HeapScanDescData int rs_nkeys; /* number of scan keys */ ScanKey rs_key; /* array of scan key descriptors */ BlockNumber rs_nblocks; /* number of blocks to scan */ - bool rs_pageatatime; /* verify visibility page-at-a-time? */ + bool rs_pageatatime; /* verify visibility page-at-a-time? */ /* scan current state */ bool rs_inited; /* false = scan not init'd yet */ HeapTupleData rs_ctup; /* current tuple in scan, if any */ - BlockNumber rs_cblock; /* current block # in scan, if any */ + BlockNumber rs_cblock; /* current block # in scan, if any */ Buffer rs_cbuf; /* current buffer in scan, if any */ /* NB: if rs_cbuf is not InvalidBuffer, we hold a pin on that buffer */ ItemPointerData rs_mctid; /* marked scan position, if any */ diff --git a/src/include/access/skey.h b/src/include/access/skey.h index 7a846723df0..d81b6fd9a90 100644 --- a/src/include/access/skey.h +++ b/src/include/access/skey.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/skey.h,v 1.32 2006/03/05 15:58:53 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/skey.h,v 1.33 2006/10/04 00:30:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -89,7 +89,7 @@ typedef ScanKeyData *ScanKey; * must be sorted according to the leading column number. * * The subsidiary ScanKey array appears in logical column order of the row - * comparison, which may be different from index column order. The array + * comparison, which may be different from index column order. The array * elements are like a normal ScanKey array except that: * sk_flags must include SK_ROW_MEMBER, plus SK_ROW_END in the last * element (needed since row header does not include a count) diff --git a/src/include/access/slru.h b/src/include/access/slru.h index 7836224db40..48576c2b41b 100644 --- a/src/include/access/slru.h +++ b/src/include/access/slru.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/slru.h,v 1.18 2006/03/05 15:58:53 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/slru.h,v 1.19 2006/10/04 00:30:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -111,8 +111,8 @@ extern void SimpleLruInit(SlruCtl ctl, const char *name, int nslots, LWLockId ctllock, const char *subdir); extern int SimpleLruZeroPage(SlruCtl ctl, int pageno); extern int SimpleLruReadPage(SlruCtl ctl, int pageno, TransactionId xid); -extern int SimpleLruReadPage_ReadOnly(SlruCtl ctl, int pageno, - TransactionId xid); +extern int SimpleLruReadPage_ReadOnly(SlruCtl ctl, int pageno, + TransactionId xid); extern void SimpleLruWritePage(SlruCtl ctl, int slotno, SlruFlush fdata); extern void SimpleLruFlush(SlruCtl ctl, bool checkpoint); extern void SimpleLruTruncate(SlruCtl ctl, int cutoffPage); diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index 035a0a85e52..cb1c375cff1 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/tupdesc.h,v 1.50 2006/06/16 18:42:23 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/tupdesc.h,v 1.51 2006/10/04 00:30:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -104,7 +104,7 @@ extern void DecrTupleDescRefCount(TupleDesc tupdesc); if ((tupdesc)->tdrefcount >= 0) \ DecrTupleDescRefCount(tupdesc); \ } while (0) - + extern bool equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2); extern void TupleDescInitEntry(TupleDesc desc, diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h index 773e85fbcdb..83feb38ad70 100644 --- a/src/include/access/xlog_internal.h +++ b/src/include/access/xlog_internal.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xlog_internal.h,v 1.16 2006/08/17 23:04:08 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/xlog_internal.h,v 1.17 2006/10/04 00:30:07 momjian Exp $ */ #ifndef XLOG_INTERNAL_H #define XLOG_INTERNAL_H @@ -239,7 +239,7 @@ typedef struct RmgrData extern const RmgrData RmgrTable[]; -/* +/* * Exported to support xlog switching from bgwriter */ extern time_t GetLastSegSwitchTime(void); diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index 6713b6df678..8e3378d9a0b 100644 --- a/src/include/bootstrap/bootstrap.h +++ b/src/include/bootstrap/bootstrap.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/bootstrap/bootstrap.h,v 1.43 2006/08/15 22:36:17 tgl Exp $ + * $PostgreSQL: pgsql/src/include/bootstrap/bootstrap.h,v 1.44 2006/10/04 00:30:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,13 +51,13 @@ extern int EnterString(char *str); extern void build_indices(void); extern void boot_get_type_io_data(Oid typid, - int16 *typlen, - bool *typbyval, - char *typalign, - char *typdelim, - Oid *typioparam, - Oid *typinput, - Oid *typoutput); + int16 *typlen, + bool *typbyval, + char *typalign, + char *typdelim, + Oid *typioparam, + Oid *typinput, + Oid *typoutput); extern int boot_yyparse(void); diff --git a/src/include/c.h b/src/include/c.h index db9983b4624..a7281dab829 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/c.h,v 1.213 2006/10/03 20:33:20 tgl Exp $ + * $PostgreSQL: pgsql/src/include/c.h,v 1.214 2006/10/04 00:30:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -52,7 +52,8 @@ #include "pg_config.h" #include "pg_config_manual.h" /* must be after pg_config.h */ -#if !defined(WIN32) && !defined(__CYGWIN__) /* win32 will include further down */ +#if !defined(WIN32) && !defined(__CYGWIN__) /* win32 will include further + * down */ #include "pg_config_os.h" /* must be before any system header files */ #endif #include "postgres_ext.h" @@ -470,7 +471,7 @@ typedef NameData *Name; /* * Support macros for escaping strings. escape_backslash should be TRUE - * if generating a non-standard-conforming string. Prefixing a string + * if generating a non-standard-conforming string. Prefixing a string * with ESCAPE_STRING_SYNTAX guarantees it is non-standard-conforming. * Beware of multiple evaluation of the "ch" argument! */ diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h index 243648b4aae..5e154aecc35 100644 --- a/src/include/catalog/pg_aggregate.h +++ b/src/include/catalog/pg_aggregate.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_aggregate.h,v 1.57 2006/07/28 18:33:04 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_aggregate.h,v 1.58 2006/10/04 00:30:07 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -145,9 +145,9 @@ DATA(insert ( 2147 int8inc_any - 0 20 "0" )); DATA(insert ( 2803 int8inc - 0 20 "0" )); /* var_pop */ -DATA(insert ( 2718 int8_accum numeric_var_pop 0 1231 "{0,0,0}" )); -DATA(insert ( 2719 int4_accum numeric_var_pop 0 1231 "{0,0,0}" )); -DATA(insert ( 2720 int2_accum numeric_var_pop 0 1231 "{0,0,0}" )); +DATA(insert ( 2718 int8_accum numeric_var_pop 0 1231 "{0,0,0}" )); +DATA(insert ( 2719 int4_accum numeric_var_pop 0 1231 "{0,0,0}" )); +DATA(insert ( 2720 int2_accum numeric_var_pop 0 1231 "{0,0,0}" )); DATA(insert ( 2721 float4_accum float8_var_pop 0 1022 "{0,0,0}" )); DATA(insert ( 2722 float8_accum float8_var_pop 0 1022 "{0,0,0}" )); DATA(insert ( 2723 numeric_accum numeric_var_pop 0 1231 "{0,0,0}" )); @@ -182,7 +182,7 @@ DATA(insert ( 2713 int4_accum numeric_stddev_samp 0 1231 "{0,0,0}" )); DATA(insert ( 2714 int2_accum numeric_stddev_samp 0 1231 "{0,0,0}" )); DATA(insert ( 2715 float4_accum float8_stddev_samp 0 1022 "{0,0,0}" )); DATA(insert ( 2716 float8_accum float8_stddev_samp 0 1022 "{0,0,0}" )); -DATA(insert ( 2717 numeric_accum numeric_stddev_samp 0 1231 "{0,0,0}" )); +DATA(insert ( 2717 numeric_accum numeric_stddev_samp 0 1231 "{0,0,0}" )); /* stddev: historical Postgres syntax for stddev_samp */ DATA(insert ( 2154 int8_accum numeric_stddev_samp 0 1231 "{0,0,0}" )); @@ -190,7 +190,7 @@ DATA(insert ( 2155 int4_accum numeric_stddev_samp 0 1231 "{0,0,0}" )); DATA(insert ( 2156 int2_accum numeric_stddev_samp 0 1231 "{0,0,0}" )); DATA(insert ( 2157 float4_accum float8_stddev_samp 0 1022 "{0,0,0}" )); DATA(insert ( 2158 float8_accum float8_stddev_samp 0 1022 "{0,0,0}" )); -DATA(insert ( 2159 numeric_accum numeric_stddev_samp 0 1231 "{0,0,0}" )); +DATA(insert ( 2159 numeric_accum numeric_stddev_samp 0 1231 "{0,0,0}" )); /* SQL2003 binary regression aggregates */ DATA(insert ( 2818 int8inc_float8_float8 - 0 20 "0" )); diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h index b0da3c03820..1203434727f 100644 --- a/src/include/catalog/pg_amop.h +++ b/src/include/catalog/pg_amop.h @@ -23,7 +23,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_amop.h,v 1.74 2006/09/10 00:29:34 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_amop.h,v 1.75 2006/10/04 00:30:07 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -671,225 +671,225 @@ DATA(insert ( 2746 0 4 t 1070 )); /* * gin _abstime_ops */ -DATA(insert ( 2753 0 1 f 2750 )); -DATA(insert ( 2753 0 2 f 2751 )); -DATA(insert ( 2753 0 3 t 2752 )); +DATA(insert ( 2753 0 1 f 2750 )); +DATA(insert ( 2753 0 2 f 2751 )); +DATA(insert ( 2753 0 3 t 2752 )); DATA(insert ( 2753 0 4 t 1070 )); /* * gin _bit_ops */ -DATA(insert ( 2754 0 1 f 2750 )); -DATA(insert ( 2754 0 2 f 2751 )); -DATA(insert ( 2754 0 3 t 2752 )); +DATA(insert ( 2754 0 1 f 2750 )); +DATA(insert ( 2754 0 2 f 2751 )); +DATA(insert ( 2754 0 3 t 2752 )); DATA(insert ( 2754 0 4 t 1070 )); /* * gin _bool_ops */ -DATA(insert ( 2755 0 1 f 2750 )); -DATA(insert ( 2755 0 2 f 2751 )); -DATA(insert ( 2755 0 3 t 2752 )); +DATA(insert ( 2755 0 1 f 2750 )); +DATA(insert ( 2755 0 2 f 2751 )); +DATA(insert ( 2755 0 3 t 2752 )); DATA(insert ( 2755 0 4 t 1070 )); /* * gin _bpchar_ops */ -DATA(insert ( 2756 0 1 f 2750 )); -DATA(insert ( 2756 0 2 f 2751 )); -DATA(insert ( 2756 0 3 t 2752 )); +DATA(insert ( 2756 0 1 f 2750 )); +DATA(insert ( 2756 0 2 f 2751 )); +DATA(insert ( 2756 0 3 t 2752 )); DATA(insert ( 2756 0 4 t 1070 )); /* * gin _bytea_ops */ -DATA(insert ( 2757 0 1 f 2750 )); -DATA(insert ( 2757 0 2 f 2751 )); -DATA(insert ( 2757 0 3 t 2752 )); +DATA(insert ( 2757 0 1 f 2750 )); +DATA(insert ( 2757 0 2 f 2751 )); +DATA(insert ( 2757 0 3 t 2752 )); DATA(insert ( 2757 0 4 t 1070 )); /* * gin _char_ops */ -DATA(insert ( 2758 0 1 f 2750 )); -DATA(insert ( 2758 0 2 f 2751 )); -DATA(insert ( 2758 0 3 t 2752 )); +DATA(insert ( 2758 0 1 f 2750 )); +DATA(insert ( 2758 0 2 f 2751 )); +DATA(insert ( 2758 0 3 t 2752 )); DATA(insert ( 2758 0 4 t 1070 )); /* * gin _cidr_ops */ -DATA(insert ( 2759 0 1 f 2750 )); -DATA(insert ( 2759 0 2 f 2751 )); -DATA(insert ( 2759 0 3 t 2752 )); +DATA(insert ( 2759 0 1 f 2750 )); +DATA(insert ( 2759 0 2 f 2751 )); +DATA(insert ( 2759 0 3 t 2752 )); DATA(insert ( 2759 0 4 t 1070 )); /* * gin _date_ops */ -DATA(insert ( 2760 0 1 f 2750 )); -DATA(insert ( 2760 0 2 f 2751 )); -DATA(insert ( 2760 0 3 t 2752 )); +DATA(insert ( 2760 0 1 f 2750 )); +DATA(insert ( 2760 0 2 f 2751 )); +DATA(insert ( 2760 0 3 t 2752 )); DATA(insert ( 2760 0 4 t 1070 )); /* * gin _float4_ops */ -DATA(insert ( 2761 0 1 f 2750 )); -DATA(insert ( 2761 0 2 f 2751 )); -DATA(insert ( 2761 0 3 t 2752 )); +DATA(insert ( 2761 0 1 f 2750 )); +DATA(insert ( 2761 0 2 f 2751 )); +DATA(insert ( 2761 0 3 t 2752 )); DATA(insert ( 2761 0 4 t 1070 )); /* * gin _float8_ops */ -DATA(insert ( 2762 0 1 f 2750 )); -DATA(insert ( 2762 0 2 f 2751 )); -DATA(insert ( 2762 0 3 t 2752 )); +DATA(insert ( 2762 0 1 f 2750 )); +DATA(insert ( 2762 0 2 f 2751 )); +DATA(insert ( 2762 0 3 t 2752 )); DATA(insert ( 2762 0 4 t 1070 )); /* * gin _inet_ops */ -DATA(insert ( 2763 0 1 f 2750 )); -DATA(insert ( 2763 0 2 f 2751 )); -DATA(insert ( 2763 0 3 t 2752 )); +DATA(insert ( 2763 0 1 f 2750 )); +DATA(insert ( 2763 0 2 f 2751 )); +DATA(insert ( 2763 0 3 t 2752 )); DATA(insert ( 2763 0 4 t 1070 )); /* * gin _int2_ops */ -DATA(insert ( 2764 0 1 f 2750 )); -DATA(insert ( 2764 0 2 f 2751 )); -DATA(insert ( 2764 0 3 t 2752 )); +DATA(insert ( 2764 0 1 f 2750 )); +DATA(insert ( 2764 0 2 f 2751 )); +DATA(insert ( 2764 0 3 t 2752 )); DATA(insert ( 2764 0 4 t 1070 )); /* * gin _int8_ops */ -DATA(insert ( 2765 0 1 f 2750 )); -DATA(insert ( 2765 0 2 f 2751 )); -DATA(insert ( 2765 0 3 t 2752 )); +DATA(insert ( 2765 0 1 f 2750 )); +DATA(insert ( 2765 0 2 f 2751 )); +DATA(insert ( 2765 0 3 t 2752 )); DATA(insert ( 2765 0 4 t 1070 )); /* * gin _interval_ops */ -DATA(insert ( 2766 0 1 f 2750 )); -DATA(insert ( 2766 0 2 f 2751 )); -DATA(insert ( 2766 0 3 t 2752 )); +DATA(insert ( 2766 0 1 f 2750 )); +DATA(insert ( 2766 0 2 f 2751 )); +DATA(insert ( 2766 0 3 t 2752 )); DATA(insert ( 2766 0 4 t 1070 )); /* * gin _macaddr_ops */ -DATA(insert ( 2767 0 1 f 2750 )); -DATA(insert ( 2767 0 2 f 2751 )); -DATA(insert ( 2767 0 3 t 2752 )); +DATA(insert ( 2767 0 1 f 2750 )); +DATA(insert ( 2767 0 2 f 2751 )); +DATA(insert ( 2767 0 3 t 2752 )); DATA(insert ( 2767 0 4 t 1070 )); /* * gin _name_ops */ -DATA(insert ( 2768 0 1 f 2750 )); -DATA(insert ( 2768 0 2 f 2751 )); -DATA(insert ( 2768 0 3 t 2752 )); +DATA(insert ( 2768 0 1 f 2750 )); +DATA(insert ( 2768 0 2 f 2751 )); +DATA(insert ( 2768 0 3 t 2752 )); DATA(insert ( 2768 0 4 t 1070 )); /* * gin _numeric_ops */ -DATA(insert ( 2769 0 1 f 2750 )); -DATA(insert ( 2769 0 2 f 2751 )); -DATA(insert ( 2769 0 3 t 2752 )); +DATA(insert ( 2769 0 1 f 2750 )); +DATA(insert ( 2769 0 2 f 2751 )); +DATA(insert ( 2769 0 3 t 2752 )); DATA(insert ( 2769 0 4 t 1070 )); /* * gin _oid_ops */ -DATA(insert ( 2770 0 1 f 2750 )); -DATA(insert ( 2770 0 2 f 2751 )); -DATA(insert ( 2770 0 3 t 2752 )); +DATA(insert ( 2770 0 1 f 2750 )); +DATA(insert ( 2770 0 2 f 2751 )); +DATA(insert ( 2770 0 3 t 2752 )); DATA(insert ( 2770 0 4 t 1070 )); /* * gin _oidvector_ops */ -DATA(insert ( 2771 0 1 f 2750 )); -DATA(insert ( 2771 0 2 f 2751 )); -DATA(insert ( 2771 0 3 t 2752 )); +DATA(insert ( 2771 0 1 f 2750 )); +DATA(insert ( 2771 0 2 f 2751 )); +DATA(insert ( 2771 0 3 t 2752 )); DATA(insert ( 2771 0 4 t 1070 )); /* * gin _time_ops */ -DATA(insert ( 2772 0 1 f 2750 )); -DATA(insert ( 2772 0 2 f 2751 )); -DATA(insert ( 2772 0 3 t 2752 )); +DATA(insert ( 2772 0 1 f 2750 )); +DATA(insert ( 2772 0 2 f 2751 )); +DATA(insert ( 2772 0 3 t 2752 )); DATA(insert ( 2772 0 4 t 1070 )); /* * gin _timestamptz_ops */ -DATA(insert ( 2773 0 1 f 2750 )); -DATA(insert ( 2773 0 2 f 2751 )); -DATA(insert ( 2773 0 3 t 2752 )); +DATA(insert ( 2773 0 1 f 2750 )); +DATA(insert ( 2773 0 2 f 2751 )); +DATA(insert ( 2773 0 3 t 2752 )); DATA(insert ( 2773 0 4 t 1070 )); /* * gin _timetz_ops */ -DATA(insert ( 2774 0 1 f 2750 )); -DATA(insert ( 2774 0 2 f 2751 )); -DATA(insert ( 2774 0 3 t 2752 )); +DATA(insert ( 2774 0 1 f 2750 )); +DATA(insert ( 2774 0 2 f 2751 )); +DATA(insert ( 2774 0 3 t 2752 )); DATA(insert ( 2774 0 4 t 1070 )); /* * gin _varbit_ops */ -DATA(insert ( 2775 0 1 f 2750 )); -DATA(insert ( 2775 0 2 f 2751 )); -DATA(insert ( 2775 0 3 t 2752 )); +DATA(insert ( 2775 0 1 f 2750 )); +DATA(insert ( 2775 0 2 f 2751 )); +DATA(insert ( 2775 0 3 t 2752 )); DATA(insert ( 2775 0 4 t 1070 )); /* * gin _varchar_ops */ -DATA(insert ( 2776 0 1 f 2750 )); -DATA(insert ( 2776 0 2 f 2751 )); -DATA(insert ( 2776 0 3 t 2752 )); +DATA(insert ( 2776 0 1 f 2750 )); +DATA(insert ( 2776 0 2 f 2751 )); +DATA(insert ( 2776 0 3 t 2752 )); DATA(insert ( 2776 0 4 t 1070 )); /* * gin _timestamp_ops */ -DATA(insert ( 2777 0 1 f 2750 )); -DATA(insert ( 2777 0 2 f 2751 )); -DATA(insert ( 2777 0 3 t 2752 )); +DATA(insert ( 2777 0 1 f 2750 )); +DATA(insert ( 2777 0 2 f 2751 )); +DATA(insert ( 2777 0 3 t 2752 )); DATA(insert ( 2777 0 4 t 1070 )); /* * gin _money_ops */ -DATA(insert ( 2778 0 1 f 2750 )); -DATA(insert ( 2778 0 2 f 2751 )); -DATA(insert ( 2778 0 3 t 2752 )); +DATA(insert ( 2778 0 1 f 2750 )); +DATA(insert ( 2778 0 2 f 2751 )); +DATA(insert ( 2778 0 3 t 2752 )); DATA(insert ( 2778 0 4 t 1070 )); /* * gin _reltime_ops */ -DATA(insert ( 2779 0 1 f 2750 )); -DATA(insert ( 2779 0 2 f 2751 )); -DATA(insert ( 2779 0 3 t 2752 )); +DATA(insert ( 2779 0 1 f 2750 )); +DATA(insert ( 2779 0 2 f 2751 )); +DATA(insert ( 2779 0 3 t 2752 )); DATA(insert ( 2779 0 4 t 1070 )); /* * gin _tinterval_ops */ -DATA(insert ( 2780 0 1 f 2750 )); -DATA(insert ( 2780 0 2 f 2751 )); -DATA(insert ( 2780 0 3 t 2752 )); +DATA(insert ( 2780 0 1 f 2750 )); +DATA(insert ( 2780 0 2 f 2751 )); +DATA(insert ( 2780 0 3 t 2752 )); DATA(insert ( 2780 0 4 t 1070 )); #endif /* PG_AMOP_H */ diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h index 17884fa4194..291931b707b 100644 --- a/src/include/catalog/pg_amproc.h +++ b/src/include/catalog/pg_amproc.h @@ -19,7 +19,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_amproc.h,v 1.59 2006/07/21 20:51:33 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_amproc.h,v 1.60 2006/10/04 00:30:07 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -124,7 +124,7 @@ DATA(insert ( 2098 0 1 2187 )); DATA(insert ( 2099 0 1 377 )); DATA(insert ( 2233 0 1 380 )); DATA(insert ( 2234 0 1 381 )); -DATA(insert ( 2789 0 1 2794 )); +DATA(insert ( 2789 0 1 2794 )); /* hash */ diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index 68d7eae7ab5..b96a5b83404 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_attribute.h,v 1.124 2006/08/25 04:06:55 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_attribute.h,v 1.125 2006/10/04 00:30:07 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -404,7 +404,7 @@ DATA(insert ( 1249 tableoid 26 0 4 -7 0 -1 -1 t p i t f f t 0)); { 1259, {"relhaspkey"}, 16, -1, 1, 22, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ { 1259, {"relhasrules"}, 16, -1, 1, 23, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ { 1259, {"relhassubclass"},16, -1, 1, 24, 0, -1, -1, true, 'p', 'c', true, false, false, true, 0 }, \ -{ 1259, {"relminxid"}, 28, -1, 4, 25, 0, -1, -1, true, 'p', 'i', true, false, false, true, 0 }, \ +{ 1259, {"relminxid"}, 28, -1, 4, 25, 0, -1, -1, true, 'p', 'i', true, false, false, true, 0 }, \ { 1259, {"relvacuumxid"}, 28, -1, 4, 26, 0, -1, -1, true, 'p', 'i', true, false, false, true, 0 }, \ { 1259, {"relacl"}, 1034, -1, -1, 27, 1, -1, -1, false, 'x', 'i', false, false, false, true, 0 }, \ { 1259, {"reloptions"}, 1009, -1, -1, 28, 1, -1, -1, false, 'x', 'i', false, false, false, true, 0 } diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h index 931875a4c50..aa0c02ca1d9 100644 --- a/src/include/catalog/pg_class.h +++ b/src/include/catalog/pg_class.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_class.h,v 1.95 2006/07/10 16:20:51 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_class.h,v 1.96 2006/10/04 00:30:07 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -66,7 +66,7 @@ CATALOG(pg_class,1259) BKI_BOOTSTRAP bool relhasrules; /* has associated rules */ bool relhassubclass; /* has derived classes */ TransactionId relminxid; /* minimum Xid present in table */ - TransactionId relvacuumxid; /* Xid used as last vacuum OldestXmin */ + TransactionId relvacuumxid; /* Xid used as last vacuum OldestXmin */ /* * VARIABLE LENGTH FIELDS start here. These fields may be NULL, too. diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h index 2b109f2d5ac..0e1132052e7 100644 --- a/src/include/catalog/pg_control.h +++ b/src/include/catalog/pg_control.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.32 2006/08/21 16:16:31 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.33 2006/10/04 00:30:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -109,7 +109,7 @@ typedef struct ControlFileData CheckPoint checkPointCopy; /* copy of last check point record */ - XLogRecPtr minRecoveryPoint; /* must replay xlog to here */ + XLogRecPtr minRecoveryPoint; /* must replay xlog to here */ /* * This data is used to check for hardware-architecture compatibility of diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h index 506fbc293d2..8891b9521b1 100644 --- a/src/include/catalog/pg_index.h +++ b/src/include/catalog/pg_index.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_index.h,v 1.40 2006/08/25 04:06:55 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_index.h,v 1.41 2006/10/04 00:30:07 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -41,7 +41,7 @@ CATALOG(pg_index,2610) BKI_WITHOUT_OIDS bool indisunique; /* is this a unique index? */ bool indisprimary; /* is this index for primary key? */ bool indisclustered; /* is this the index last clustered by? */ - bool indisvalid; /* is this index valid for use by queries? */ + bool indisvalid; /* is this index valid for use by queries? */ /* VARIABLE LENGTH FIELDS: */ int2vector indkey; /* column numbers of indexed cols, or 0 */ diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h index 9072380e0e3..b64b3c5136f 100644 --- a/src/include/catalog/pg_operator.h +++ b/src/include/catalog/pg_operator.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_operator.h,v 1.145 2006/09/10 00:29:34 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_operator.h,v 1.146 2006/10/04 00:30:07 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -132,11 +132,11 @@ DATA(insert OID = 386 ( "=" PGNSP PGUID b t 22 22 16 386 0 0 0 0 0 int2 DATA(insert OID = 387 ( "=" PGNSP PGUID b f 27 27 16 387 402 2799 2799 2799 2800 tideq eqsel eqjoinsel )); #define TIDEqualOperator 387 DATA(insert OID = 402 ( "<>" PGNSP PGUID b f 27 27 16 402 387 0 0 0 0 tidne neqsel neqjoinsel )); -DATA(insert OID = 2799 ( "<" PGNSP PGUID b f 27 27 16 2800 2802 0 0 0 0 tidlt scalarltsel scalarltjoinsel )); +DATA(insert OID = 2799 ( "<" PGNSP PGUID b f 27 27 16 2800 2802 0 0 0 0 tidlt scalarltsel scalarltjoinsel )); #define TIDLessOperator 2799 -DATA(insert OID = 2800 ( ">" PGNSP PGUID b f 27 27 16 2799 2801 0 0 0 0 tidgt scalargtsel scalargtjoinsel )); -DATA(insert OID = 2801 ( "<=" PGNSP PGUID b f 27 27 16 2802 2800 0 0 0 0 tidle scalarltsel scalarltjoinsel )); -DATA(insert OID = 2802 ( ">=" PGNSP PGUID b f 27 27 16 2801 2799 0 0 0 0 tidge scalargtsel scalargtjoinsel )); +DATA(insert OID = 2800 ( ">" PGNSP PGUID b f 27 27 16 2799 2801 0 0 0 0 tidgt scalargtsel scalargtjoinsel )); +DATA(insert OID = 2801 ( "<=" PGNSP PGUID b f 27 27 16 2802 2800 0 0 0 0 tidle scalarltsel scalarltjoinsel )); +DATA(insert OID = 2802 ( ">=" PGNSP PGUID b f 27 27 16 2801 2799 0 0 0 0 tidge scalargtsel scalargtjoinsel )); DATA(insert OID = 410 ( "=" PGNSP PGUID b t 20 20 16 410 411 412 412 412 413 int8eq eqsel eqjoinsel )); DATA(insert OID = 411 ( "<>" PGNSP PGUID b f 20 20 16 411 410 0 0 0 0 int8ne neqsel neqjoinsel )); @@ -879,19 +879,19 @@ DATA(insert OID = 2589 ( "&<|" PGNSP PGUID b f 718 718 16 0 0 0 0 0 0 DATA(insert OID = 2590 ( "|&>" PGNSP PGUID b f 718 718 16 0 0 0 0 0 0 circle_overabove positionsel positionjoinsel )); /* overlap/contains/contained for arrays */ -DATA(insert OID = 2750 ( "&&" PGNSP PGUID b f 2277 2277 16 2750 0 0 0 0 0 arrayoverlap areasel areajoinsel )); -DATA(insert OID = 2751 ( "@>" PGNSP PGUID b f 2277 2277 16 2752 0 0 0 0 0 arraycontains contsel contjoinsel )); -DATA(insert OID = 2752 ( "<@" PGNSP PGUID b f 2277 2277 16 2751 0 0 0 0 0 arraycontained contsel contjoinsel )); +DATA(insert OID = 2750 ( "&&" PGNSP PGUID b f 2277 2277 16 2750 0 0 0 0 0 arrayoverlap areasel areajoinsel )); +DATA(insert OID = 2751 ( "@>" PGNSP PGUID b f 2277 2277 16 2752 0 0 0 0 0 arraycontains contsel contjoinsel )); +DATA(insert OID = 2752 ( "<@" PGNSP PGUID b f 2277 2277 16 2751 0 0 0 0 0 arraycontained contsel contjoinsel )); /* obsolete names for contains/contained-by operators; remove these someday */ -DATA(insert OID = 2860 ( "@" PGNSP PGUID b f 604 604 16 2861 0 0 0 0 0 poly_contained contsel contjoinsel )); -DATA(insert OID = 2861 ( "~" PGNSP PGUID b f 604 604 16 2860 0 0 0 0 0 poly_contain contsel contjoinsel )); -DATA(insert OID = 2862 ( "@" PGNSP PGUID b f 603 603 16 2863 0 0 0 0 0 box_contained contsel contjoinsel )); -DATA(insert OID = 2863 ( "~" PGNSP PGUID b f 603 603 16 2862 0 0 0 0 0 box_contain contsel contjoinsel )); +DATA(insert OID = 2860 ( "@" PGNSP PGUID b f 604 604 16 2861 0 0 0 0 0 poly_contained contsel contjoinsel )); +DATA(insert OID = 2861 ( "~" PGNSP PGUID b f 604 604 16 2860 0 0 0 0 0 poly_contain contsel contjoinsel )); +DATA(insert OID = 2862 ( "@" PGNSP PGUID b f 603 603 16 2863 0 0 0 0 0 box_contained contsel contjoinsel )); +DATA(insert OID = 2863 ( "~" PGNSP PGUID b f 603 603 16 2862 0 0 0 0 0 box_contain contsel contjoinsel )); DATA(insert OID = 2864 ( "@" PGNSP PGUID b f 718 718 16 2865 0 0 0 0 0 circle_contained contsel contjoinsel )); DATA(insert OID = 2865 ( "~" PGNSP PGUID b f 718 718 16 2864 0 0 0 0 0 circle_contain contsel contjoinsel )); DATA(insert OID = 2866 ( "@" PGNSP PGUID b f 600 603 16 0 0 0 0 0 0 on_pb - - )); -DATA(insert OID = 2867 ( "@" PGNSP PGUID b f 600 602 16 2868 0 0 0 0 0 on_ppath - - )); +DATA(insert OID = 2867 ( "@" PGNSP PGUID b f 600 602 16 2868 0 0 0 0 0 on_ppath - - )); DATA(insert OID = 2868 ( "~" PGNSP PGUID b f 602 600 16 2867 0 0 0 0 0 path_contain_pt - - )); DATA(insert OID = 2869 ( "@" PGNSP PGUID b f 600 604 16 2870 0 0 0 0 0 pt_contained_poly - - )); DATA(insert OID = 2870 ( "~" PGNSP PGUID b f 604 600 16 2869 0 0 0 0 0 poly_contain_pt - - )); diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 1e0dc4b13f5..9299d63ab8e 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.426 2006/09/18 22:40:38 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.427 2006/10/04 00:30:07 momjian Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -1534,7 +1534,7 @@ DESCR("truncate interval to specified units"); DATA(insert OID = 1219 ( int8inc PGNSP PGUID 12 f f t f i 1 20 "20" _null_ _null_ _null_ int8inc - _null_ )); DESCR("increment"); -DATA(insert OID = 2804 ( int8inc_any PGNSP PGUID 12 f f t f i 2 20 "20 2276" _null_ _null_ _null_ int8inc_any - _null_ )); +DATA(insert OID = 2804 ( int8inc_any PGNSP PGUID 12 f f t f i 2 20 "20 2276" _null_ _null_ _null_ int8inc_any - _null_ )); DESCR("increment, ignores second argument"); DATA(insert OID = 1230 ( int8abs PGNSP PGUID 12 f f t f i 1 20 "20" _null_ _null_ _null_ int8abs - _null_ )); DESCR("absolute value"); @@ -1628,11 +1628,11 @@ DATA(insert OID = 1298 ( timetzdate_pl PGNSP PGUID 14 f f t f i 2 1184 "1266 DESCR("convert time with time zone and date to timestamp with time zone"); DATA(insert OID = 1299 ( now PGNSP PGUID 12 f f t f s 0 1184 "" _null_ _null_ _null_ now - _null_ )); DESCR("current transaction time"); -DATA(insert OID = 2647 ( transaction_timestamp PGNSP PGUID 12 f f t f s 0 1184 "" _null_ _null_ _null_ now - _null_ )); +DATA(insert OID = 2647 ( transaction_timestamp PGNSP PGUID 12 f f t f s 0 1184 "" _null_ _null_ _null_ now - _null_ )); DESCR("current transaction time"); -DATA(insert OID = 2648 ( statement_timestamp PGNSP PGUID 12 f f t f s 0 1184 "" _null_ _null_ _null_ statement_timestamp - _null_ )); +DATA(insert OID = 2648 ( statement_timestamp PGNSP PGUID 12 f f t f s 0 1184 "" _null_ _null_ _null_ statement_timestamp - _null_ )); DESCR("current statement time"); -DATA(insert OID = 2649 ( clock_timestamp PGNSP PGUID 12 f f t f v 0 1184 "" _null_ _null_ _null_ clock_timestamp - _null_ )); +DATA(insert OID = 2649 ( clock_timestamp PGNSP PGUID 12 f f t f v 0 1184 "" _null_ _null_ _null_ clock_timestamp - _null_ )); DESCR("current clock time"); /* OIDS 1300 - 1399 */ @@ -2694,7 +2694,7 @@ DATA(insert OID = 1831 ( float8_var_samp PGNSP PGUID 12 f f t f i 1 701 "1022" DESCR("VAR_SAMP aggregate final function"); DATA(insert OID = 2513 ( float8_stddev_pop PGNSP PGUID 12 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_stddev_pop - _null_ )); DESCR("STDDEV_POP aggregate final function"); -DATA(insert OID = 1832 ( float8_stddev_samp PGNSP PGUID 12 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_stddev_samp - _null_ )); +DATA(insert OID = 1832 ( float8_stddev_samp PGNSP PGUID 12 f f t f i 1 701 "1022" _null_ _null_ _null_ float8_stddev_samp - _null_ )); DESCR("STDDEV_SAMP aggregate final function"); DATA(insert OID = 1833 ( numeric_accum PGNSP PGUID 12 f f t f i 2 1231 "1231 1700" _null_ _null_ _null_ numeric_accum - _null_ )); DESCR("aggregate transition function"); @@ -2712,7 +2712,7 @@ DATA(insert OID = 1838 ( numeric_var_samp PGNSP PGUID 12 f f t f i 1 1700 "1231 DESCR("VAR_SAMP aggregate final function"); DATA(insert OID = 2596 ( numeric_stddev_pop PGNSP PGUID 12 f f t f i 1 1700 "1231" _null_ _null_ _null_ numeric_stddev_pop - _null_ )); DESCR("STDDEV_POP aggregate final function"); -DATA(insert OID = 1839 ( numeric_stddev_samp PGNSP PGUID 12 f f t f i 1 1700 "1231" _null_ _null_ _null_ numeric_stddev_samp - _null_ )); +DATA(insert OID = 1839 ( numeric_stddev_samp PGNSP PGUID 12 f f t f i 1 1700 "1231" _null_ _null_ _null_ numeric_stddev_samp - _null_ )); DESCR("STDDEV_SAMP aggregate final function"); DATA(insert OID = 1840 ( int2_sum PGNSP PGUID 12 f f f f i 2 20 "20 21" _null_ _null_ _null_ int2_sum - _null_ )); DESCR("SUM(int2) transition function"); @@ -3933,7 +3933,7 @@ DATA(insert OID = 2788 ( ginoptions PGNSP PGUID 12 f f t f s 2 17 "1009 16" DESCR("gin(internal)"); /* GIN array support */ -DATA(insert OID = 2743 ( ginarrayextract PGNSP PGUID 12 f f t f i 2 2281 "2277 2281" _null_ _null_ _null_ ginarrayextract - _null_ )); +DATA(insert OID = 2743 ( ginarrayextract PGNSP PGUID 12 f f t f i 2 2281 "2277 2281" _null_ _null_ _null_ ginarrayextract - _null_ )); DESCR("GIN array support"); DATA(insert OID = 2744 ( ginarrayconsistent PGNSP PGUID 12 f f t f i 3 16 "2281 21 2281" _null_ _null_ _null_ ginarrayconsistent - _null_ )); DESCR("GIN array support"); diff --git a/src/include/catalog/pg_shdescription.h b/src/include/catalog/pg_shdescription.h index 0879fa68f58..6738da1fda2 100644 --- a/src/include/catalog/pg_shdescription.h +++ b/src/include/catalog/pg_shdescription.h @@ -7,7 +7,7 @@ * NOTE: an object is identified by the OID of the row that primarily * defines the object, plus the OID of the table that that row appears in. * For example, a database is identified by the OID of its pg_database row - * plus the pg_class OID of table pg_database. This allows unique + * plus the pg_class OID of table pg_database. This allows unique * identification of objects without assuming that OIDs are unique * across tables. * @@ -15,7 +15,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_shdescription.h,v 1.2 2006/03/05 15:58:55 momjian Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_shdescription.h,v 1.3 2006/10/04 00:30:08 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -61,7 +61,7 @@ typedef FormData_pg_shdescription *Form_pg_shdescription; * compiler constants for pg_shdescription * ---------------- */ -#define Natts_pg_shdescription 3 +#define Natts_pg_shdescription 3 #define Anum_pg_shdescription_objoid 1 #define Anum_pg_shdescription_classoid 2 #define Anum_pg_shdescription_description 3 diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index b9aeec1e3cb..488ff66bedd 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.171 2006/04/05 22:11:57 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.172 2006/10/04 00:30:08 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -516,7 +516,7 @@ DATA(insert OID = 2208 ( _regoper PGNSP PGUID -1 f b t \054 0 2203 array_in a DATA(insert OID = 2209 ( _regoperator PGNSP PGUID -1 f b t \054 0 2204 array_in array_out array_recv array_send - i x f 0 -1 0 _null_ _null_ )); DATA(insert OID = 2210 ( _regclass PGNSP PGUID -1 f b t \054 0 2205 array_in array_out array_recv array_send - i x f 0 -1 0 _null_ _null_ )); DATA(insert OID = 2211 ( _regtype PGNSP PGUID -1 f b t \054 0 2206 array_in array_out array_recv array_send - i x f 0 -1 0 _null_ _null_ )); -#define REGTYPEARRAYOID 2211 +#define REGTYPEARRAYOID 2211 /* * pseudo-types diff --git a/src/include/catalog/toasting.h b/src/include/catalog/toasting.h index 25a84b3f880..f5d54af112d 100644 --- a/src/include/catalog/toasting.h +++ b/src/include/catalog/toasting.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/toasting.h,v 1.1 2006/07/31 01:16:37 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/toasting.h,v 1.2 2006/10/04 00:30:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ */ extern void AlterTableCreateToastTable(Oid relOid); extern void BootstrapToastTable(char *relName, - Oid toastOid, Oid toastIndexOid); + Oid toastOid, Oid toastIndexOid); /* @@ -40,21 +40,21 @@ extern void BootstrapToastTable(char *relName, */ /* normal catalogs */ -DECLARE_TOAST(pg_attrdef,2830,2831); -DECLARE_TOAST(pg_constraint,2832,2833); -DECLARE_TOAST(pg_description,2834,2835); -DECLARE_TOAST(pg_proc,2836,2837); -DECLARE_TOAST(pg_rewrite,2838,2839); -DECLARE_TOAST(pg_statistic,2840,2841); +DECLARE_TOAST(pg_attrdef, 2830, 2831); +DECLARE_TOAST(pg_constraint, 2832, 2833); +DECLARE_TOAST(pg_description, 2834, 2835); +DECLARE_TOAST(pg_proc, 2836, 2837); +DECLARE_TOAST(pg_rewrite, 2838, 2839); +DECLARE_TOAST(pg_statistic, 2840, 2841); /* shared catalogs */ -DECLARE_TOAST(pg_authid,2842,2843); +DECLARE_TOAST(pg_authid, 2842, 2843); #define PgAuthidToastTable 2842 #define PgAuthidToastIndex 2843 -DECLARE_TOAST(pg_database,2844,2845); +DECLARE_TOAST(pg_database, 2844, 2845); #define PgDatabaseToastTable 2844 #define PgDatabaseToastIndex 2845 -DECLARE_TOAST(pg_shdescription,2846,2847); +DECLARE_TOAST(pg_shdescription, 2846, 2847); #define PgShdescriptionToastTable 2846 #define PgShdescriptionToastIndex 2847 diff --git a/src/include/commands/comment.h b/src/include/commands/comment.h index 525a2b9c387..da9fc1c7f15 100644 --- a/src/include/commands/comment.h +++ b/src/include/commands/comment.h @@ -21,7 +21,7 @@ * related routines. CommentObject() implements the SQL "COMMENT ON" * command. DeleteComments() deletes all comments for an object. * CreateComments creates (or deletes, if comment is NULL) a comment - * for a specific key. There are versions of these two methods for + * for a specific key. There are versions of these two methods for * both normal and shared objects. *------------------------------------------------------------------ */ diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h index 26983fc1988..7b45ea57358 100644 --- a/src/include/commands/defrem.h +++ b/src/include/commands/defrem.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/defrem.h,v 1.76 2006/08/25 04:06:55 tgl Exp $ + * $PostgreSQL: pgsql/src/include/commands/defrem.h,v 1.77 2006/10/04 00:30:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,7 +72,7 @@ extern void AlterOperatorOwner_oid(Oid operOid, Oid newOwnerId); /* commands/aggregatecmds.c */ extern void DefineAggregate(List *name, List *args, bool oldstyle, - List *parameters); + List *parameters); extern void RemoveAggregate(RemoveFuncStmt *stmt); extern void RenameAggregate(List *name, List *args, const char *newname); extern void AlterAggregateOwner(List *name, List *args, Oid newOwnerId); diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h index 8814102bfc4..7417e8cfdde 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.27 2006/07/13 16:49:19 momjian Exp $ + * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.28 2006/10/04 00:30:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,7 @@ extern void ExplainQuery(ExplainStmt *stmt, ParamListInfo params, - DestReceiver *dest); + DestReceiver *dest); extern TupleDesc ExplainResultDesc(ExplainStmt *stmt); diff --git a/src/include/commands/prepare.h b/src/include/commands/prepare.h index bd831c2e609..2a7d2b2c8d1 100644 --- a/src/include/commands/prepare.h +++ b/src/include/commands/prepare.h @@ -6,7 +6,7 @@ * * Copyright (c) 2002-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/commands/prepare.h,v 1.21 2006/07/13 16:49:19 momjian Exp $ + * $PostgreSQL: pgsql/src/include/commands/prepare.h,v 1.22 2006/10/04 00:30:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,26 +28,25 @@ typedef struct { /* dynahash.c requires key to be first field */ - char stmt_name[NAMEDATALEN]; - char *query_string; /* text of query, or NULL */ - const char *commandTag; /* command tag (a constant!), or NULL */ - List *query_list; /* list of queries, rewritten */ - List *plan_list; /* list of plans */ - List *argtype_list; /* list of parameter type OIDs */ - TimestampTz prepare_time; /* the time when the stmt was prepared */ - bool from_sql; /* stmt prepared via SQL, not - * FE/BE protocol? */ - MemoryContext context; /* context containing this query */ + char stmt_name[NAMEDATALEN]; + char *query_string; /* text of query, or NULL */ + const char *commandTag; /* command tag (a constant!), or NULL */ + List *query_list; /* list of queries, rewritten */ + List *plan_list; /* list of plans */ + List *argtype_list; /* list of parameter type OIDs */ + TimestampTz prepare_time; /* the time when the stmt was prepared */ + bool from_sql; /* stmt prepared via SQL, not FE/BE protocol? */ + MemoryContext context; /* context containing this query */ } PreparedStatement; /* Utility statements PREPARE, EXECUTE, DEALLOCATE, EXPLAIN EXECUTE */ extern void PrepareQuery(PrepareStmt *stmt); extern void ExecuteQuery(ExecuteStmt *stmt, ParamListInfo params, - DestReceiver *dest, char *completionTag); + DestReceiver *dest, char *completionTag); extern void DeallocateQuery(DeallocateStmt *stmt); extern void ExplainExecuteQuery(ExplainStmt *stmt, ParamListInfo params, - TupOutputState *tstate); + TupOutputState *tstate); /* Low-level access to stored prepared statements */ extern void StorePreparedStatement(const char *stmt_name, diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h index 4c9063f13ca..3a9aad7375d 100644 --- a/src/include/commands/tablecmds.h +++ b/src/include/commands/tablecmds.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/tablecmds.h,v 1.30 2006/07/31 01:16:38 tgl Exp $ + * $PostgreSQL: pgsql/src/include/commands/tablecmds.h,v 1.31 2006/10/04 00:30:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,8 +45,8 @@ extern void renameatt(Oid myrelid, extern void renamerel(Oid myrelid, const char *newrelname); -extern AttrNumber * varattnos_map(TupleDesc old, TupleDesc new); -extern AttrNumber * varattnos_map_schema(TupleDesc old, List *schema); +extern AttrNumber *varattnos_map(TupleDesc old, TupleDesc new); +extern AttrNumber *varattnos_map_schema(TupleDesc old, List *schema); extern void change_varattnos_of_a_node(Node *node, const AttrNumber *newattno); extern void register_on_commit_action(Oid relid, OnCommitAction action); diff --git a/src/include/commands/user.h b/src/include/commands/user.h index 86199669bdc..01fb92c3546 100644 --- a/src/include/commands/user.h +++ b/src/include/commands/user.h @@ -4,7 +4,7 @@ * Commands for manipulating roles (formerly called users). * * - * $PostgreSQL: pgsql/src/include/commands/user.h,v 1.29 2005/11/22 18:17:30 momjian Exp $ + * $PostgreSQL: pgsql/src/include/commands/user.h,v 1.30 2006/10/04 00:30:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,7 @@ extern void AlterRoleSet(AlterRoleSetStmt *stmt); extern void DropRole(DropRoleStmt *stmt); extern void GrantRole(GrantRoleStmt *stmt); extern void RenameRole(const char *oldname, const char *newname); -extern void DropOwnedObjects(DropOwnedStmt * stmt); -extern void ReassignOwnedObjects(ReassignOwnedStmt * stmt); +extern void DropOwnedObjects(DropOwnedStmt *stmt); +extern void ReassignOwnedObjects(ReassignOwnedStmt *stmt); #endif /* USER_H */ diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index d5b6213a351..d030b4deea4 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.129 2006/08/12 02:52:06 tgl Exp $ + * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.130 2006/10/04 00:30:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,7 +35,7 @@ * REWIND indicates that the plan node should try to efficiently support * rescans without parameter changes. (Nodes must support ExecReScan calls * in any case, but if this flag was not given, they are at liberty to do it - * through complete recalculation. Note that a parameter change forces a + * through complete recalculation. Note that a parameter change forces a * full recalculation in any case.) * * BACKWARD indicates that the plan node must respect the es_direction flag. @@ -44,10 +44,10 @@ * MARK indicates that the plan node must support Mark/Restore calls. * When this is not passed, no Mark/Restore will occur. */ -#define EXEC_FLAG_EXPLAIN_ONLY 0x0001 /* EXPLAIN, no ANALYZE */ -#define EXEC_FLAG_REWIND 0x0002 /* need efficient rescan */ -#define EXEC_FLAG_BACKWARD 0x0004 /* need backward scan */ -#define EXEC_FLAG_MARK 0x0008 /* need mark/restore */ +#define EXEC_FLAG_EXPLAIN_ONLY 0x0001 /* EXPLAIN, no ANALYZE */ +#define EXEC_FLAG_REWIND 0x0002 /* need efficient rescan */ +#define EXEC_FLAG_BACKWARD 0x0004 /* need backward scan */ +#define EXEC_FLAG_MARK 0x0008 /* need mark/restore */ /* diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h index db25839b204..f5f0cc6c22a 100644 --- a/src/include/executor/nodeIndexscan.h +++ b/src/include/executor/nodeIndexscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeIndexscan.h,v 1.28 2006/03/05 15:58:56 momjian Exp $ + * $PostgreSQL: pgsql/src/include/executor/nodeIndexscan.h,v 1.29 2006/10/04 00:30:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,9 +31,9 @@ extern void ExecIndexBuildScanKeys(PlanState *planstate, Relation index, IndexRuntimeKeyInfo **runtimeKeys, int *numRuntimeKeys, IndexArrayKeyInfo **arrayKeys, int *numArrayKeys); extern void ExecIndexEvalRuntimeKeys(ExprContext *econtext, - IndexRuntimeKeyInfo *runtimeKeys, int numRuntimeKeys); + IndexRuntimeKeyInfo *runtimeKeys, int numRuntimeKeys); extern bool ExecIndexEvalArrayKeys(ExprContext *econtext, - IndexArrayKeyInfo *arrayKeys, int numArrayKeys); + IndexArrayKeyInfo *arrayKeys, int numArrayKeys); extern bool ExecIndexAdvanceArrayKeys(IndexArrayKeyInfo *arrayKeys, int numArrayKeys); #endif /* NODEINDEXSCAN_H */ diff --git a/src/include/executor/nodeValuesscan.h b/src/include/executor/nodeValuesscan.h index 5a952bdd322..d8a8b5a7cb5 100644 --- a/src/include/executor/nodeValuesscan.h +++ b/src/include/executor/nodeValuesscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeValuesscan.h,v 1.1 2006/08/02 01:59:47 joe Exp $ + * $PostgreSQL: pgsql/src/include/executor/nodeValuesscan.h,v 1.2 2006/10/04 00:30:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,7 +16,7 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsValuesScan(ValuesScan *node); +extern int ExecCountSlotsValuesScan(ValuesScan *node); extern ValuesScanState *ExecInitValuesScan(ValuesScan *node, EState *estate, int eflags); extern TupleTableSlot *ExecValuesScan(ValuesScanState *node); extern void ExecEndValuesScan(ValuesScanState *node); diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index 361fe7c8d1e..9cbbc035dcc 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -2,7 +2,7 @@ * * spi.h * - * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.57 2006/09/03 03:19:45 momjian Exp $ + * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.58 2006/10/04 00:30:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -71,9 +71,9 @@ typedef struct #define SPI_OK_DELETE 8 #define SPI_OK_UPDATE 9 #define SPI_OK_CURSOR 10 -#define SPI_OK_INSERT_RETURNING 11 -#define SPI_OK_DELETE_RETURNING 12 -#define SPI_OK_UPDATE_RETURNING 13 +#define SPI_OK_INSERT_RETURNING 11 +#define SPI_OK_DELETE_RETURNING 12 +#define SPI_OK_UPDATE_RETURNING 13 extern DLLIMPORT uint32 SPI_processed; extern DLLIMPORT Oid SPI_lastoid; diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index 32f34e6fb74..c34234c836d 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/tuptable.h,v 1.35 2006/07/13 17:47:02 momjian Exp $ + * $PostgreSQL: pgsql/src/include/executor/tuptable.h,v 1.36 2006/10/04 00:30:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,7 +34,7 @@ * * A "minimal" tuple is handled similarly to a palloc'd regular tuple. * At present, minimal tuples never are stored in buffers, so there is no - * parallel to case 1. Note that a minimal tuple has no "system columns". + * parallel to case 1. Note that a minimal tuple has no "system columns". * (Actually, it could have an OID, but we have no need to access the OID.) * * A "virtual" tuple is an optimization used to minimize physical data @@ -94,7 +94,7 @@ * object (the thing to be pfree'd if tts_shouldFree is true). In this case * tts_tuple points at tts_minhdr and the fields of that are set correctly * for access to the minimal tuple; in particular, tts_minhdr.t_data points - * MINIMAL_TUPLE_OFFSET bytes before tts_mintuple. (tts_mintuple is therefore + * MINIMAL_TUPLE_OFFSET bytes before tts_mintuple. (tts_mintuple is therefore * redundant, but for code simplicity we store it explicitly anyway.) This * case otherwise behaves identically to the regular-physical-tuple case. * @@ -151,8 +151,8 @@ extern TupleTableSlot *ExecStoreTuple(HeapTuple tuple, Buffer buffer, bool shouldFree); extern TupleTableSlot *ExecStoreMinimalTuple(MinimalTuple mtup, - TupleTableSlot *slot, - bool shouldFree); + TupleTableSlot *slot, + bool shouldFree); extern TupleTableSlot *ExecClearTuple(TupleTableSlot *slot); extern TupleTableSlot *ExecStoreVirtualTuple(TupleTableSlot *slot); extern TupleTableSlot *ExecStoreAllNullTuple(TupleTableSlot *slot); diff --git a/src/include/fmgr.h b/src/include/fmgr.h index 4055fe715b0..b9164f06d78 100644 --- a/src/include/fmgr.h +++ b/src/include/fmgr.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/fmgr.h,v 1.47 2006/08/16 04:32:49 tgl Exp $ + * $PostgreSQL: pgsql/src/include/fmgr.h,v 1.48 2006/10/04 00:30:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,6 +20,7 @@ /* We don't want to include primnodes.h here, so make a stub reference */ typedef struct Node *fmNodePtr; + /* Likewise, avoid including stringinfo.h here */ typedef struct StringInfoData *fmStringInfo; @@ -322,7 +323,7 @@ extern int no_such_variable * To compile with versions of PostgreSQL that do not support this, * you may put an #ifdef/#endif test around it. Note that in a multiple- * source-file module, the macro call should only appear once. - * + * * The specific items included in the magic block are intended to be ones that * are custom-configurable and especially likely to break dynamically loaded * modules if they were compiled with other values. Also, the length field @@ -333,11 +334,11 @@ extern int no_such_variable /* Definition of the magic block structure */ typedef struct { - int len; /* sizeof(this struct) */ - int version; /* PostgreSQL major version */ - int funcmaxargs; /* FUNC_MAX_ARGS */ - int indexmaxkeys; /* INDEX_MAX_KEYS */ - int namedatalen; /* NAMEDATALEN */ + int len; /* sizeof(this struct) */ + int version; /* PostgreSQL major version */ + int funcmaxargs; /* FUNC_MAX_ARGS */ + int indexmaxkeys; /* INDEX_MAX_KEYS */ + int namedatalen; /* NAMEDATALEN */ } Pg_magic_struct; /* The actual data block contents */ @@ -457,15 +458,15 @@ extern Datum OidFunctionCall9(Oid functionId, Datum arg1, Datum arg2, /* Special cases for convenient invocation of datatype I/O functions. */ extern Datum InputFunctionCall(FmgrInfo *flinfo, char *str, - Oid typioparam, int32 typmod); + Oid typioparam, int32 typmod); extern Datum OidInputFunctionCall(Oid functionId, char *str, - Oid typioparam, int32 typmod); + Oid typioparam, int32 typmod); extern char *OutputFunctionCall(FmgrInfo *flinfo, Datum val); extern char *OidOutputFunctionCall(Oid functionId, Datum val); extern Datum ReceiveFunctionCall(FmgrInfo *flinfo, fmStringInfo buf, - Oid typioparam, int32 typmod); + Oid typioparam, int32 typmod); extern Datum OidReceiveFunctionCall(Oid functionId, fmStringInfo buf, - Oid typioparam, int32 typmod); + Oid typioparam, int32 typmod); extern bytea *SendFunctionCall(FmgrInfo *flinfo, Datum val); extern bytea *OidSendFunctionCall(Oid functionId, Datum val); diff --git a/src/include/funcapi.h b/src/include/funcapi.h index 91130117b18..1698b1de860 100644 --- a/src/include/funcapi.h +++ b/src/include/funcapi.h @@ -9,7 +9,7 @@ * * Copyright (c) 2002-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/funcapi.h,v 1.23 2006/03/05 15:58:52 momjian Exp $ + * $PostgreSQL: pgsql/src/include/funcapi.h,v 1.24 2006/10/04 00:30:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -169,9 +169,9 @@ extern bool resolve_polymorphic_argtypes(int numargs, Oid *argtypes, char *argmodes, Node *call_expr); -extern int get_func_arg_info(HeapTuple procTup, - Oid **p_argtypes, char ***p_argnames, - char **p_argmodes); +extern int get_func_arg_info(HeapTuple procTup, + Oid **p_argtypes, char ***p_argnames, + char **p_argmodes); extern char *get_func_result_name(Oid functionId); diff --git a/src/include/getaddrinfo.h b/src/include/getaddrinfo.h index ee60b71d840..dbd411412e3 100644 --- a/src/include/getaddrinfo.h +++ b/src/include/getaddrinfo.h @@ -15,7 +15,7 @@ * * Copyright (c) 2003-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/getaddrinfo.h,v 1.21 2006/07/06 02:12:32 momjian Exp $ + * $PostgreSQL: pgsql/src/include/getaddrinfo.h,v 1.22 2006/10/04 00:30:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,9 +42,9 @@ #else /* WIN32 */ #ifdef WIN32_ONLY_COMPILER #ifndef WSA_NOT_ENOUGH_MEMORY -#define WSA_NOT_ENOUGH_MEMORY (WSAENOBUFS) +#define WSA_NOT_ENOUGH_MEMORY (WSAENOBUFS) #endif -#define WSATYPE_NOT_FOUND (WSABASEERR+109) +#define WSATYPE_NOT_FOUND (WSABASEERR+109) #endif #define EAI_AGAIN WSATRY_AGAIN #define EAI_BADFLAGS WSAEINVAL diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index a50b3ca0a9b..eb8539f1399 100644 --- a/src/include/libpq/hba.h +++ b/src/include/libpq/hba.h @@ -4,7 +4,7 @@ * Interface to hba.c * * - * $PostgreSQL: pgsql/src/include/libpq/hba.h,v 1.43 2006/07/10 16:20:52 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/libpq/hba.h,v 1.44 2006/10/04 00:30:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ typedef enum UserAuth ,uaPAM #endif /* USE_PAM */ #ifdef USE_LDAP - ,uaLDAP + ,uaLDAP #endif } UserAuth; diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index de85ce10d63..dd39731cbd8 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.56 2006/06/20 22:52:00 tgl Exp $ + * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.57 2006/10/04 00:30:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -81,8 +81,8 @@ typedef struct Port * but since it gets used by elog.c in the same way as database_name and * other members of this struct, we may as well keep it here. */ - TimestampTz SessionStartTime; /* backend start time */ - time_t session_start; /* same, in time_t format */ + TimestampTz SessionStartTime; /* backend start time */ + time_t session_start; /* same, in time_t format */ /* * TCP keepalive settings. diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index 1bb8042344d..2d465a1b38b 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.68 2006/05/21 20:05:21 tgl Exp $ */ +/* $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.69 2006/10/04 00:30:09 momjian Exp $ */ #ifndef PG_WCHAR_H #define PG_WCHAR_H @@ -92,32 +92,32 @@ typedef unsigned int pg_wchar; #define LC_JISX0208_1978 0x90 /* Japanese Kanji, old JIS (not supported) */ /* #define FREE 0x90 free (unused) */ #define LC_GB2312_80 0x91 /* Chinese */ -#define LC_JISX0208 0x92 /* Japanese Kanji (JIS X 0208) */ -#define LC_KS5601 0x93 /* Korean */ -#define LC_JISX0212 0x94 /* Japanese Kanji (JIS X 0212) */ +#define LC_JISX0208 0x92 /* Japanese Kanji (JIS X 0208) */ +#define LC_KS5601 0x93 /* Korean */ +#define LC_JISX0212 0x94 /* Japanese Kanji (JIS X 0212) */ #define LC_CNS11643_1 0x95 /* CNS 11643-1992 Plane 1 */ #define LC_CNS11643_2 0x96 /* CNS 11643-1992 Plane 2 */ /* #define FREE 0x97 free (unused) */ -#define LC_BIG5_1 0x98 /* Plane 1 Chinese traditional (not supported) */ -#define LC_BIG5_2 0x99 /* Plane 1 Chinese traditional (not supported) */ +#define LC_BIG5_1 0x98 /* Plane 1 Chinese traditional (not supported) */ +#define LC_BIG5_2 0x99 /* Plane 1 Chinese traditional (not supported) */ /* * Private single byte encodings (0xa0-0xef) */ -#define LC_SISHENG 0xa0 /* Chinese SiSheng characters for +#define LC_SISHENG 0xa0/* Chinese SiSheng characters for * PinYin/ZhuYin (not supported) */ -#define LC_IPA 0xa1 /* IPA (International Phonetic Association) +#define LC_IPA 0xa1/* IPA (International Phonetic Association) * (not supported) */ -#define LC_VISCII_LOWER 0xa2 /* Vietnamese VISCII1.1 lower-case (not +#define LC_VISCII_LOWER 0xa2/* Vietnamese VISCII1.1 lower-case (not * supported) */ -#define LC_VISCII_UPPER 0xa3 /* Vietnamese VISCII1.1 upper-case (not +#define LC_VISCII_UPPER 0xa3/* Vietnamese VISCII1.1 upper-case (not * supported) */ -#define LC_ARABIC_DIGIT 0xa4 /* Arabic digit (not supported) */ +#define LC_ARABIC_DIGIT 0xa4 /* Arabic digit (not supported) */ #define LC_ARABIC_1_COLUMN 0xa5 /* Arabic 1-column (not supported) */ #define LC_ASCII_RIGHT_TO_LEFT 0xa6 /* ASCII (left half of ISO8859-1) with * right-to-left direction (not * supported) */ -#define LC_LAO 0xa7 /* Lao characters (ISO10646 0E80..0EDF) (not +#define LC_LAO 0xa7/* Lao characters (ISO10646 0E80..0EDF) (not * supported) */ #define LC_ARABIC_2_COLUMN 0xa8 /* Arabic 1-column (not supported) */ @@ -127,7 +127,7 @@ typedef unsigned int pg_wchar; #define LC_INDIAN_1_COLUMN 0xf0/* Indian charset for 1-column width glypps * (not supported) */ #define LC_TIBETAN_1_COLUMN 0xf1 /* Tibetan 1 column glyph (not supported) */ -#define LC_ETHIOPIC 0xf5 /* Ethiopic characters (not supported) */ +#define LC_ETHIOPIC 0xf5 /* Ethiopic characters (not supported) */ #define LC_CNS11643_3 0xf6 /* CNS 11643-1992 Plane 3 */ #define LC_CNS11643_4 0xf7 /* CNS 11643-1992 Plane 4 */ #define LC_CNS11643_5 0xf8 /* CNS 11643-1992 Plane 5 */ @@ -135,7 +135,7 @@ typedef unsigned int pg_wchar; #define LC_CNS11643_7 0xfa /* CNS 11643-1992 Plane 7 */ #define LC_INDIAN_2_COLUMN 0xfb/* Indian charset for 2-column width glypps * (not supported) */ -#define LC_TIBETAN 0xfc /* Tibetan (not supported) */ +#define LC_TIBETAN 0xfc /* Tibetan (not supported) */ /* #define FREE 0xfd free (unused) */ /* #define FREE 0xfe free (unused) */ /* #define FREE 0xff free (unused) */ @@ -188,7 +188,7 @@ typedef enum pg_enc PG_WIN1255, /* windows-1255 */ PG_WIN1257, /* windows-1257 */ /* PG_ENCODING_BE_LAST points to the above entry */ - + /* followings are for client encoding only */ PG_SJIS, /* Shift JIS (Winindows-932) */ PG_BIG5, /* Big5 (Windows-950) */ @@ -343,24 +343,24 @@ extern void UtfToLocal(const unsigned char *utf, unsigned char *iso, extern bool pg_verifymbstr(const char *mbstr, int len, bool noError); extern bool pg_verify_mbstr(int encoding, const char *mbstr, int len, - bool noError); + bool noError); extern void report_invalid_encoding(int encoding, const char *mbstr, int len); extern void report_untranslatable_char(int src_encoding, int dest_encoding, - const char *mbstr, int len); + const char *mbstr, int len); extern void pg_ascii2mic(const unsigned char *l, unsigned char *p, int len); extern void pg_mic2ascii(const unsigned char *mic, unsigned char *p, int len); extern void latin2mic(const unsigned char *l, unsigned char *p, int len, - int lc, int encoding); + int lc, int encoding); extern void mic2latin(const unsigned char *mic, unsigned char *p, int len, - int lc, int encoding); + int lc, int encoding); extern void latin2mic_with_table(const unsigned char *l, unsigned char *p, - int len, int lc, int encoding, - const unsigned char *tab); + int len, int lc, int encoding, + const unsigned char *tab); extern void mic2latin_with_table(const unsigned char *mic, unsigned char *p, - int len, int lc, int encoding, - const unsigned char *tab); + int len, int lc, int encoding, + const unsigned char *tab); extern bool pg_utf8_islegal(const unsigned char *source, int length); diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index 3a93d75f301..48ac42ef3af 100644 --- a/src/include/nodes/params.h +++ b/src/include/nodes/params.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/params.h,v 1.32 2006/09/06 20:40:48 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/params.h,v 1.33 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,7 +35,7 @@ * ---------------- */ -#define PARAM_FLAG_CONST 0x0001 /* parameter is constant */ +#define PARAM_FLAG_CONST 0x0001 /* parameter is constant */ typedef struct ParamExternData { diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 0b9de4905d1..29f68f7fff3 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.330 2006/09/05 21:08:36 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.331 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,7 +57,7 @@ typedef uint32 AclMode; /* a bitmask of privilege bits */ #define ACL_USAGE (1<<8) /* for languages and namespaces */ #define ACL_CREATE (1<<9) /* for namespaces and databases */ #define ACL_CREATE_TEMP (1<<10) /* for databases */ -#define ACL_CONNECT (1<<11) /* for databases */ +#define ACL_CONNECT (1<<11) /* for databases */ #define N_ACL_RIGHTS 12 /* 1 plus the last 1<<x */ #define ACL_NO_RIGHTS 0 /* Currently, SELECT ... FOR UPDATE/FOR SHARE requires UPDATE privileges */ @@ -93,9 +93,9 @@ typedef struct Query * INSERT/UPDATE/DELETE; 0 for SELECT */ RangeVar *into; /* target relation for SELECT INTO */ - List *intoOptions; /* options from WITH clause */ + List *intoOptions; /* options from WITH clause */ OnCommitAction intoOnCommit; /* what do we do at COMMIT? */ - char *intoTableSpaceName; /* table space to use, or NULL */ + char *intoTableSpaceName; /* table space to use, or NULL */ bool hasAggs; /* has aggregates in tlist or havingQual */ bool hasSubLinks; /* has subquery SubLink */ @@ -134,17 +134,17 @@ typedef struct Query List *resultRelations; /* integer list of RT indexes, or NIL */ /* - * If the query has a returningList then the planner will store a list - * of processed targetlists (one per result relation) here. We must - * have a separate RETURNING targetlist for each result rel because - * column numbers may vary within an inheritance tree. In the targetlists, - * Vars referencing the result relation will have their original varno - * and varattno, while Vars referencing other rels will be converted - * to have varno OUTER and varattno referencing a resjunk entry in the - * top plan node's targetlist. XXX This field ought to go in some sort of - * TopPlan plan node, not in the Query. + * If the query has a returningList then the planner will store a list of + * processed targetlists (one per result relation) here. We must have a + * separate RETURNING targetlist for each result rel because column + * numbers may vary within an inheritance tree. In the targetlists, Vars + * referencing the result relation will have their original varno and + * varattno, while Vars referencing other rels will be converted to have + * varno OUTER and varattno referencing a resjunk entry in the top plan + * node's targetlist. XXX This field ought to go in some sort of TopPlan + * plan node, not in the Query. */ - List *returningLists; /* list of lists of TargetEntry, or NIL */ + List *returningLists; /* list of lists of TargetEntry, or NIL */ } Query; @@ -375,8 +375,8 @@ typedef struct RangeFunction NodeTag type; Node *funccallnode; /* untransformed function call tree */ Alias *alias; /* table alias & optional column aliases */ - List *coldeflist; /* list of ColumnDef nodes to describe - * result of function returning RECORD */ + List *coldeflist; /* list of ColumnDef nodes to describe result + * of function returning RECORD */ } RangeFunction; /* @@ -414,7 +414,7 @@ typedef struct InhRelation { NodeTag type; RangeVar *relation; - List *options; + List *options; } InhRelation; /* @@ -563,7 +563,7 @@ typedef struct RangeTblEntry */ Node *funcexpr; /* expression tree for func call */ List *funccoltypes; /* OID list of column type OIDs */ - List *funccoltypmods; /* integer list of column typmods */ + List *funccoltypmods; /* integer list of column typmods */ /* * Fields valid for a values RTE (else NIL): @@ -717,15 +717,15 @@ typedef struct SelectStmt /* * These fields are used only in "leaf" SelectStmts. * - * into, intoColNames, intoOptions, intoOnCommit, and - * intoTableSpaceName are a kluge; they belong somewhere else... + * into, intoColNames, intoOptions, intoOnCommit, and intoTableSpaceName + * are a kluge; they belong somewhere else... */ List *distinctClause; /* NULL, list of DISTINCT ON exprs, or * lcons(NIL,NIL) for all (SELECT DISTINCT) */ RangeVar *into; /* target table (for select into table) */ List *intoColNames; /* column names for into table */ List *intoOptions; /* options from WITH clause */ - OnCommitAction intoOnCommit; /* what do we do at COMMIT? */ + OnCommitAction intoOnCommit; /* what do we do at COMMIT? */ char *intoTableSpaceName; /* table space to use, or NULL */ List *targetList; /* the target list (of ResTarget) */ List *fromClause; /* the FROM clause */ @@ -735,11 +735,11 @@ typedef struct SelectStmt /* * In a "leaf" node representing a VALUES list, the above fields are all - * null, and instead this field is set. Note that the elements of - * the sublists are just expressions, without ResTarget decoration. - * Also note that a list element can be DEFAULT (represented as a - * SetToDefault node), regardless of the context of the VALUES list. - * It's up to parse analysis to reject that where not valid. + * null, and instead this field is set. Note that the elements of the + * sublists are just expressions, without ResTarget decoration. Also note + * that a list element can be DEFAULT (represented as a SetToDefault + * node), regardless of the context of the VALUES list. It's up to parse + * analysis to reject that where not valid. */ List *valuesLists; /* untransformed list of expression lists */ @@ -1014,7 +1014,7 @@ typedef struct GrantRoleStmt * Copy Statement * * We support "COPY relation FROM file", "COPY relation TO file", and - * "COPY (query) TO file". In any given CopyStmt, exactly one of "relation" + * "COPY (query) TO file". In any given CopyStmt, exactly one of "relation" * and "query" must be non-NULL. Note: "query" is a SelectStmt before * parse analysis, and a Query afterwards. * ---------------------- @@ -1055,7 +1055,8 @@ typedef struct CreateStmt char *tablespacename; /* table space to use, or NULL */ } CreateStmt; -typedef enum CreateStmtLikeOption { +typedef enum CreateStmtLikeOption +{ CREATE_TABLE_LIKE_INCLUDING_DEFAULTS, CREATE_TABLE_LIKE_EXCLUDING_DEFAULTS, CREATE_TABLE_LIKE_INCLUDING_CONSTRAINTS, @@ -1917,13 +1918,13 @@ typedef struct PrepareStmt typedef struct ExecuteStmt { - NodeTag type; - char *name; /* The name of the plan to execute */ - RangeVar *into; /* Optional table to store results in */ - List *intoOptions; /* Options from WITH clause */ - OnCommitAction into_on_commit; /* What do we do at COMMIT? */ - char *into_tbl_space; /* Tablespace to use, or NULL */ - List *params; /* Values to assign to parameters */ + NodeTag type; + char *name; /* The name of the plan to execute */ + RangeVar *into; /* Optional table to store results in */ + List *intoOptions; /* Options from WITH clause */ + OnCommitAction into_on_commit; /* What do we do at COMMIT? */ + char *into_tbl_space; /* Tablespace to use, or NULL */ + List *params; /* Values to assign to parameters */ } ExecuteStmt; diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index c84bab9287e..841d85336e7 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.116 2006/09/28 20:51:42 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.117 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -155,7 +155,7 @@ typedef struct Const * For historical reasons, such parameters are numbered from 0. * These numbers are independent of PARAM_EXTERN numbers. * - * PARAM_SUBLINK: The parameter represents an output column of a SubLink + * PARAM_SUBLINK: The parameter represents an output column of a SubLink * node's sub-select. The column number is contained in the * `paramid' field. (This type of Param is converted to * PARAM_EXEC during planning.) @@ -366,7 +366,7 @@ typedef struct BoolExpr * * NOTE: in the raw output of gram.y, testexpr contains just the raw form * of the lefthand expression (if any), and operName is the String name of - * the combining operator. Also, subselect is a raw parsetree. During parse + * the combining operator. Also, subselect is a raw parsetree. During parse * analysis, the parser transforms testexpr into a complete boolean expression * that compares the lefthand value(s) to PARAM_SUBLINK nodes representing the * output columns of the subselect. And subselect is transformed to a Query. diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 471d8e209e2..d39e924227f 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.127 2006/09/19 22:49:53 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.128 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -52,7 +52,7 @@ typedef struct QualCost * * This struct is conventionally called "root" in all the planner routines. * It holds links to all of the planner's working state, in addition to the - * original Query. Note that at present the planner extensively modifies + * original Query. Note that at present the planner extensively modifies * the passed-in Query data structure; someday that should stop. *---------- */ @@ -69,8 +69,8 @@ typedef struct PlannerInfo * does not correspond to a base relation, such as a join RTE or an * unreferenced view RTE; or if the RelOptInfo hasn't been made yet. */ - struct RelOptInfo **simple_rel_array; /* All 1-relation RelOptInfos */ - int simple_rel_array_size; /* allocated size of array */ + struct RelOptInfo **simple_rel_array; /* All 1-relation RelOptInfos */ + int simple_rel_array_size; /* allocated size of array */ /* * join_rel_list is a list of all join-relation RelOptInfos we have @@ -101,7 +101,7 @@ typedef struct PlannerInfo List *in_info_list; /* list of InClauseInfos */ - List *append_rel_list; /* list of AppendRelInfos */ + List *append_rel_list; /* list of AppendRelInfos */ List *query_pathkeys; /* desired pathkeys for query_planner(), and * actual pathkeys afterwards */ @@ -109,14 +109,14 @@ typedef struct PlannerInfo List *group_pathkeys; /* groupClause pathkeys, if any */ List *sort_pathkeys; /* sortClause pathkeys, if any */ - double total_table_pages; /* # of pages in all tables of query */ + double total_table_pages; /* # of pages in all tables of query */ double tuple_fraction; /* tuple_fraction passed to query_planner */ bool hasJoinRTEs; /* true if any RTEs are RTE_JOIN kind */ bool hasOuterJoins; /* true if any RTEs are outer joins */ bool hasHavingQual; /* true if havingQual was non-null */ - bool hasPseudoConstantQuals; /* true if any RestrictInfo has + bool hasPseudoConstantQuals; /* true if any RestrictInfo has * pseudoconstant = true */ } PlannerInfo; @@ -144,7 +144,7 @@ typedef struct PlannerInfo * Currently the only kind of otherrels are those made for member relations * of an "append relation", that is an inheritance set or UNION ALL subquery. * An append relation has a parent RTE that is a base rel, which represents - * the entire append relation. The member RTEs are otherrels. The parent + * the entire append relation. The member RTEs are otherrels. The parent * is present in the query join tree but the members are not. The member * RTEs and otherrels are used to plan the scans of the individual tables or * subqueries of the append set; then the parent baserel is given an Append @@ -736,7 +736,7 @@ typedef struct HashPath * * The pseudoconstant flag is set true if the clause contains no Vars of * the current query level and no volatile functions. Such a clause can be - * pulled out and used as a one-time qual in a gating Result node. We keep + * pulled out and used as a one-time qual in a gating Result node. We keep * pseudoconstant clauses in the same lists as other RestrictInfos so that * the regular clause-pushing machinery can assign them to the correct join * level, but they need to be treated specially for cost and selectivity @@ -757,7 +757,7 @@ typedef struct RestrictInfo bool can_join; /* see comment above */ - bool pseudoconstant; /* see comment above */ + bool pseudoconstant; /* see comment above */ /* The set of relids (varnos) actually referenced in the clause: */ Relids clause_relids; @@ -836,7 +836,7 @@ typedef struct InnerIndexscanInfo * Outer join info. * * One-sided outer joins constrain the order of joining partially but not - * completely. We flatten such joins into the planner's top-level list of + * completely. We flatten such joins into the planner's top-level list of * relations to join, but record information about each outer join in an * OuterJoinInfo struct. These structs are kept in the PlannerInfo node's * oj_info_list. @@ -925,57 +925,60 @@ typedef struct InClauseInfo typedef struct AppendRelInfo { NodeTag type; + /* - * These fields uniquely identify this append relationship. There - * can be (in fact, always should be) multiple AppendRelInfos for the - * same parent_relid, but never more than one per child_relid, since - * a given RTE cannot be a child of more than one append parent. + * These fields uniquely identify this append relationship. There can be + * (in fact, always should be) multiple AppendRelInfos for the same + * parent_relid, but never more than one per child_relid, since a given + * RTE cannot be a child of more than one append parent. */ Index parent_relid; /* RT index of append parent rel */ Index child_relid; /* RT index of append child rel */ + /* * For an inheritance appendrel, the parent and child are both regular * relations, and we store their rowtype OIDs here for use in translating - * whole-row Vars. For a UNION-ALL appendrel, the parent and child are + * whole-row Vars. For a UNION-ALL appendrel, the parent and child are * both subqueries with no named rowtype, and we store InvalidOid here. */ - Oid parent_reltype; /* OID of parent's composite type */ + Oid parent_reltype; /* OID of parent's composite type */ Oid child_reltype; /* OID of child's composite type */ /* - * The N'th element of this list is the integer column number of - * the child column corresponding to the N'th column of the parent. - * A list element is zero if it corresponds to a dropped column of the - * parent (this is only possible for inheritance cases, not UNION ALL). + * The N'th element of this list is the integer column number of the child + * column corresponding to the N'th column of the parent. A list element + * is zero if it corresponds to a dropped column of the parent (this is + * only possible for inheritance cases, not UNION ALL). */ List *col_mappings; /* list of child attribute numbers */ /* - * The N'th element of this list is a Var or expression representing - * the child column corresponding to the N'th column of the parent. - * This is used to translate Vars referencing the parent rel into - * references to the child. A list element is NULL if it corresponds - * to a dropped column of the parent (this is only possible for - * inheritance cases, not UNION ALL). + * The N'th element of this list is a Var or expression representing the + * child column corresponding to the N'th column of the parent. This is + * used to translate Vars referencing the parent rel into references to + * the child. A list element is NULL if it corresponds to a dropped + * column of the parent (this is only possible for inheritance cases, not + * UNION ALL). * * This might seem redundant with the col_mappings data, but it is handy - * because flattening of sub-SELECTs that are members of a UNION ALL - * will cause changes in the expressions that need to be substituted - * for a parent Var. Adjusting this data structure lets us track what - * really needs to be substituted. + * because flattening of sub-SELECTs that are members of a UNION ALL will + * cause changes in the expressions that need to be substituted for a + * parent Var. Adjusting this data structure lets us track what really + * needs to be substituted. * * Notice we only store entries for user columns (attno > 0). Whole-row - * Vars are special-cased, and system columns (attno < 0) need no - * special translation since their attnos are the same for all tables. + * Vars are special-cased, and system columns (attno < 0) need no special + * translation since their attnos are the same for all tables. * - * Caution: the Vars have varlevelsup = 0. Be careful to adjust - * as needed when copying into a subquery. + * Caution: the Vars have varlevelsup = 0. Be careful to adjust as needed + * when copying into a subquery. */ - List *translated_vars; /* Expressions in the child's Vars */ + List *translated_vars; /* Expressions in the child's Vars */ + /* - * We store the parent table's OID here for inheritance, or InvalidOid - * for UNION ALL. This is only needed to help in generating error - * messages if an attempt is made to reference a dropped parent column. + * We store the parent table's OID here for inheritance, or InvalidOid for + * UNION ALL. This is only needed to help in generating error messages if + * an attempt is made to reference a dropped parent column. */ Oid parent_reloid; /* OID of parent relation */ } AppendRelInfo; diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index ce61e261a95..63acf6b088d 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/cost.h,v 1.81 2006/09/25 22:12:24 tgl Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/cost.h,v 1.82 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ #define DEFAULT_CPU_INDEX_TUPLE_COST 0.005 #define DEFAULT_CPU_OPERATOR_COST 0.0025 -#define DEFAULT_EFFECTIVE_CACHE_SIZE 16384 /* measured in pages */ +#define DEFAULT_EFFECTIVE_CACHE_SIZE 16384 /* measured in pages */ /* @@ -56,7 +56,7 @@ extern bool constraint_exclusion; extern double clamp_row_est(double nrows); extern double index_pages_fetched(double tuples_fetched, BlockNumber pages, - double index_pages, PlannerInfo *root); + double index_pages, PlannerInfo *root); extern void cost_seqscan(Path *path, PlannerInfo *root, RelOptInfo *baserel); extern void cost_index(IndexPath *path, PlannerInfo *root, IndexOptInfo *index, List *indexQuals, RelOptInfo *outer_rel); @@ -71,7 +71,7 @@ extern void cost_subqueryscan(Path *path, RelOptInfo *baserel); extern void cost_functionscan(Path *path, PlannerInfo *root, RelOptInfo *baserel); extern void cost_valuesscan(Path *path, PlannerInfo *root, - RelOptInfo *baserel); + RelOptInfo *baserel); extern void cost_sort(Path *path, PlannerInfo *root, List *pathkeys, Cost input_cost, double tuples, int width); extern void cost_material(Path *path, diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index e6005094b78..f8aebd6a53a 100644 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/pathnode.h,v 1.71 2006/08/02 01:59:48 joe Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/pathnode.h,v 1.72 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -86,7 +86,7 @@ extern HashPath *create_hashjoin_path(PlannerInfo *root, * prototypes for relnode.c */ extern RelOptInfo *build_simple_rel(PlannerInfo *root, int relid, - RelOptKind reloptkind); + RelOptKind reloptkind); extern RelOptInfo *find_base_rel(PlannerInfo *root, int relid); extern RelOptInfo *find_join_rel(PlannerInfo *root, Relids relids); extern RelOptInfo *build_join_rel(PlannerInfo *root, diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index 173c7f846be..50ff6ac286d 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/plancat.h,v 1.41 2006/09/19 22:49:53 tgl Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/plancat.h,v 1.42 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,10 +18,10 @@ extern void get_relation_info(PlannerInfo *root, Oid relationObjectId, - bool inhparent, RelOptInfo *rel); + bool inhparent, RelOptInfo *rel); extern bool relation_excluded_by_constraints(RelOptInfo *rel, - RangeTblEntry *rte); + RangeTblEntry *rte); extern List *build_physical_tlist(PlannerInfo *root, RelOptInfo *rel); diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index 88e4aa56a79..544dc766e8c 100644 --- a/src/include/optimizer/prep.h +++ b/src/include/optimizer/prep.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/prep.h,v 1.56 2006/03/05 15:58:57 momjian Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/prep.h,v 1.57 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -51,8 +51,8 @@ extern void expand_inherited_tables(PlannerInfo *root); extern Node *adjust_appendrel_attrs(Node *node, AppendRelInfo *appinfo); extern Relids *adjust_appendrel_attr_needed(RelOptInfo *oldrel, - AppendRelInfo *appinfo, - AttrNumber new_min_attr, - AttrNumber new_max_attr); + AppendRelInfo *appinfo, + AttrNumber new_min_attr, + AttrNumber new_max_attr); #endif /* PREP_H */ diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h index 86add791604..db24c4989db 100644 --- a/src/include/optimizer/restrictinfo.h +++ b/src/include/optimizer/restrictinfo.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/restrictinfo.h,v 1.37 2006/07/01 18:38:33 tgl Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/restrictinfo.h,v 1.38 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,7 @@ extern List *make_restrictinfo_from_bitmapqual(Path *bitmapqual, extern bool restriction_is_or_clause(RestrictInfo *restrictinfo); extern List *get_actual_clauses(List *restrictinfo_list); extern List *extract_actual_clauses(List *restrictinfo_list, - bool pseudoconstant); + bool pseudoconstant); extern void extract_actual_join_clauses(List *restrictinfo_list, List **joinquals, List **otherquals); diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index 0b245c77e83..7866472f79e 100644 --- a/src/include/parser/analyze.h +++ b/src/include/parser/analyze.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/analyze.h,v 1.33 2006/04/30 18:30:40 tgl Exp $ + * $PostgreSQL: pgsql/src/include/parser/analyze.h,v 1.34 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,13 +17,13 @@ extern List *parse_analyze(Node *parseTree, const char *sourceText, - Oid *paramTypes, int numParams); + Oid *paramTypes, int numParams); extern List *parse_analyze_varparams(Node *parseTree, const char *sourceText, - Oid **paramTypes, int *numParams); + Oid **paramTypes, int *numParams); extern List *parse_sub_analyze(Node *parseTree, ParseState *parentParseState); extern List *analyzeCreateSchemaStmt(CreateSchemaStmt *stmt); extern void CheckSelectLocking(Query *qry); extern void applyLockingClause(Query *qry, Index rtindex, - bool forUpdate, bool noWait); + bool forUpdate, bool noWait); #endif /* ANALYZE_H */ diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index 84d119df762..e29a64d48f4 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_coerce.h,v 1.65 2006/07/26 19:31:51 tgl Exp $ + * $PostgreSQL: pgsql/src/include/parser/parse_coerce.h,v 1.66 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,7 +58,7 @@ extern Node *coerce_to_boolean(ParseState *pstate, Node *node, extern Node *coerce_to_integer(ParseState *pstate, Node *node, const char *constructName); extern Node *coerce_to_bigint(ParseState *pstate, Node *node, - const char *constructName); + const char *constructName); extern Oid select_common_type(List *typeids, const char *context); extern Node *coerce_to_common_type(ParseState *pstate, Node *node, diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index 486e5ea44da..a27c1249fff 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_func.h,v 1.56 2006/04/15 17:45:41 tgl Exp $ + * $PostgreSQL: pgsql/src/include/parser/parse_func.h,v 1.57 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -77,6 +77,6 @@ extern Oid LookupFuncName(List *funcname, int nargs, const Oid *argtypes, extern Oid LookupFuncNameTypeNames(List *funcname, List *argtypes, bool noError); extern Oid LookupAggNameTypeNames(List *aggname, List *argtypes, - bool noError); + bool noError); #endif /* PARSE_FUNC_H */ diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index 1a28d099546..2425022be61 100644 --- a/src/include/parser/parse_node.h +++ b/src/include/parser/parse_node.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_node.h,v 1.49 2006/04/30 18:30:40 tgl Exp $ + * $PostgreSQL: pgsql/src/include/parser/parse_node.h,v 1.50 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ * links to current parse state of outer query. * * p_sourcetext: source string that generated the raw parsetree being - * analyzed, or NULL if not available. (The string is used only to + * analyzed, or NULL if not available. (The string is used only to * generate cursor positions in error messages: we need it to convert * byte-wise locations in parse structures to character-wise cursor * positions.) @@ -71,8 +71,8 @@ typedef struct ParseState Oid *p_paramtypes; /* OIDs of types for $n parameter symbols */ int p_numparams; /* allocated size of p_paramtypes[] */ int p_next_resno; /* next targetlist resno to assign */ - List *p_locking_clause; /* raw FOR UPDATE/FOR SHARE info */ - Node *p_value_substitute; /* what to replace VALUE with, if any */ + List *p_locking_clause; /* raw FOR UPDATE/FOR SHARE info */ + Node *p_value_substitute; /* what to replace VALUE with, if any */ bool p_variableparams; bool p_hasAggs; bool p_hasSubLinks; diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h index 33e54ef01e0..1141b07c1be 100644 --- a/src/include/parser/parse_oper.h +++ b/src/include/parser/parse_oper.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_oper.h,v 1.39 2006/03/14 22:48:22 tgl Exp $ + * $PostgreSQL: pgsql/src/include/parser/parse_oper.h,v 1.40 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,26 +22,26 @@ typedef HeapTuple Operator; /* Routines to look up an operator given name and exact input type(s) */ extern Oid LookupOperName(ParseState *pstate, List *opername, - Oid oprleft, Oid oprright, - bool noError, int location); + Oid oprleft, Oid oprright, + bool noError, int location); extern Oid LookupOperNameTypeNames(ParseState *pstate, List *opername, - TypeName *oprleft, TypeName *oprright, - bool noError, int location); + TypeName *oprleft, TypeName *oprright, + bool noError, int location); /* Routines to find operators matching a name and given input types */ /* NB: the selected operator may require coercion of the input types! */ extern Operator oper(ParseState *pstate, List *op, Oid arg1, Oid arg2, - bool noError, int location); + bool noError, int location); extern Operator right_oper(ParseState *pstate, List *op, Oid arg, - bool noError, int location); + bool noError, int location); extern Operator left_oper(ParseState *pstate, List *op, Oid arg, - bool noError, int location); + bool noError, int location); /* Routines to find operators that DO NOT require coercion --- ie, their */ /* input types are either exactly as given, or binary-compatible */ extern Operator compatible_oper(ParseState *pstate, List *op, - Oid arg1, Oid arg2, - bool noError, int location); + Oid arg1, Oid arg2, + bool noError, int location); /* currently no need for compatible_left_oper/compatible_right_oper */ diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 9e2df63c54a..fdd4cf5fe1d 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_relation.h,v 1.54 2006/08/02 01:59:48 joe Exp $ + * $PostgreSQL: pgsql/src/include/parser/parse_relation.h,v 1.55 2006/10/04 00:30:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,7 +33,7 @@ extern RangeTblEntry *GetRTEByRangeTablePosn(ParseState *pstate, extern Node *scanRTEForColumn(ParseState *pstate, RangeTblEntry *rte, char *colname, int location); extern Node *colNameToVar(ParseState *pstate, char *colname, bool localonly, - int location); + int location); extern Node *qualifiedNameToVar(ParseState *pstate, char *schemaname, char *refname, @@ -73,7 +73,7 @@ extern void addRTEtoQuery(ParseState *pstate, RangeTblEntry *rte, bool addToJoinList, bool addToRelNameSpace, bool addToVarNameSpace); extern RangeTblEntry *addImplicitRTE(ParseState *pstate, RangeVar *relation, - int location); + int location); extern void expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up, bool include_dropped, List **colnames, List **colvars); diff --git a/src/include/pg_trace.h b/src/include/pg_trace.h index 6c35cb2e8dd..77862ff0e37 100644 --- a/src/include/pg_trace.h +++ b/src/include/pg_trace.h @@ -5,7 +5,7 @@ * * Copyright (c) 2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/pg_trace.h,v 1.1 2006/07/24 16:32:45 petere Exp $ + * $PostgreSQL: pgsql/src/include/pg_trace.h,v 1.2 2006/10/04 00:30:06 momjian Exp $ * ---------- */ @@ -21,7 +21,7 @@ * * Only one DTrace provider called "postgresql" will be used for PostgreSQL, * so the name is hard-coded here to avoid having to specify it in the - * source code. + * source code. */ #define PG_TRACE(name) \ @@ -36,8 +36,7 @@ DTRACE_PROBE4(postgresql, name, arg1, arg2, arg3, arg4) #define PG_TRACE5(name, arg1, arg2, arg3, arg4, arg5) \ DTRACE_PROBE5(postgresql, name, arg1, arg2, arg3, arg4, arg5) - -#else /* not ENABLE_DTRACE */ +#else /* not ENABLE_DTRACE */ /* * Unless DTrace is explicitly enabled with --enable-dtrace, the PG_TRACE @@ -50,7 +49,6 @@ #define PG_TRACE3(name, arg1, arg2, arg3) #define PG_TRACE4(name, arg1, arg2, arg3, arg4) #define PG_TRACE5(name, arg1, arg2, arg3, arg4, arg5) +#endif /* not ENABLE_DTRACE */ -#endif /* not ENABLE_DTRACE */ - -#endif /* PG_TRACE_H */ +#endif /* PG_TRACE_H */ diff --git a/src/include/pgstat.h b/src/include/pgstat.h index 35614eaa2d2..8f5db770795 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -5,7 +5,7 @@ * * Copyright (c) 2001-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/pgstat.h,v 1.49 2006/08/19 01:36:34 tgl Exp $ + * $PostgreSQL: pgsql/src/include/pgstat.h,v 1.50 2006/10/04 00:30:06 momjian Exp $ * ---------- */ #ifndef PGSTAT_H @@ -205,8 +205,8 @@ typedef struct PgStat_MsgAnalyze PgStat_MsgHdr m_hdr; Oid m_databaseid; Oid m_tableoid; - bool m_autovacuum; - TimestampTz m_analyzetime; + bool m_autovacuum; + TimestampTz m_analyzetime; PgStat_Counter m_live_tuples; PgStat_Counter m_dead_tuples; } PgStat_MsgAnalyze; @@ -285,10 +285,10 @@ typedef struct PgStat_StatTabEntry PgStat_Counter blocks_fetched; PgStat_Counter blocks_hit; - TimestampTz vacuum_timestamp; /* user initiated vacuum */ - TimestampTz autovac_vacuum_timestamp; /* autovacuum initiated */ - TimestampTz analyze_timestamp; /* user initiated */ - TimestampTz autovac_analyze_timestamp; /* autovacuum initiated */ + TimestampTz vacuum_timestamp; /* user initiated vacuum */ + TimestampTz autovac_vacuum_timestamp; /* autovacuum initiated */ + TimestampTz analyze_timestamp; /* user initiated */ + TimestampTz autovac_analyze_timestamp; /* autovacuum initiated */ } PgStat_StatTabEntry; @@ -314,8 +314,8 @@ typedef struct PgBackendStatus /* * To avoid locking overhead, we use the following protocol: a backend * increments st_changecount before modifying its entry, and again after - * finishing a modification. A would-be reader should note the value - * of st_changecount, copy the entry into private memory, then check + * finishing a modification. A would-be reader should note the value of + * st_changecount, copy the entry into private memory, then check * st_changecount again. If the value hasn't changed, and if it's even, * the copy is valid; otherwise start over. This makes updates cheap * while reads are potentially expensive, but that's the tradeoff we want. diff --git a/src/include/port.h b/src/include/port.h index cf3694f4f52..c3204184769 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/port.h,v 1.103 2006/10/03 22:18:23 tgl Exp $ + * $PostgreSQL: pgsql/src/include/port.h,v 1.104 2006/10/04 00:30:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -97,22 +97,22 @@ extern int find_other_exec(const char *argv0, const char *target, * * Generated using Win32 "CMD /?": * - * 1. If all of the following conditions are met, then quote characters - * on the command line are preserved: + * 1. If all of the following conditions are met, then quote characters + * on the command line are preserved: * - * - no /S switch - * - exactly two quote characters - * - no special characters between the two quote characters, where special - * is one of: &<>()@^| - * - there are one or more whitespace characters between the the two quote - * characters - * - the string between the two quote characters is the name of an - * executable file. + * - no /S switch + * - exactly two quote characters + * - no special characters between the two quote characters, where special + * is one of: &<>()@^| + * - there are one or more whitespace characters between the the two quote + * characters + * - the string between the two quote characters is the name of an + * executable file. * - * 2. Otherwise, old behavior is to see if the first character is a quote - * character and if so, strip the leading character and remove the last - * quote character on the command line, preserving any text after the last - * quote character. + * 2. Otherwise, old behavior is to see if the first character is a quote + * character and if so, strip the leading character and remove the last + * quote character on the command line, preserving any text after the last + * quote character. */ #if defined(WIN32) && !defined(__CYGWIN__) #define SYSTEMQUOTE "\"" @@ -133,7 +133,7 @@ extern unsigned char pg_tolower(unsigned char ch); /* * Versions of libintl >= 0.13 try to replace printf() and friends with - * macros to their own versions that understand the %$ format. We do the + * macros to their own versions that understand the %$ format. We do the * same, so disable their macros, if they exist. */ #ifdef vsnprintf @@ -188,8 +188,7 @@ __attribute__((format(printf, 1, 2))); #define fprintf pg_fprintf #define printf pg_printf #endif - -#endif /* USE_REPL_SNPRINTF */ +#endif /* USE_REPL_SNPRINTF */ /* Portable prompt handling */ extern char *simple_prompt(const char *prompt, int maxlen, bool echo); @@ -272,7 +271,7 @@ extern int pgwin32_open(const char *, int,...); extern FILE *pgwin32_fopen(const char *, const char *); #ifndef FRONTEND -#define open(a,b,c) pgwin32_open(a,b,c) +#define open(a,b,c) pgwin32_open(a,b,c) #define fopen(a,b) pgwin32_fopen(a,b) #endif @@ -367,6 +366,6 @@ extern int pqGethostbyname(const char *name, typedef int (*qsort_arg_comparator) (const void *a, const void *b, void *arg); extern void qsort_arg(void *base, size_t nel, size_t elsize, - qsort_arg_comparator cmp, void *arg); + qsort_arg_comparator cmp, void *arg); -#endif /* PG_PORT_H */ +#endif /* PG_PORT_H */ diff --git a/src/include/port/darwin.h b/src/include/port/darwin.h index e52a8726817..ff3e2193230 100644 --- a/src/include/port/darwin.h +++ b/src/include/port/darwin.h @@ -1,7 +1,8 @@ -/* $PostgreSQL: pgsql/src/include/port/darwin.h,v 1.10 2006/03/11 04:38:38 momjian Exp $ */ +/* $PostgreSQL: pgsql/src/include/port/darwin.h,v 1.11 2006/10/04 00:30:09 momjian Exp $ */ #define __darwin__ 1 #if HAVE_DECL_F_FULLFSYNC /* not present before OS X 10.3 */ #define HAVE_FSYNC_WRITETHROUGH + #endif diff --git a/src/include/port/linux.h b/src/include/port/linux.h index a4d8f247bc2..05cba063a91 100644 --- a/src/include/port/linux.h +++ b/src/include/port/linux.h @@ -1,2 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/linux.h,v 1.41 2006/03/11 04:38:38 momjian Exp $ */ - +/* $PostgreSQL: pgsql/src/include/port/linux.h,v 1.42 2006/10/04 00:30:09 momjian Exp $ */ diff --git a/src/include/port/netbsd.h b/src/include/port/netbsd.h index 59b78cccd3c..9f1666b71a2 100644 --- a/src/include/port/netbsd.h +++ b/src/include/port/netbsd.h @@ -1,2 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/netbsd.h,v 1.15 2006/03/11 04:38:38 momjian Exp $ */ - +/* $PostgreSQL: pgsql/src/include/port/netbsd.h,v 1.16 2006/10/04 00:30:10 momjian Exp $ */ diff --git a/src/include/port/win32.h b/src/include/port/win32.h index f5e17aae3ec..e3bc767689a 100644 --- a/src/include/port/win32.h +++ b/src/include/port/win32.h @@ -1,7 +1,7 @@ -/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.61 2006/10/03 20:33:20 tgl Exp $ */ +/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.62 2006/10/04 00:30:10 momjian Exp $ */ #if defined(_MSC_VER) || defined(__BORLANDC__) -#define WIN32_ONLY_COMPILER +#define WIN32_ONLY_COMPILER #endif /* undefine and redefine after #include */ @@ -17,7 +17,7 @@ #include <signal.h> #include <errno.h> #include <direct.h> -#include <sys/utime.h> /* for non-unicode version */ +#include <sys/utime.h> /* for non-unicode version */ #undef near /* Must be here to avoid conflicting with prototype in windows.h */ @@ -46,7 +46,6 @@ #else /* not BUILDING_DLL */ #define DLLIMPORT __declspec (dllimport) #endif - #else /* not CYGWIN, not MSVC, not MingW */ #define DLLIMPORT @@ -166,7 +165,7 @@ struct itimerval struct timeval it_interval; struct timeval it_value; }; -int setitimer(int which, const struct itimerval *value, struct itimerval *ovalue); +int setitimer(int which, const struct itimerval * value, struct itimerval * ovalue); /* @@ -293,4 +292,5 @@ typedef unsigned short mode_t; /* Pulled from Makefile.port in mingw */ #define DLSUFFIX ".dll" + #endif diff --git a/src/include/port/win32/dlfcn.h b/src/include/port/win32/dlfcn.h index 55a59c202bd..e508867a6f7 100644 --- a/src/include/port/win32/dlfcn.h +++ b/src/include/port/win32/dlfcn.h @@ -1,3 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32/dlfcn.h,v 1.3 2006/03/11 04:38:38 momjian Exp $ */ - - +/* $PostgreSQL: pgsql/src/include/port/win32/dlfcn.h,v 1.4 2006/10/04 00:30:10 momjian Exp $ */ diff --git a/src/include/port/win32/grp.h b/src/include/port/win32/grp.h index 162734f4408..c9bc172547f 100644 --- a/src/include/port/win32/grp.h +++ b/src/include/port/win32/grp.h @@ -1,3 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32/grp.h,v 1.3 2006/03/11 04:38:38 momjian Exp $ */ - - +/* $PostgreSQL: pgsql/src/include/port/win32/grp.h,v 1.4 2006/10/04 00:30:10 momjian Exp $ */ diff --git a/src/include/port/win32/netdb.h b/src/include/port/win32/netdb.h index 0243e3eefbf..e88e30f8e66 100644 --- a/src/include/port/win32/netdb.h +++ b/src/include/port/win32/netdb.h @@ -1,2 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32/netdb.h,v 1.3 2006/03/11 04:38:38 momjian Exp $ */ - +/* $PostgreSQL: pgsql/src/include/port/win32/netdb.h,v 1.4 2006/10/04 00:30:10 momjian Exp $ */ diff --git a/src/include/port/win32/sys/socket.h b/src/include/port/win32/sys/socket.h index beec4e2f860..97a50417991 100644 --- a/src/include/port/win32/sys/socket.h +++ b/src/include/port/win32/sys/socket.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/include/port/win32/sys/socket.h,v 1.6 2006/07/16 01:35:28 tgl Exp $ + * $PostgreSQL: pgsql/src/include/port/win32/sys/socket.h,v 1.7 2006/10/04 00:30:10 momjian Exp $ */ #ifndef WIN32_SYS_SOCKET_H #define WIN32_SYS_SOCKET_H @@ -29,4 +29,4 @@ */ #undef gai_strerror -#endif /* WIN32_SYS_SOCKET_H */ +#endif /* WIN32_SYS_SOCKET_H */ diff --git a/src/include/port/win32_msvc/dirent.h b/src/include/port/win32_msvc/dirent.h index e44a602c3b6..422691aca2d 100644 --- a/src/include/port/win32_msvc/dirent.h +++ b/src/include/port/win32_msvc/dirent.h @@ -1,21 +1,23 @@ /* * Headers for port/dirent.c, win32 native implementation of dirent functions * - * $PostgreSQL: pgsql/src/include/port/win32_msvc/dirent.h,v 1.2 2006/06/26 12:59:44 momjian Exp $ + * $PostgreSQL: pgsql/src/include/port/win32_msvc/dirent.h,v 1.3 2006/10/04 00:30:10 momjian Exp $ */ #ifndef _WIN32VC_DIRENT_H #define _WIN32VC_DIRENT_H -struct dirent { - long d_ino; +struct dirent +{ + long d_ino; unsigned short d_reclen; unsigned short d_namlen; - char d_name[MAX_PATH]; + char d_name[MAX_PATH]; }; typedef struct DIR DIR; -DIR* opendir(const char *); -struct dirent* readdir(DIR *); -int closedir(DIR*); +DIR *opendir(const char *); +struct dirent *readdir(DIR *); +int closedir(DIR *); + #endif diff --git a/src/include/port/win32_msvc/sys/file.h b/src/include/port/win32_msvc/sys/file.h index 8adc35c6e08..c9c080f9583 100644 --- a/src/include/port/win32_msvc/sys/file.h +++ b/src/include/port/win32_msvc/sys/file.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32_msvc/sys/file.h,v 1.2 2006/06/26 12:52:12 momjian Exp $ */ +/* $PostgreSQL: pgsql/src/include/port/win32_msvc/sys/file.h,v 1.3 2006/10/04 00:30:10 momjian Exp $ */ diff --git a/src/include/port/win32_msvc/sys/param.h b/src/include/port/win32_msvc/sys/param.h index 02282288806..a09b35a1695 100644 --- a/src/include/port/win32_msvc/sys/param.h +++ b/src/include/port/win32_msvc/sys/param.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32_msvc/sys/param.h,v 1.2 2006/06/26 12:52:12 momjian Exp $ */ +/* $PostgreSQL: pgsql/src/include/port/win32_msvc/sys/param.h,v 1.3 2006/10/04 00:30:10 momjian Exp $ */ diff --git a/src/include/port/win32_msvc/sys/time.h b/src/include/port/win32_msvc/sys/time.h index cb1a65a9798..6fc2ab7f536 100644 --- a/src/include/port/win32_msvc/sys/time.h +++ b/src/include/port/win32_msvc/sys/time.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32_msvc/sys/time.h,v 1.2 2006/06/26 12:52:12 momjian Exp $ */ +/* $PostgreSQL: pgsql/src/include/port/win32_msvc/sys/time.h,v 1.3 2006/10/04 00:30:10 momjian Exp $ */ diff --git a/src/include/port/win32_msvc/unistd.h b/src/include/port/win32_msvc/unistd.h index d3214b57ee9..f5290aeafae 100644 --- a/src/include/port/win32_msvc/unistd.h +++ b/src/include/port/win32_msvc/unistd.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32_msvc/unistd.h,v 1.2 2006/06/26 12:52:12 momjian Exp $ */ +/* $PostgreSQL: pgsql/src/include/port/win32_msvc/unistd.h,v 1.3 2006/10/04 00:30:10 momjian Exp $ */ diff --git a/src/include/port/win32_msvc/utime.h b/src/include/port/win32_msvc/utime.h index b13c26023b7..006c6a8396f 100644 --- a/src/include/port/win32_msvc/utime.h +++ b/src/include/port/win32_msvc/utime.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32_msvc/utime.h,v 1.2 2006/06/26 12:52:12 momjian Exp $ */ +/* $PostgreSQL: pgsql/src/include/port/win32_msvc/utime.h,v 1.3 2006/10/04 00:30:10 momjian Exp $ */ diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h index ff0e0bb7101..404fb2f9558 100644 --- a/src/include/storage/freespace.h +++ b/src/include/storage/freespace.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/freespace.h,v 1.22 2006/09/21 20:31:22 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/freespace.h,v 1.23 2006/10/04 00:30:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -115,7 +115,7 @@ struct FSMRelation FSMRelation *priorPhysical; /* prior rel in arena-storage order */ bool isIndex; /* if true, we store only page numbers */ Size avgRequest; /* moving average of space requests */ - BlockNumber interestingPages; /* # of pages with useful free space */ + BlockNumber interestingPages; /* # of pages with useful free space */ int firstChunk; /* chunk # of my first chunk in arena */ int storedPages; /* # of pages stored in arena */ int nextPage; /* index (from 0) to start next search at */ @@ -142,15 +142,15 @@ extern BlockNumber RecordAndGetPageWithFreeSpace(RelFileNode *rel, Size spaceNeeded); extern Size GetAvgFSMRequestSize(RelFileNode *rel); extern void RecordRelationFreeSpace(RelFileNode *rel, - BlockNumber interestingPages, - int nPages, - PageFreeSpaceInfo *pageSpaces); + BlockNumber interestingPages, + int nPages, + PageFreeSpaceInfo *pageSpaces); extern BlockNumber GetFreeIndexPage(RelFileNode *rel); extern void RecordIndexFreeSpace(RelFileNode *rel, - BlockNumber interestingPages, - int nPages, - BlockNumber *pages); + BlockNumber interestingPages, + int nPages, + BlockNumber *pages); extern void FreeSpaceMapTruncateRel(RelFileNode *rel, BlockNumber nblocks); extern void FreeSpaceMapForgetRel(RelFileNode *rel); diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 9717c3f2558..6b91acc3eaa 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.100 2006/09/22 23:20:14 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.101 2006/10/04 00:30:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -82,7 +82,7 @@ typedef struct LockMethodData int numLockModes; bool transactional; const LOCKMASK *conflictTab; - const char * const *lockModeNames; + const char *const * lockModeNames; const bool *trace_flag; } LockMethodData; diff --git a/src/include/storage/pg_sema.h b/src/include/storage/pg_sema.h index 65a482468d3..91f6cf78ed9 100644 --- a/src/include/storage/pg_sema.h +++ b/src/include/storage/pg_sema.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/pg_sema.h,v 1.9 2006/04/29 16:34:41 momjian Exp $ + * $PostgreSQL: pgsql/src/include/storage/pg_sema.h,v 1.10 2006/10/04 00:30:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,7 +56,7 @@ typedef struct PGSemaphoreData #ifdef USE_WIN32_SEMAPHORES -typedef HANDLE PGSemaphoreData; +typedef HANDLE PGSemaphoreData; #endif typedef PGSemaphoreData *PGSemaphore; diff --git a/src/include/storage/pg_shmem.h b/src/include/storage/pg_shmem.h index 47f6709a674..52de6a94048 100644 --- a/src/include/storage/pg_shmem.h +++ b/src/include/storage/pg_shmem.h @@ -17,7 +17,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/pg_shmem.h,v 1.19 2006/08/01 19:03:11 momjian Exp $ + * $PostgreSQL: pgsql/src/include/storage/pg_shmem.h,v 1.20 2006/10/04 00:30:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -54,7 +54,7 @@ extern void PGSharedMemoryDetach(void); extern void RegisterAddinContext(const char *name, Size size); extern Size AddinShmemSize(void); -extern void InitAddinContexts(void * start); +extern void InitAddinContexts(void *start); extern void *ShmemAllocFromContext(Size size, const char *name); extern void ShmemResetContext(const char *name); diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 0345b42f977..005716dc09d 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/proc.h,v 1.90 2006/07/30 02:07:18 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/storage/proc.h,v 1.91 2006/10/04 00:30:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -75,7 +75,7 @@ struct PGPROC Oid roleId; /* OID of role using this backend */ bool inVacuum; /* true if current xact is a LAZY VACUUM */ - + /* Info about LWLock the process is currently waiting for, if any. */ bool lwWaiting; /* true if waiting for an LW lock */ bool lwExclusive; /* true if waiting for exclusive access */ diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index a2913e95a15..e6637edeb7f 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.83 2006/09/08 15:55:53 tgl Exp $ + * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.84 2006/10/04 00:30:10 momjian Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -68,7 +68,7 @@ extern int check_log_duration(char *msec_str, bool was_logged); extern void set_debug_options(int debug_flag, GucContext context, GucSource source); extern bool set_plan_disabling_options(const char *arg, - GucContext context, GucSource source); + GucContext context, GucSource source); extern const char *get_stats_option_name(const char *arg); #endif /* TCOPPROT_H */ diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index 56226b42162..5232b2b40a2 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/acl.h,v 1.97 2006/09/05 21:08:36 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/acl.h,v 1.98 2006/10/04 00:30:10 momjian Exp $ * * NOTES * An ACL array is simply an array of AclItems, representing the union @@ -193,13 +193,13 @@ typedef enum AclObjectKind */ typedef struct { - bool is_grant; + bool is_grant; GrantObjectType objtype; - List *objects; - bool all_privs; - AclMode privileges; - List *grantees; - bool grant_option; + List *objects; + bool all_privs; + AclMode privileges; + List *grantees; + bool grant_option; DropBehavior behavior; } InternalGrant; diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index 6c1ad164e33..cbd6d9945a4 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/catcache.h,v 1.61 2006/07/13 18:01:02 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/catcache.h,v 1.62 2006/10/04 00:30:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,7 +76,7 @@ typedef struct catctup /* * Each tuple in a cache is a member of a Dllist that stores the elements - * of its hash bucket. We keep each Dllist in LRU order to speed repeated + * of its hash bucket. We keep each Dllist in LRU order to speed repeated * lookups. */ Dlelem cache_elem; /* list member of per-bucket list */ diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h index c682cf03295..5582b88ee66 100644 --- a/src/include/utils/hsearch.h +++ b/src/include/utils/hsearch.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/hsearch.h,v 1.44 2006/07/22 23:04:39 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/hsearch.h,v 1.45 2006/10/04 00:30:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -64,7 +64,7 @@ typedef struct HTAB HTAB; /* Only those fields indicated by hash_flags need be set */ typedef struct HASHCTL { - long num_partitions; /* # partitions (must be power of 2) */ + long num_partitions; /* # partitions (must be power of 2) */ long ssize; /* segment size */ long dsize; /* (initial) directory size */ long max_dsize; /* limit to dsize if dir size is limited */ @@ -125,8 +125,8 @@ extern void *hash_search(HTAB *hashp, const void *keyPtr, HASHACTION action, bool *foundPtr); extern uint32 get_hash_value(HTAB *hashp, const void *keyPtr); extern void *hash_search_with_hash_value(HTAB *hashp, const void *keyPtr, - uint32 hashvalue, HASHACTION action, - bool *foundPtr); + uint32 hashvalue, HASHACTION action, + bool *foundPtr); extern long hash_get_num_entries(HTAB *hashp); extern void hash_seq_init(HASH_SEQ_STATUS *status, HTAB *hashp); extern void *hash_seq_search(HASH_SEQ_STATUS *status); diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index 208cba30476..69eb31bcc55 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/lsyscache.h,v 1.106 2006/09/28 20:51:43 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/lsyscache.h,v 1.107 2006/10/04 00:30:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,7 +34,7 @@ extern void get_op_opclass_properties(Oid opno, Oid opclass, extern Oid get_opclass_member(Oid opclass, Oid subtype, int16 strategy); extern Oid get_op_hash_function(Oid opno); extern void get_op_btree_interpretation(Oid opno, - List **opclasses, List **opstrats); + List **opclasses, List **opstrats); extern Oid get_opclass_proc(Oid opclass, Oid subtype, int16 procnum); extern char *get_attname(Oid relid, AttrNumber attnum); extern char *get_relid_attribute_name(Oid relid, AttrNumber attnum); diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index a377b0ca21a..3a4e9f4e478 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -39,7 +39,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.70 2006/09/07 22:52:01 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.71 2006/10/04 00:30:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -176,7 +176,7 @@ typedef struct PortalData long portalPos; /* Presentation data, primarily used by the pg_cursors system view */ - TimestampTz creation_time; /* time at which this portal was defined */ + TimestampTz creation_time; /* time at which this portal was defined */ bool visible; /* include this portal in pg_cursors? */ } PortalData; diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index 7bb1b270a49..1f7347c9cdc 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/rel.h,v 1.91 2006/07/03 22:45:41 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/rel.h,v 1.92 2006/10/04 00:30:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -156,8 +156,8 @@ typedef struct RelationData /* * rd_options is set whenever rd_rel is loaded into the relcache entry. - * Note that you can NOT look into rd_rel for this data. NULL means - * "use defaults". + * Note that you can NOT look into rd_rel for this data. NULL means "use + * defaults". */ bytea *rd_options; /* parsed pg_class.reloptions */ @@ -179,7 +179,7 @@ typedef struct RelationData * Note: rd_amcache is available for index AMs to cache private data about * an index. This must be just a cache since it may get reset at any time * (in particular, it will get reset by a relcache inval message for the - * index). If used, it must point to a single memory chunk palloc'd in + * index). If used, it must point to a single memory chunk palloc'd in * rd_indexcxt. A relcache reset will include freeing that chunk and * setting rd_amcache = NULL. */ @@ -218,8 +218,8 @@ typedef Relation *RelationPtr; */ typedef struct StdRdOptions { - int32 vl_len; /* required to be a bytea */ - int fillfactor; /* page fill factor in percent (0..100) */ + int32 vl_len; /* required to be a bytea */ + int fillfactor; /* page fill factor in percent (0..100) */ } StdRdOptions; #define HEAP_MIN_FILLFACTOR 10 diff --git a/src/include/utils/resowner.h b/src/include/utils/resowner.h index 83e17e4184a..fd88be99694 100644 --- a/src/include/utils/resowner.h +++ b/src/include/utils/resowner.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/resowner.h,v 1.8 2006/07/13 18:01:02 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/resowner.h,v 1.9 2006/10/04 00:30:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -109,8 +109,8 @@ extern void ResourceOwnerForgetRelationRef(ResourceOwner owner, /* support for tupledesc refcount management */ extern void ResourceOwnerEnlargeTupleDescs(ResourceOwner owner); extern void ResourceOwnerRememberTupleDesc(ResourceOwner owner, - TupleDesc tupdesc); + TupleDesc tupdesc); extern void ResourceOwnerForgetTupleDesc(ResourceOwner owner, - TupleDesc tupdesc); + TupleDesc tupdesc); #endif /* RESOWNER_H */ diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index aea2501ca39..69a22b37b56 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/selfuncs.h,v 1.35 2006/09/20 19:50:21 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/selfuncs.h,v 1.36 2006/10/04 00:30:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -98,21 +98,21 @@ typedef enum /* selfuncs.c */ extern void examine_variable(PlannerInfo *root, Node *node, int varRelid, - VariableStatData *vardata); + VariableStatData *vardata); extern bool get_restriction_variable(PlannerInfo *root, List *args, - int varRelid, - VariableStatData *vardata, Node **other, - bool *varonleft); + int varRelid, + VariableStatData *vardata, Node **other, + bool *varonleft); extern void get_join_variables(PlannerInfo *root, List *args, - VariableStatData *vardata1, - VariableStatData *vardata2); + VariableStatData *vardata1, + VariableStatData *vardata2); extern double get_variable_numdistinct(VariableStatData *vardata); extern double mcv_selectivity(VariableStatData *vardata, FmgrInfo *opproc, - Datum constval, bool varonleft, - double *sumcommonp); + Datum constval, bool varonleft, + double *sumcommonp); extern double histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc, - Datum constval, bool varonleft, - int min_hist_size, int n_skip); + Datum constval, bool varonleft, + int min_hist_size, int n_skip); extern Pattern_Prefix_Status pattern_fixed_prefix(Const *patt, Pattern_Type ptype, @@ -151,13 +151,13 @@ extern Selectivity booltestsel(PlannerInfo *root, BoolTestType booltesttype, extern Selectivity nulltestsel(PlannerInfo *root, NullTestType nulltesttype, Node *arg, int varRelid); extern Selectivity scalararraysel(PlannerInfo *root, - ScalarArrayOpExpr *clause, - bool is_join_clause, - int varRelid, JoinType jointype); + ScalarArrayOpExpr *clause, + bool is_join_clause, + int varRelid, JoinType jointype); extern int estimate_array_length(Node *arrayexpr); extern Selectivity rowcomparesel(PlannerInfo *root, - RowCompareExpr *clause, - int varRelid, JoinType jointype); + RowCompareExpr *clause, + int varRelid, JoinType jointype); extern void mergejoinscansel(PlannerInfo *root, Node *clause, Selectivity *leftscan, diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index 45a74207514..0c6e59cc92f 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.63 2006/09/05 01:13:40 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.64 2006/10/04 00:30:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -160,7 +160,6 @@ typedef int32 fsec_t; #else typedef double fsec_t; - #endif /* @@ -305,7 +304,7 @@ extern Datum pgsql_postmaster_start_time(PG_FUNCTION_ARGS); extern TimestampTz GetCurrentTimestamp(void); extern void TimestampDifference(TimestampTz start_time, TimestampTz stop_time, - long *secs, int *microsecs); + long *secs, int *microsecs); extern TimestampTz time_t_to_timestamptz(time_t tm); extern time_t timestamptz_to_time_t(TimestampTz t); diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index 394895d6011..5f1fbc925cd 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/tqual.h,v 1.63 2006/09/03 15:59:39 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/tqual.h,v 1.64 2006/10/04 00:30:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -42,6 +42,7 @@ typedef struct SnapshotData /* note: all ids in xip[] satisfy xmin <= xip[i] < xmax */ int32 subxcnt; /* # of xact ids in subxip[], -1 if overflow */ TransactionId *subxip; /* array of subxact IDs in progress */ + /* * note: all ids in subxip[] are >= xmin, but we don't bother filtering * out any that are >= xmax diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h index ef33237318e..de70401d989 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/tuplesort.h,v 1.22 2006/07/13 16:49:20 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/tuplesort.h,v 1.23 2006/10/04 00:30:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -56,7 +56,7 @@ extern Tuplesortstate *tuplesort_begin_datum(Oid datumType, int workMem, bool randomAccess); extern void tuplesort_puttupleslot(Tuplesortstate *state, - TupleTableSlot *slot); + TupleTableSlot *slot); extern void tuplesort_putindextuple(Tuplesortstate *state, IndexTuple tuple); extern void tuplesort_putdatum(Tuplesortstate *state, Datum val, bool isNull); @@ -64,9 +64,9 @@ extern void tuplesort_putdatum(Tuplesortstate *state, Datum val, extern void tuplesort_performsort(Tuplesortstate *state); extern bool tuplesort_gettupleslot(Tuplesortstate *state, bool forward, - TupleTableSlot *slot); + TupleTableSlot *slot); extern IndexTuple tuplesort_getindextuple(Tuplesortstate *state, bool forward, - bool *should_free); + bool *should_free); extern bool tuplesort_getdatum(Tuplesortstate *state, bool forward, Datum *val, bool *isNull); diff --git a/src/include/utils/tuplestore.h b/src/include/utils/tuplestore.h index 62279344144..5aeaa4d11e4 100644 --- a/src/include/utils/tuplestore.h +++ b/src/include/utils/tuplestore.h @@ -22,7 +22,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/tuplestore.h,v 1.18 2006/06/27 02:51:40 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/tuplestore.h,v 1.19 2006/10/04 00:30:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,7 +47,7 @@ extern Tuplestorestate *tuplestore_begin_heap(bool randomAccess, int maxKBytes); extern void tuplestore_puttupleslot(Tuplestorestate *state, - TupleTableSlot *slot); + TupleTableSlot *slot); extern void tuplestore_puttuple(Tuplestorestate *state, HeapTuple tuple); /* tuplestore_donestoring() used to be required, but is no longer used */ @@ -55,7 +55,7 @@ extern void tuplestore_puttuple(Tuplestorestate *state, HeapTuple tuple); /* backwards scan is only allowed if randomAccess was specified 'true' */ extern bool tuplestore_gettupleslot(Tuplestorestate *state, bool forward, - TupleTableSlot *slot); + TupleTableSlot *slot); extern bool tuplestore_advance(Tuplestorestate *state, bool forward); extern void tuplestore_end(Tuplestorestate *state); diff --git a/src/include/utils/typcache.h b/src/include/utils/typcache.h index 7d3e284871c..673bf176ade 100644 --- a/src/include/utils/typcache.h +++ b/src/include/utils/typcache.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/typcache.h,v 1.11 2006/06/16 18:42:23 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/typcache.h,v 1.12 2006/10/04 00:30:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,8 +57,8 @@ typedef struct TypeCacheEntry /* * Tuple descriptor if it's a composite type (row type). NULL if not - * composite or information hasn't yet been requested. (NOTE: this is - * a reference-counted tupledesc.) + * composite or information hasn't yet been requested. (NOTE: this is a + * reference-counted tupledesc.) */ TupleDesc tupDesc; } TypeCacheEntry; diff --git a/src/include/utils/tzparser.h b/src/include/utils/tzparser.h index 4b7226eb444..2aef189bee8 100644 --- a/src/include/utils/tzparser.h +++ b/src/include/utils/tzparser.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/tzparser.h,v 1.1 2006/07/25 03:51:22 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/tzparser.h,v 1.2 2006/10/04 00:30:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,15 +21,15 @@ typedef struct tzEntry { /* the actual data: TZ abbrev (downcased), offset, DST flag */ - char *abbrev; - int offset; /* in seconds from UTC */ - bool is_dst; + char *abbrev; + int offset; /* in seconds from UTC */ + bool is_dst; /* source information (for error messages) */ - int lineno; + int lineno; const char *filename; } tzEntry; extern bool load_tzoffsets(const char *filename, bool doit, int elevel); -#endif /* TZPARSER_H */ +#endif /* TZPARSER_H */ |