Undo changes in tqual

knizhnik · knizhnik · commit 5af430363589 · 2015-09-11T22:56:37.000+03:00
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -108,14 +108,6 @@ static XidStatus DtmGetTransactionStatus(TransactionId xid, XLogRecPtr *lsn)
     return status;
 }
 
-static bool TransactionIsInDtmSnapshot(TransactionId xid)
-{
-    return bsearch(&xid, DtmSnapshot.xip, DtmSnapshot.xcnt,
-                   sizeof(TransactionId), xidComparator) != NULL;
-}
-
-
-
 static void DtmSetTransactionStatus(TransactionId xid, int nsubxids, TransactionId *subxids, XidStatus status, XLogRecPtr lsn)
 {
     if (DtmHasSnapshot) { 
@@ -139,8 +131,6 @@ static void DtmSetTransactionStatus(TransactionId xid, int nsubxids, Transaction
  *  ***************************************************************************
  */
 
-extern bool (*TransactionIsInCurrentSnapshot)(TransactionId xid);
-
 void
 _PG_init(void)
 {
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -699,9 +699,7 @@ RemoveGXid(TransactionId xid)
 			TwoPhaseState->prepXacts[i]->next = TwoPhaseState->freeGXacts;
 			TwoPhaseState->freeGXacts = TwoPhaseState->prepXacts[i];
 
-			LWLockRelease(TwoPhaseStateLock);
-
-			return;
+            break;
 		}
 	}
 
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
@@ -62,9 +62,6 @@
 #include "utils/tqual.h"
 #include "utils/snapmgr.h"
 
-static bool
-TransactionIdIsRunning(TransactionId xid);
-
 /* Our shared memory area */
 typedef struct ProcArrayStruct
 {
@@ -948,14 +945,6 @@ ProcArrayApplyXidAssignment(TransactionId topxid,
 	LWLockRelease(ProcArrayLock);
 }
 
-bool (*TransactionIsInCurrentSnapshot)(TransactionId xid);
-
-bool
-TransactionIdIsInProgress(TransactionId xid)
-{    
-    return TransactionIdIsRunning(xid) || (TransactionIsInCurrentSnapshot && TransactionIsInCurrentSnapshot(xid));
-}
-
 /*
  * TransactionIdIsInProgress -- is given transaction running in some backend
  *
@@ -983,7 +972,7 @@ TransactionIdIsInProgress(TransactionId xid)
  * PGXACT again anyway; see GetNewTransactionId).
  */
 bool
-TransactionIdIsRunning(TransactionId xid)
+TransactionIdIsInProgress(TransactionId xid)
 {
 	static TransactionId *xids = NULL;
 	int			nxids = 0;
@@ -3914,5 +3903,5 @@ void VacuumProcArray(Snapshot snapshot)
         arrayP->numProcs--;
     }
 	LWLockRelease(ProcArrayLock);
-    elog(WARNING, "VacuumProcArray: %d in progress, %d completed, %d total\n", nInProgress, nCompleted, arrayP->numProcs);
+    //elog(WARNING, "VacuumProcArray: %d in progress, %d completed, %d total\n", nInProgress, nCompleted, arrayP->numProcs);
 }
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
@@ -318,10 +318,8 @@ HeapTupleSatisfiesSelf(HeapTuple htup, Snapshot snapshot, Buffer buffer)
 	if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))
 	{
 		/* it must have aborted or crashed */
-#if 1
 		SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,
 					InvalidTransactionId);
-#endif
 		return true;
 	}
 
@@ -697,10 +695,8 @@ HeapTupleSatisfiesUpdate(HeapTuple htup, CommandId curcid,
 	if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))
 	{
 		/* it must have aborted or crashed */
-#if 1
 		SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,
 					InvalidTransactionId);
-#endif
 		return HeapTupleMayBeUpdated;
 	}
 
@@ -848,7 +844,6 @@ HeapTupleSatisfiesDirty(HeapTuple htup, Snapshot snapshot,
 			}
 
 			snapshot->xmin = HeapTupleHeaderGetRawXmin(tuple);
-            snapshot->xmax = HeapTupleHeaderGetRawXmax(tuple);
 			/* XXX shouldn't we fall through to look at xmax? */
 			return true;		/* in insertion by other */
 		}
@@ -920,10 +915,8 @@ HeapTupleSatisfiesDirty(HeapTuple htup, Snapshot snapshot,
 	if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))
 	{
 		/* it must have aborted or crashed */
-#if 1
 		SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,
 					InvalidTransactionId);
-#endif
 		return true;
 	}
 
@@ -1132,10 +1125,8 @@ HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,
 		if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))
 		{
 			/* it must have aborted or crashed */
-#if 1
 			SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,
 						InvalidTransactionId);
-#endif
 			return true;
 		}
 
@@ -1305,10 +1296,8 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,
 			{
 				if (TransactionIdIsInProgress(HeapTupleHeaderGetRawXmax(tuple)))
 					return HEAPTUPLE_LIVE;
-#if 1
 				SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,
 							InvalidTransactionId);
-#endif
 			}
 		}
 
@@ -1365,9 +1354,7 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,
 		 * Not in Progress, Not Committed, so either Aborted or crashed.
 		 * Remove the Xmax.
 		 */
