diff options
Diffstat (limited to 'src/include/access')
| -rw-r--r-- | src/include/access/genam.h | 12 | ||||
| -rw-r--r-- | src/include/access/heapam.h | 4 | ||||
| -rw-r--r-- | src/include/access/nbtree.h | 33 | ||||
| -rw-r--r-- | src/include/access/printtup.h | 8 | ||||
| -rw-r--r-- | src/include/access/relscan.h | 6 | ||||
| -rw-r--r-- | src/include/access/slru.h | 22 | ||||
| -rw-r--r-- | src/include/access/xact.h | 12 | ||||
| -rw-r--r-- | src/include/access/xlog.h | 4 |
8 files changed, 51 insertions, 50 deletions
diff --git a/src/include/access/genam.h b/src/include/access/genam.h index 934defb8a7..ac61ec35ac 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: genam.h,v 1.40 2003/07/27 17:10:06 tgl Exp $ + * $Id: genam.h,v 1.41 2003/08/04 00:43:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,8 +34,8 @@ typedef struct IndexBulkDeleteResult BlockNumber num_pages; /* pages remaining in index */ double num_index_tuples; /* tuples remaining */ double tuples_removed; /* # removed by bulk-delete operation */ - BlockNumber pages_deleted; /* # unused pages in index */ - BlockNumber pages_free; /* # pages available for reuse */ + BlockNumber pages_deleted; /* # unused pages in index */ + BlockNumber pages_free; /* # pages available for reuse */ } IndexBulkDeleteResult; /* Typedef for callback function to determine if a tuple is bulk-deletable */ @@ -46,7 +46,7 @@ typedef struct IndexVacuumCleanupInfo { bool vacuum_full; /* VACUUM FULL (we have exclusive lock) */ int message_level; /* ereport level for progress messages */ -} IndexVacuumCleanupInfo; +} IndexVacuumCleanupInfo; /* Struct for heap-or-index scans of system tables */ typedef struct SysScanDescData @@ -89,8 +89,8 @@ extern IndexBulkDeleteResult *index_bulk_delete(Relation indexRelation, IndexBulkDeleteCallback callback, void *callback_state); extern IndexBulkDeleteResult *index_vacuum_cleanup(Relation indexRelation, - IndexVacuumCleanupInfo *info, - IndexBulkDeleteResult *stats); + IndexVacuumCleanupInfo * info, + IndexBulkDeleteResult *stats); extern RegProcedure index_cost_estimator(Relation indexRelation); extern RegProcedure index_getprocid(Relation irel, AttrNumber attnum, uint16 procnum); diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index 06a0772bba..b6df722086 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.81 2003/02/23 20:32:12 tgl Exp $ + * $Id: heapam.h,v 1.82 2003/08/04 00:43:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -173,7 +173,7 @@ extern void heap_redo(XLogRecPtr lsn, XLogRecord *rptr); extern void heap_undo(XLogRecPtr lsn, XLogRecord *rptr); extern void heap_desc(char *buf, uint8 xl_info, char *rec); extern XLogRecPtr log_heap_clean(Relation reln, Buffer buffer, - OffsetNumber *unused, int uncnt); + OffsetNumber *unused, int uncnt); extern XLogRecPtr log_heap_move(Relation reln, Buffer oldbuf, ItemPointerData from, Buffer newbuf, HeapTuple newtup); diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index d6ea70cd7d..28b19c50dc 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nbtree.h,v 1.67 2003/02/23 22:43:09 tgl Exp $ + * $Id: nbtree.h,v 1.68 2003/08/04 00:43:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,7 @@ * a search has navigated to the wrong page due to concurrent page splits * or deletions; see src/backend/access/nbtree/README for more info. * - * In addition, we store the page's btree level (counting upwards from + * In addition, we store the page's btree level (counting upwards from * zero at a leaf page) as well as some flag bits indicating the page type * 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. @@ -41,9 +41,9 @@ typedef struct BTPageOpaqueData BlockNumber btpo_next; /* right sibling, or P_NONE if rightmost */ union { - uint32 level; /* tree level --- zero for leaf pages */ + uint32 level; /* tree level --- zero for leaf pages */ TransactionId xact; /* next transaction ID, if deleted */ - } btpo; + } btpo; uint16 btpo_flags; /* flag bits, see below */ } BTPageOpaqueData; @@ -185,15 +185,16 @@ typedef BTItemData *BTItem; * record xl_info field */ #define XLOG_BTREE_INSERT_LEAF 0x00 /* add btitem without split */ -#define XLOG_BTREE_INSERT_UPPER 0x10 /* same, on a non-leaf page */ +#define XLOG_BTREE_INSERT_UPPER 0x10 /* same, on a non-leaf page */ #define XLOG_BTREE_INSERT_META 0x20 /* same, plus update metapage */ #define XLOG_BTREE_SPLIT_L 0x30 /* add btitem with split */ #define XLOG_BTREE_SPLIT_R 0x40 /* as above, new item on right */ -#define XLOG_BTREE_SPLIT_L_ROOT 0x50 /* add btitem with split of root */ -#define XLOG_BTREE_SPLIT_R_ROOT 0x60 /* as above, new item on right */ +#define XLOG_BTREE_SPLIT_L_ROOT 0x50 /* add btitem with split of root */ +#define XLOG_BTREE_SPLIT_R_ROOT 0x60 /* as above, new item on right */ #define XLOG_BTREE_DELETE 0x70 /* delete leaf btitem */ #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 */ #define XLOG_BTREE_NEWMETA 0xB0 /* update metadata page */ #define XLOG_BTREE_NEWPAGE 0xC0 /* new index page during build */ @@ -216,7 +217,7 @@ typedef struct xl_btree_metadata uint32 level; BlockNumber fastroot; uint32 fastlevel; -} xl_btree_metadata; +} xl_btree_metadata; /* * This is what we need to know about simple (without split) insert. @@ -245,7 +246,7 @@ typedef struct xl_btree_insert * left or right split page (and thus, whether otherblk is the right or left * page of the split pair). The _ROOT variants indicate that we are splitting * the root page, and thus that a newroot record rather than an insert or - * split record should follow. Note that a split record never carries a + * split record should follow. Note that a split record never carries a * metapage update --- we'll do that in the parent-level update. */ typedef struct xl_btree_split @@ -279,7 +280,7 @@ typedef struct xl_btree_delete /* * This is what we need to know about deletion of a btree page. The target * identifies the tuple removed from the parent page (note that we remove - * this tuple's downlink and the *following* tuple's key). Note we do not + * this tuple's downlink and the *following* tuple's key). Note we do not * store any content for the deleted page --- it is just rewritten as empty * during recovery. */ @@ -290,7 +291,7 @@ typedef struct xl_btree_delete_page BlockNumber leftblk; /* child block's left sibling, if any */ BlockNumber rightblk; /* child block's right sibling */ /* xl_btree_metadata FOLLOWS IF XLOG_BTREE_DELETE_PAGE_META */ -} xl_btree_delete_page; +} xl_btree_delete_page; #define SizeOfBtreeDeletePage (offsetof(xl_btree_delete_page, rightblk) + sizeof(BlockNumber)) @@ -320,7 +321,7 @@ typedef struct xl_btree_newmeta { RelFileNode node; xl_btree_metadata meta; -} xl_btree_newmeta; +} xl_btree_newmeta; #define SizeOfBtreeNewmeta (sizeof(xl_btree_newmeta)) @@ -332,7 +333,7 @@ typedef struct xl_btree_newpage RelFileNode node; BlockNumber blkno; /* location of new page */ /* entire page contents follow at end of record */ -} xl_btree_newpage; +} xl_btree_newpage; #define SizeOfBtreeNewpage (offsetof(xl_btree_newpage, blkno) + sizeof(BlockNumber)) @@ -442,7 +443,7 @@ extern InsertIndexResult _bt_doinsert(Relation rel, BTItem btitem, bool index_is_unique, Relation heapRel); extern Buffer _bt_getstackbuf(Relation rel, BTStack stack, int access); extern void _bt_insert_parent(Relation rel, Buffer buf, Buffer rbuf, - BTStack stack, bool is_root, bool is_only); + BTStack stack, bool is_root, bool is_only); /* * prototypes for functions in nbtpage.c @@ -458,7 +459,7 @@ extern void _bt_pageinit(Page page, Size size); extern bool _bt_page_recyclable(Page page); extern void _bt_metaproot(Relation rel, BlockNumber rootbknum, uint32 level); extern void _bt_delitems(Relation rel, Buffer buf, - OffsetNumber *itemnos, int nitems); + OffsetNumber *itemnos, int nitems); extern int _bt_pagedel(Relation rel, Buffer buf, bool vacuum_full); /* diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h index 981b0f2648..69a446d657 100644 --- a/src/include/access/printtup.h +++ b/src/include/access/printtup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: printtup.h,v 1.27 2003/05/08 18:16:37 tgl Exp $ + * $Id: printtup.h,v 1.28 2003/08/04 00:43:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,16 +19,16 @@ extern DestReceiver *printtup_create_DR(CommandDest dest, Portal portal); extern void SendRowDescriptionMessage(TupleDesc typeinfo, List *targetlist, - int16 *formats); + int16 *formats); extern void debugStartup(DestReceiver *self, int operation, - TupleDesc typeinfo); + TupleDesc typeinfo); extern void debugtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self); /* XXX these are really in executor/spi.c */ extern void spi_dest_startup(DestReceiver *self, int operation, - TupleDesc typeinfo); + TupleDesc typeinfo); extern void spi_printtup(HeapTuple tuple, TupleDesc typeinfo, DestReceiver *self); diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index 898afa64bb..1675248544 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: relscan.h,v 1.30 2003/01/08 19:41:40 tgl Exp $ + * $Id: relscan.h,v 1.31 2003/08/04 00:43:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,8 +76,8 @@ typedef struct IndexScanDescData * the logical scan position for itself. It does that using * unique_tuple_pos: -1 = before row, 0 = on row, +1 = after row. */ - int unique_tuple_pos; /* logical position */ - int unique_tuple_mark; /* logical marked position */ + int unique_tuple_pos; /* logical position */ + int unique_tuple_mark; /* logical marked position */ PgStat_Info xs_pgstat_info; /* statistics collector hook */ } IndexScanDescData; diff --git a/src/include/access/slru.h b/src/include/access/slru.h index 1386d7e201..6a8b63a3ff 100644 --- a/src/include/access/slru.h +++ b/src/include/access/slru.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: slru.h,v 1.1 2003/06/11 22:37:46 momjian Exp $ + * $Id: slru.h,v 1.2 2003/08/04 00:43:30 momjian Exp $ */ #ifndef SLRU_H #define SLRU_H @@ -18,42 +18,42 @@ typedef struct SlruLockData { - LWLockId ControlLock; + LWLockId ControlLock; /* * BufferLocks is set during CLOGShmemInit and does not change thereafter. * The value is automatically inherited by backends via fork, and * doesn't need to be in shared memory. */ - LWLockId BufferLocks[NUM_CLOG_BUFFERS]; /* Per-buffer I/O locks */ -} SlruLockData; + LWLockId BufferLocks[NUM_CLOG_BUFFERS]; /* Per-buffer I/O locks */ +} SlruLockData; typedef SlruLockData *SlruLock; typedef struct SlruCtlData { - void *shared; /* pointer to SlruSharedData */ - SlruLock locks; + void *shared; /* pointer to SlruSharedData */ + SlruLock locks; /* * Dir is set during SimpleLruShmemInit and does not change thereafter. * The value is automatically inherited by backends via fork, and * doesn't need to be in shared memory. */ - char Dir[MAXPGPATH]; - + char Dir[MAXPGPATH]; + /* * Decide which of two page numbers is "older" for truncation purposes. * We need to use comparison of TransactionIds here in order to do the right * thing with wraparound XID arithmetic. */ - bool (*PagePrecedes)(int, int); + bool (*PagePrecedes) (int, int); -} SlruCtlData; +} SlruCtlData; typedef SlruCtlData *SlruCtl; extern int SimpleLruShmemSize(void); extern void SimpleLruInit(SlruCtl ctl, const char *name, const char *subdir); extern int SimpleLruZeroPage(SlruCtl ctl, int pageno); -extern char *SimpleLruReadPage(SlruCtl ctl, int pageno, TransactionId xid, bool forwrite); +extern char *SimpleLruReadPage(SlruCtl ctl, int pageno, TransactionId xid, bool forwrite); extern void SimpleLruWritePage(SlruCtl ctl, int slotno); extern void SimpleLruSetLatestPage(SlruCtl ctl, int pageno); extern void SimpleLruFlush(SlruCtl ctl, bool checkpoint); diff --git a/src/include/access/xact.h b/src/include/access/xact.h index aa284df016..4a8c5f6772 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xact.h,v 1.52 2003/05/14 03:26:03 tgl Exp $ + * $Id: xact.h,v 1.53 2003/08/04 00:43:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,8 +31,8 @@ extern int DefaultXactIsoLevel; extern int XactIsoLevel; /* Xact read-only state */ -extern bool DefaultXactReadOnly; -extern bool XactReadOnly; +extern bool DefaultXactReadOnly; +extern bool XactReadOnly; /* * transaction states - transaction state from server perspective @@ -44,7 +44,7 @@ typedef enum TransState TRANS_INPROGRESS, TRANS_COMMIT, TRANS_ABORT -} TransState; +} TransState; /* * transaction block states - transaction state of client queries @@ -57,7 +57,7 @@ typedef enum TBlockState TBLOCK_END, TBLOCK_ABORT, TBLOCK_ENDABORT -} TBlockState; +} TBlockState; /* ---------------- * transaction state structure @@ -70,7 +70,7 @@ typedef struct TransactionStateData AbsoluteTime startTime; int startTimeUsec; TransState state; - TBlockState blockState; + TBlockState blockState; } TransactionStateData; typedef TransactionStateData *TransactionState; diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index cb2e6e523d..074e126abd 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: xlog.h,v 1.42 2003/02/22 00:45:05 tgl Exp $ + * $Id: xlog.h,v 1.43 2003/08/04 00:43:30 momjian Exp $ */ #ifndef XLOG_H #define XLOG_H @@ -58,7 +58,7 @@ typedef struct XLogRecord /* * If we backed up any disk blocks with the XLOG record, we use flag bits in * xl_info to signal it. We support backup of up to 3 disk blocks per XLOG - * record. (Could support 4 if we cared to dedicate all the xl_info bits for + * record. (Could support 4 if we cared to dedicate all the xl_info bits for * this purpose; currently bit 0 of xl_info is unused and available.) */ #define XLR_BKP_BLOCK_MASK 0x0E /* all info bits used for bkp |