code cleanup

kelvich · kelvich · commit 18c4c5783072 · 2015-10-05T14:06:53.000+03:00
diff --git a/src/backend/access/heap/visibilitymap.c b/src/backend/access/heap/visibilitymap.c
@@ -85,7 +85,6 @@
 #include "access/heapam_xlog.h"
 #include "access/visibilitymap.h"
 #include "access/xlog.h"
-#include "utils/snapmgr.h"
 #include "miscadmin.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
@@ -39,8 +39,6 @@
 #include "access/xloginsert.h"
 #include "access/xlogutils.h"
 #include "access/xtm.h"
-#include "access/xact.h"
-#include "storage/procarray.h"
 #include "miscadmin.h"
 #include "pg_trace.h"
 
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -2184,11 +2184,3 @@ RecordTransactionAbortPrepared(TransactionId xid,
 	 */
 	SyncRepWaitForLSN(recptr);
 }
-
-/*
- * Return identified of current global transaction
- */
-const char* GetLockedGlobalTransactionId()
-{
-	return MyLockedGxact ? MyLockedGxact->gid : NULL;
-}
diff --git a/src/backend/access/transam/xtm.c b/src/backend/access/transam/xtm.c
@@ -2,13 +2,13 @@
  *
  * xtm.c
  *		PostgreSQL implementation of transaction manager protocol
- * 
+ *
  * This module defines default iplementaiton of PostgreSQL transaction manager protocol
- * 
+ *
  * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * src/backend/access/transam/clog.c
+ * src/backend/access/transam/xtm.c
  *
  *-------------------------------------------------------------------------
  */
@@ -31,7 +31,7 @@ TransactionManager PgTM = {
 	PgGetOldestXmin,
 	PgTransactionIdIsInProgress,
 	PgGetGlobalTransactionId,
-    PgXidInMVCCSnapshot
+	PgXidInMVCCSnapshot
 };
 
 TransactionManager* TM = &PgTM;
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
@@ -59,9 +59,9 @@
 #include "storage/spin.h"
 #include "utils/builtins.h"
 #include "utils/rel.h"
-#include "utils/tqual.h"
 #include "utils/snapmgr.h"
 
+
 /* Our shared memory area */
 typedef struct ProcArrayStruct
 {
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
@@ -144,7 +144,7 @@
 
 #max_files_per_process = 1000		# min 25
 					# (change requires restart)
-shared_preload_libraries = 'pg_dtm'		# (change requires restart)
+#shared_preload_libraries = ''		# (change requires restart)
 
 # - Cost-Based Vacuum Delay -
 
diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
@@ -58,7 +58,6 @@
 #include "utils/snapmgr.h"
 #include "utils/syscache.h"
 #include "utils/tqual.h"
-#include "access/xtm.h"
 
 
 /*
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
@@ -903,10 +903,8 @@ HeapTupleSatisfiesDirty(HeapTuple htup, Snapshot snapshot,
 
 	if (TransactionIdIsInProgress(HeapTupleHeaderGetRawXmax(tuple)))
 	{
-		if (!HEAP_XMAX_IS_LOCKED_ONLY(tuple->t_infomask)) {
+		if (!HEAP_XMAX_IS_LOCKED_ONLY(tuple->t_infomask))
 			snapshot->xmax = HeapTupleHeaderGetRawXmax(tuple);
-			return true;
-		}
 		return true;
 	}
 
@@ -1149,6 +1147,7 @@ HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,
 	return false;
 }
 
+
 /*
  * HeapTupleSatisfiesVacuum
  *
@@ -1456,10 +1455,10 @@ HeapTupleIsSurelyDead(HeapTuple htup, TransactionId OldestXmin)
 	return TransactionIdPrecedes(HeapTupleHeaderGetRawXmax(tuple), OldestXmin);
 }
 
-bool 
+bool
 XidInMVCCSnapshot(TransactionId xid, Snapshot snapshot)
 {
-    return TM->IsInSnapshot(xid, snapshot);
+	return TM->IsInSnapshot(xid, snapshot);
 }
 
 /*
@@ -1797,4 +1796,3 @@ HeapTupleSatisfiesHistoricMVCC(HeapTuple htup, Snapshot snapshot,
 	else
 		return true;
 }
-
diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h
@@ -56,9 +56,4 @@ extern void CheckPointTwoPhase(XLogRecPtr redo_horizon);
 
 extern void FinishPreparedTransaction(const char *gid, bool isCommit);
 
-extern const char* GetLockedGlobalTransactionId(void);
-
-extern int  AllocGXid(TransactionId xid);
-extern bool RemoveGXid(TransactionId xid);
-
 #endif   /* TWOPHASE_H */
diff --git a/src/include/access/xtm.h b/src/include/access/xtm.h
@@ -38,8 +38,8 @@ typedef struct
 	/* Get global transaction XID: returns XID of current transaction if it is global, InvalidTransactionId otherwise */
 	TransactionId (*GetGlobalTransactionId)(void);
 
-    /* Is the given XID still-in-progress according to the snapshot (encapsulation of XidInMVCCSnapshot in tqual.c) */
-    bool (*IsInSnapshot)(TransactionId xid, Snapshot snapshot); 
+	/* Is the given XID still-in-progress according to the snapshot (encapsulation of XidInMVCCSnapshot in tqual.c) */
+	bool (*IsInSnapshot)(TransactionId xid, Snapshot snapshot);
 } TransactionManager;
 
 /* Get pointer to transaction manager: actually returns content of TM variable */
