Fix oldest xid adjustment algorithm

knizhnik · knizhnik · commit 3057a011e8fc · 2016-04-26T13:10:39.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -342,14 +342,14 @@ csn_t MtmTransactionSnapshot(TransactionId xid)
 Snapshot MtmGetSnapshot(Snapshot snapshot)
 {
     snapshot = PgGetSnapshotData(snapshot);
-	RecentGlobalDataXmin = RecentGlobalXmin = MtmAdjustOldestXid(RecentGlobalDataXmin);
+	RecentGlobalDataXmin = RecentGlobalXmin = Mtm->oldestXid;//MtmAdjustOldestXid(RecentGlobalDataXmin);
     return snapshot;
 }
 
 
 TransactionId MtmGetOldestXmin(Relation rel, bool ignoreVacuum)
 {
-    TransactionId xmin = PgGetOldestXmin(NULL, ignoreVacuum); /* consider all backends */
+    TransactionId xmin = PgGetOldestXmin(NULL, false); /* consider all backends */
     xmin = MtmAdjustOldestXid(xmin);
     return xmin;
 }
@@ -540,7 +540,8 @@ MtmAdjustOldestXid(TransactionId xid)
 			if (prev != NULL) { 
 				Mtm->transListHead = prev;
 				Mtm->oldestXid = xid = prev->xid;            
-			} else if (TransactionIdPrecedes(Mtm->oldestXid, xid)) { 
+			} else  {
+				Assert(TransactionIdPrecedesOrEqual(Mtm->oldestXid, xid)); 
 				xid = Mtm->oldestXid;
 			}
 		} else { 

Original file line number	Diff line number	Diff line change
`@@ -342,14 +342,14 @@ csn_t MtmTransactionSnapshot(TransactionId xid)`
`342`	`342`	`Snapshot MtmGetSnapshot(Snapshot snapshot)`
`343`	`343`	`{`
`344`	`344`	`snapshot = PgGetSnapshotData(snapshot);`
`345`		`- RecentGlobalDataXmin = RecentGlobalXmin = MtmAdjustOldestXid(RecentGlobalDataXmin);`
	`345`	`+ RecentGlobalDataXmin = RecentGlobalXmin = Mtm->oldestXid;//MtmAdjustOldestXid(RecentGlobalDataXmin);`
`346`	`346`	`return snapshot;`
`347`	`347`	`}`
`348`	`348`
`349`	`349`
`350`	`350`	`TransactionId MtmGetOldestXmin(Relation rel, bool ignoreVacuum)`
`351`	`351`	`{`
`352`		`- TransactionId xmin = PgGetOldestXmin(NULL, ignoreVacuum); /* consider all backends */`
	`352`	`+ TransactionId xmin = PgGetOldestXmin(NULL, false); /* consider all backends */`
`353`	`353`	`xmin = MtmAdjustOldestXid(xmin);`
`354`	`354`	`return xmin;`
`355`	`355`	`}`
`@@ -540,7 +540,8 @@ MtmAdjustOldestXid(TransactionId xid)`
`540`	`540`	`if (prev != NULL) {`
`541`	`541`	`Mtm->transListHead = prev;`
`542`	`542`	`Mtm->oldestXid = xid = prev->xid;`
`543`		`- } else if (TransactionIdPrecedes(Mtm->oldestXid, xid)) {`
	`543`	`+ } else {`
	`544`	`+ Assert(TransactionIdPrecedesOrEqual(Mtm->oldestXid, xid));`
`544`	`545`	`xid = Mtm->oldestXid;`
`545`	`546`	`}`
`546`	`547`	`} else {`