diff options
Diffstat (limited to 'src/include/access')
-rw-r--r-- | src/include/access/gist.h | 7 | ||||
-rw-r--r-- | src/include/access/heapam.h | 8 | ||||
-rw-r--r-- | src/include/access/heapam_xlog.h | 4 | ||||
-rw-r--r-- | src/include/access/htup_details.h | 10 | ||||
-rw-r--r-- | src/include/access/multixact.h | 6 | ||||
-rw-r--r-- | src/include/access/rmgr.h | 2 | ||||
-rw-r--r-- | src/include/access/sysattr.h | 1 | ||||
-rw-r--r-- | src/include/access/timeline.h | 4 | ||||
-rw-r--r-- | src/include/access/xlog.h | 2 | ||||
-rw-r--r-- | src/include/access/xlog_internal.h | 16 |
10 files changed, 31 insertions, 29 deletions
diff --git a/src/include/access/gist.h b/src/include/access/gist.h index a5627e34f35..0c1c3b4eae2 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -64,6 +64,7 @@ #define F_FOLLOW_RIGHT (1 << 3) /* page to the right has no downlink */ typedef XLogRecPtr GistNSN; + /* * For on-disk compatibility with pre-9.3 servers, NSN is stored as two * 32-bit fields on disk, same as LSNs. @@ -72,7 +73,7 @@ typedef PageXLogRecPtr PageGistNSN; typedef struct GISTPageOpaqueData { - PageGistNSN nsn; /* this value must change on page split */ + PageGistNSN nsn; /* this value must change on page split */ BlockNumber rightlink; /* next page if any */ uint16 flags; /* see bit definitions above */ uint16 gist_page_id; /* for identification of GiST indexes */ @@ -97,11 +98,11 @@ typedef GISTPageOpaqueData *GISTPageOpaque; * the union keys for each side. * * If spl_ldatum_exists and spl_rdatum_exists are true, then we are performing - * a "secondary split" using a non-first index column. In this case some + * a "secondary split" using a non-first index column. In this case some * decisions have already been made about a page split, and the set of tuples * being passed to PickSplit is just the tuples about which we are undecided. * spl_ldatum/spl_rdatum then contain the union keys for the tuples already - * chosen to go left or right. Ideally the PickSplit method should take those + * chosen to go left or right. Ideally the PickSplit method should take those * keys into account while deciding what to do with the remaining tuples, ie * it should try to "build out" from those unions so as to minimally expand * them. If it does so, it should union the given tuples' keys into the diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index af9e506d2b8..baa8c50addc 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -59,15 +59,15 @@ typedef enum LockTupleMode * replacement is really a match. * cmax is the outdating command's CID, but only when the failure code is * HeapTupleSelfUpdated (i.e., something in the current transaction outdated - * the tuple); otherwise cmax is zero. (We make this restriction because + * the tuple); otherwise cmax is zero. (We make this restriction because * HeapTupleHeaderGetCmax doesn't work for tuples outdated in other * transactions.) */ typedef struct HeapUpdateFailureData { - ItemPointerData ctid; - TransactionId xmax; - CommandId cmax; + ItemPointerData ctid; + TransactionId xmax; + CommandId cmax; } HeapUpdateFailureData; diff --git a/src/include/access/heapam_xlog.h b/src/include/access/heapam_xlog.h index e58eae5630c..4381778308f 100644 --- a/src/include/access/heapam_xlog.h +++ b/src/include/access/heapam_xlog.h @@ -147,7 +147,7 @@ typedef struct xl_heap_update TransactionId old_xmax; /* xmax of the old tuple */ TransactionId new_xmax; /* xmax of the new tuple */ ItemPointerData newtid; /* new inserted tuple id */ - uint8 old_infobits_set; /* infomask bits to set on old tuple */ + uint8 old_infobits_set; /* infomask bits to set on old tuple */ bool all_visible_cleared; /* PD_ALL_VISIBLE was cleared */ bool new_all_visible_cleared; /* same for the page of newtid */ /* NEW TUPLE xl_heap_header AND TUPLE DATA FOLLOWS AT END OF STRUCT */ @@ -224,7 +224,7 @@ typedef struct xl_heap_lock typedef struct xl_heap_lock_updated { xl_heaptid target; - TransactionId xmax; + TransactionId xmax; uint8 infobits_set; } xl_heap_lock_updated; diff --git a/src/include/access/htup_details.h b/src/include/access/htup_details.h index cd01ecdba7d..0a832e91507 100644 --- a/src/include/access/htup_details.h +++ b/src/include/access/htup_details.h @@ -153,6 +153,7 @@ struct HeapTupleHeaderData /* MORE DATA FOLLOWS AT END OF STRUCT */ }; + /* typedef appears in tupbasics.h */ /* @@ -167,7 +168,7 @@ struct HeapTupleHeaderData #define HEAP_XMAX_EXCL_LOCK 0x0040 /* xmax is exclusive locker */ #define HEAP_XMAX_LOCK_ONLY 0x0080 /* xmax, if valid, is only a locker */ - /* xmax is a shared locker */ + /* xmax is a shared locker */ #define HEAP_XMAX_SHR_LOCK (HEAP_XMAX_EXCL_LOCK | HEAP_XMAX_KEYSHR_LOCK) #define HEAP_LOCK_MASK (HEAP_XMAX_SHR_LOCK | HEAP_XMAX_EXCL_LOCK | \ @@ -206,11 +207,11 @@ struct HeapTupleHeaderData * Use these to test whether a particular lock is applied to a tuple */ #define HEAP_XMAX_IS_SHR_LOCKED(infomask) \ - (((infomask) & HEAP_LOCK_MASK) == HEAP_XMAX_SHR_LOCK) + (((infomask) & HEAP_LOCK_MASK) == HEAP_XMAX_SHR_LOCK) #define HEAP_XMAX_IS_EXCL_LOCKED(infomask) \ - (((infomask) & HEAP_LOCK_MASK) == HEAP_XMAX_EXCL_LOCK) + (((infomask) & HEAP_LOCK_MASK) == HEAP_XMAX_EXCL_LOCK) #define HEAP_XMAX_IS_KEYSHR_LOCKED(infomask) \ - (((infomask) & HEAP_LOCK_MASK) == HEAP_XMAX_KEYSHR_LOCK) + (((infomask) & HEAP_LOCK_MASK) == HEAP_XMAX_KEYSHR_LOCK) /* turn these all off when Xmax is to change */ #define HEAP_XMAX_BITS (HEAP_XMAX_COMMITTED | HEAP_XMAX_INVALID | \ @@ -527,6 +528,7 @@ struct MinimalTupleData /* MORE DATA FOLLOWS AT END OF STRUCT */ }; + /* typedef appears in htup.h */ diff --git a/src/include/access/multixact.h b/src/include/access/multixact.h index b08bb1f49a6..8a9eddee387 100644 --- a/src/include/access/multixact.h +++ b/src/include/access/multixact.h @@ -51,8 +51,8 @@ typedef enum typedef struct MultiXactMember { - TransactionId xid; - MultiXactStatus status; + TransactionId xid; + MultiXactStatus status; } MultiXactMember; @@ -84,7 +84,7 @@ extern MultiXactId MultiXactIdExpand(MultiXactId multi, TransactionId xid, extern MultiXactId ReadNextMultiXactId(void); extern bool MultiXactIdIsRunning(MultiXactId multi); extern void MultiXactIdSetOldestMember(void); -extern int GetMultiXactIdMembers(MultiXactId multi, MultiXactMember **xids, +extern int GetMultiXactIdMembers(MultiXactId multi, MultiXactMember **xids, bool allow_old); extern bool MultiXactIdPrecedes(MultiXactId multi1, MultiXactId multi2); diff --git a/src/include/access/rmgr.h b/src/include/access/rmgr.h index f6d27765b25..23650c3301e 100644 --- a/src/include/access/rmgr.h +++ b/src/include/access/rmgr.h @@ -26,7 +26,7 @@ typedef enum RmgrIds { #include "access/rmgrlist.h" RM_NEXT_ID -} RmgrIds; +} RmgrIds; #undef PG_RMGR diff --git a/src/include/access/sysattr.h b/src/include/access/sysattr.h index 027a5cc905e..f9b24825908 100644 --- a/src/include/access/sysattr.h +++ b/src/include/access/sysattr.h @@ -27,5 +27,4 @@ #define TableOidAttributeNumber (-7) #define FirstLowInvalidHeapAttributeNumber (-8) - #endif /* SYSATTR_H */ diff --git a/src/include/access/timeline.h b/src/include/access/timeline.h index 2e5e9a42a38..73d1c0eb25e 100644 --- a/src/include/access/timeline.h +++ b/src/include/access/timeline.h @@ -25,8 +25,8 @@ typedef struct { TimeLineID tli; - XLogRecPtr begin; /* inclusive */ - XLogRecPtr end; /* exclusive, 0 means infinity */ + XLogRecPtr begin; /* inclusive */ + XLogRecPtr end; /* exclusive, 0 means infinity */ } TimeLineHistoryEntry; extern List *readTimeLineHistory(TimeLineID targetTLI); diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index f8f06c1f38b..b4a75cee220 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -264,7 +264,7 @@ extern XLogRecPtr XLogInsert(RmgrId rmid, uint8 info, XLogRecData *rdata); extern void XLogFlush(XLogRecPtr RecPtr); extern bool XLogBackgroundFlush(void); extern bool XLogNeedsFlush(XLogRecPtr RecPtr); -extern int XLogFileInit(XLogSegNo segno, bool *use_existent, bool use_lock); +extern int XLogFileInit(XLogSegNo segno, bool *use_existent, bool use_lock); extern int XLogFileOpen(XLogSegNo segno); extern XLogRecPtr XLogSaveBufferForHint(Buffer buffer); diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h index 351bb31d56c..ee12d1a110a 100644 --- a/src/include/access/xlog_internal.h +++ b/src/include/access/xlog_internal.h @@ -127,10 +127,10 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader; * for deciding which segment to write given a pointer to a record end, * for example. */ -#define XLByteToSeg(xlrp, logSegNo) \ +#define XLByteToSeg(xlrp, logSegNo) \ logSegNo = (xlrp) / XLogSegSize -#define XLByteToPrevSeg(xlrp, logSegNo) \ +#define XLByteToPrevSeg(xlrp, logSegNo) \ logSegNo = ((xlrp) - 1) / XLogSegSize /* @@ -139,10 +139,10 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader; * For XLByteInSeg, do the computation at face value. For XLByteInPrevSeg, * a boundary byte is taken to be in the previous segment. */ -#define XLByteInSeg(xlrp, logSegNo) \ +#define XLByteInSeg(xlrp, logSegNo) \ (((xlrp) / XLogSegSize) == (logSegNo)) -#define XLByteInPrevSeg(xlrp, logSegNo) \ +#define XLByteInPrevSeg(xlrp, logSegNo) \ ((((xlrp) - 1) / XLogSegSize) == (logSegNo)) /* Check if an XLogRecPtr value is in a plausible range */ @@ -170,8 +170,8 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader; do { \ uint32 log; \ uint32 seg; \ - sscanf(fname, "%08X%08X%08X", tli, &log, &seg); \ - *logSegNo = (uint64) log * XLogSegmentsPerXLogId + seg; \ + sscanf(fname, "%08X%08X%08X", tli, &log, &seg); \ + *logSegNo = (uint64) log * XLogSegmentsPerXLogId + seg; \ } while (0) #define XLogFilePath(path, tli, logSegNo) \ @@ -260,7 +260,7 @@ extern XLogRecPtr RequestXLogSwitch(void); extern void GetOldestRestartPoint(XLogRecPtr *oldrecptr, TimeLineID *oldtli); /* - * Exported for the functions in timeline.c and xlogarchive.c. Only valid + * Exported for the functions in timeline.c and xlogarchive.c. Only valid * in the startup process. */ extern bool ArchiveRecoveryRequested; @@ -276,7 +276,7 @@ extern bool RestoreArchivedFile(char *path, const char *xlogfname, bool cleanupEnabled); extern void ExecuteRecoveryCommand(char *command, char *commandName, bool failOnerror); -extern void KeepFileRestoredFromArchive(char *path, char *xlogfname); +extern void KeepFileRestoredFromArchive(char *path, char *xlogfname); extern void XLogArchiveNotify(const char *xlog); extern void XLogArchiveNotifySeg(XLogSegNo segno); extern void XLogArchiveForceDone(const char *xlog); |