@@ -52,7 +52,7 @@ extern TransactionManager PgTM; /* Standard PostgreSQL transaction manager */
 extern bool PgXidInMVCCSnapshot(TransactionId xid, Snapshot snapshot);
 
 extern void PgTransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
-                                         TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
+										TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
 extern XidStatus PgTransactionIdGetStatus(TransactionId xid, XLogRecPtr *lsn);
 
 extern Snapshot PgGetSnapshotData(Snapshot snapshot);
diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h
@@ -43,6 +43,8 @@ extern void ExpireOldKnownAssignedTransactionIds(TransactionId xid);
 extern int	GetMaxSnapshotXidCount(void);
 extern int	GetMaxSnapshotSubxidCount(void);
 
+extern Snapshot GetSnapshotData(Snapshot snapshot);
+
 extern bool ProcArrayInstallImportedXmin(TransactionId xmin,
 							 TransactionId sourcexid);
 extern bool ProcArrayInstallRestoredXmin(TransactionId xmin, PGPROC *proc);
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
@@ -16,7 +16,6 @@
 #define TQUAL_H
 
 #include "utils/snapshot.h"
-#include "access/transam.h"
 
 
 /* Static variables representing various special snapshot semantics */
@@ -101,5 +100,4 @@ extern bool ResolveCminCmaxDuringDecoding(struct HTAB *tuplecid_data,
 							  HeapTuple htup,
 							  Buffer buffer,
 							  CommandId *cmin, CommandId *cmax);
-
 #endif   /* TQUAL_H */

Original file line number	Diff line number	Diff line change
`@@ -903,10 +903,8 @@ HeapTupleSatisfiesDirty(HeapTuple htup, Snapshot snapshot,`
`903`	`903`
`904`	`904`	`if (TransactionIdIsInProgress(HeapTupleHeaderGetRawXmax(tuple)))`
`905`	`905`	`{`
`906`		`- if (!HEAP_XMAX_IS_LOCKED_ONLY(tuple->t_infomask)) {`
	`906`	`+ if (!HEAP_XMAX_IS_LOCKED_ONLY(tuple->t_infomask))`
`907`	`907`	`snapshot->xmax = HeapTupleHeaderGetRawXmax(tuple);`
`908`		`- return true;`
`909`		`- }`
`910`	`908`	`return true;`
`911`	`909`	`}`
`912`	`910`
`@@ -1149,6 +1147,7 @@ HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,`
`1149`	`1147`	`return false;`
`1150`	`1148`	`}`
`1151`	`1149`
	`1150`	`+`
`1152`	`1151`	`/*`
`1153`	`1152`	`* HeapTupleSatisfiesVacuum`
`1154`	`1153`	`*`
`@@ -1456,10 +1455,10 @@ HeapTupleIsSurelyDead(HeapTuple htup, TransactionId OldestXmin)`
`1456`	`1455`	`return TransactionIdPrecedes(HeapTupleHeaderGetRawXmax(tuple), OldestXmin);`
`1457`	`1456`	`}`
`1458`	`1457`
`1459`		`-bool`
	`1458`	`+bool`
`1460`	`1459`	`XidInMVCCSnapshot(TransactionId xid, Snapshot snapshot)`
`1461`	`1460`	`{`
`1462`		`- return TM->IsInSnapshot(xid, snapshot);`
	`1461`	`+ return TM->IsInSnapshot(xid, snapshot);`
`1463`	`1462`	`}`
`1464`	`1463`
`1465`	`1464`	`/*`
`@@ -1797,4 +1796,3 @@ HeapTupleSatisfiesHistoricMVCC(HeapTuple htup, Snapshot snapshot,`
`1797`	`1796`	`else`
`1798`	`1797`	`return true;`
`1799`	`1798`	`}`
`1800`		`-`