-#if 1
 		SetHintBits(tuple, buffer, HEAP_XMAX_INVALID, InvalidTransactionId);
-#endif
 		return HEAPTUPLE_LIVE;
 	}
 
@@ -1383,10 +1370,8 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,
 			/*
 			 * Not in Progress, Not Committed, so either Aborted or crashed
 			 */
-#if 1
 			SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,
 						InvalidTransactionId);
-#endif
 			return HEAPTUPLE_LIVE;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -699,9 +699,7 @@ RemoveGXid(TransactionId xid)`
`699`	`699`	`TwoPhaseState->prepXacts[i]->next = TwoPhaseState->freeGXacts;`
`700`	`700`	`TwoPhaseState->freeGXacts = TwoPhaseState->prepXacts[i];`
`701`	`701`
`702`		`- LWLockRelease(TwoPhaseStateLock);`
`703`		`-`
`704`		`- return;`
	`702`	`+ break;`
`705`	`703`	`}`
`706`	`704`	`}`
`707`	`705`
Original file line number	Diff line number	Diff line change
`@@ -318,10 +318,8 @@ HeapTupleSatisfiesSelf(HeapTuple htup, Snapshot snapshot, Buffer buffer)`
`318`	`318`	`if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))`
`319`	`319`	`{`
`320`	`320`	`/* it must have aborted or crashed */`
`321`		`-#if 1`
`322`	`321`	`SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,`
`323`	`322`	`InvalidTransactionId);`
`324`		`-#endif`
`325`	`323`	`return true;`
`326`	`324`	`}`
`327`	`325`
`@@ -697,10 +695,8 @@ HeapTupleSatisfiesUpdate(HeapTuple htup, CommandId curcid,`
`697`	`695`	`if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))`
`698`	`696`	`{`
`699`	`697`	`/* it must have aborted or crashed */`
`700`		`-#if 1`
`701`	`698`	`SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,`
`702`	`699`	`InvalidTransactionId);`
`703`		`-#endif`
`704`	`700`	`return HeapTupleMayBeUpdated;`
`705`	`701`	`}`
`706`	`702`
`@@ -848,7 +844,6 @@ HeapTupleSatisfiesDirty(HeapTuple htup, Snapshot snapshot,`
`848`	`844`	`}`
`849`	`845`
`850`	`846`	`snapshot->xmin = HeapTupleHeaderGetRawXmin(tuple);`
`851`		`- snapshot->xmax = HeapTupleHeaderGetRawXmax(tuple);`
`852`	`847`	`/* XXX shouldn't we fall through to look at xmax? */`
`853`	`848`	`return true; /* in insertion by other */`
`854`	`849`	`}`
`@@ -920,10 +915,8 @@ HeapTupleSatisfiesDirty(HeapTuple htup, Snapshot snapshot,`
`920`	`915`	`if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))`
`921`	`916`	`{`
`922`	`917`	`/* it must have aborted or crashed */`
`923`		`-#if 1`
`924`	`918`	`SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,`
`925`	`919`	`InvalidTransactionId);`
`926`		`-#endif`
`927`	`920`	`return true;`
`928`	`921`	`}`
`929`	`922`
`@@ -1132,10 +1125,8 @@ HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,`
`1132`	`1125`	`if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))`
`1133`	`1126`	`{`
`1134`	`1127`	`/* it must have aborted or crashed */`
`1135`		`-#if 1`
`1136`	`1128`	`SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,`
`1137`	`1129`	`InvalidTransactionId);`
`1138`		`-#endif`
`1139`	`1130`	`return true;`
`1140`	`1131`	`}`
`1141`	`1132`
`@@ -1305,10 +1296,8 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,`
`1305`	`1296`	`{`
`1306`	`1297`	`if (TransactionIdIsInProgress(HeapTupleHeaderGetRawXmax(tuple)))`
`1307`	`1298`	`return HEAPTUPLE_LIVE;`
`1308`		`-#if 1`
`1309`	`1299`	`SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,`
`1310`	`1300`	`InvalidTransactionId);`
`1311`		`-#endif`
`1312`	`1301`	`}`
`1313`	`1302`	`}`
`1314`	`1303`
`@@ -1365,9 +1354,7 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,`
`1365`	`1354`	`* Not in Progress, Not Committed, so either Aborted or crashed.`
`1366`	`1355`	`* Remove the Xmax.`
`1367`	`1356`	`*/`
`1368`		`-#if 1`
`1369`	`1357`	`SetHintBits(tuple, buffer, HEAP_XMAX_INVALID, InvalidTransactionId);`
`1370`		`-#endif`
`1371`	`1358`	`return HEAPTUPLE_LIVE;`
`1372`	`1359`	`}`
`1373`	`1360`
`@@ -1383,10 +1370,8 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,`
`1383`	`1370`	`/*`
`1384`	`1371`	`* Not in Progress, Not Committed, so either Aborted or crashed`
`1385`	`1372`	`*/`
`1386`		`-#if 1`
`1387`	`1373`	`SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,`
`1388`	`1374`	`InvalidTransactionId);`
`1389`		`-#endif`
`1390`	`1375`	`return HEAPTUPLE_LIVE;`
`1391`	`1376`	`}`
`1392`	`1377`