diff options
Diffstat (limited to 'src/include/access/transam.h')
| -rw-r--r-- | src/include/access/transam.h | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/src/include/access/transam.h b/src/include/access/transam.h index f1238d5c266..0e6212eed70 100644 --- a/src/include/access/transam.h +++ b/src/include/access/transam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: transam.h,v 1.27 2000/11/21 21:16:05 petere Exp $ + * $Id: transam.h,v 1.28 2000/11/30 08:46:25 vadim Exp $ * * NOTES * Transaction System Version 101 now support proper oid @@ -67,11 +67,7 @@ typedef unsigned char XidStatus;/* (2 bits) */ * transaction page definitions * ---------------- */ -#ifdef XLOG #define TP_DataSize (BLCKSZ - sizeof(XLogRecPtr)) -#else -#define TP_DataSize BLCKSZ -#endif #define TP_NumXidStatusPerBlock (TP_DataSize * 4) /* ---------------- @@ -88,10 +84,8 @@ typedef unsigned char XidStatus;/* (2 bits) */ */ typedef struct LogRelationContentsData { -#ifdef XLOG XLogRecPtr LSN; /* temp hack: LSN is member of any block */ /* so should be described in bufmgr */ -#endif int TransSystemVersion; } LogRelationContentsData; @@ -115,9 +109,7 @@ typedef LogRelationContentsData *LogRelationContents; */ typedef struct VariableRelationContentsData { -#ifdef XLOG XLogRecPtr LSN; -#endif int TransSystemVersion; TransactionId nextXidData; TransactionId lastXidData; /* unused */ @@ -127,21 +119,14 @@ typedef struct VariableRelationContentsData typedef VariableRelationContentsData *VariableRelationContents; /* - * VariableCache is placed in shmem and used by backends to - * get next available XID & OID without access to - * variable relation. Actually, I would like to have two - * different on-disk storages for next XID and OID... - * But hoping that someday we will use per database OID - * generator I leaved this as is. - vadim 07/21/98 + * VariableCache is placed in shmem and used by + * backends to get next available XID & OID. */ typedef struct VariableCacheData { -#ifndef XLOG - uint32 xid_count; -#endif - TransactionId nextXid; - Oid nextOid; - uint32 oidCount; + TransactionId nextXid; + Oid nextOid; + uint32 oidCount; } VariableCacheData; typedef VariableCacheData *VariableCache; |