Use volkwagen more for OldestXmin adjustment

knizhnik · knizhnik · commit 744e089a9e0d · 2016-10-17T12:42:46.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -580,10 +580,6 @@ MtmAdjustOldestXid(TransactionId xid)
 			 ts != NULL 
 				 && ts->csn < oldestSnapshot
 				 && TransactionIdPrecedes(ts->xid, xid);
-/*
-				 && (ts->status == TRANSACTION_STATUS_COMMITTED ||
-					 ts->status == TRANSACTION_STATUS_ABORTED);
-*/
 			 prev = ts, ts = ts->next) 
 		{ 
 			if (prev != NULL) { 
@@ -594,7 +590,7 @@ MtmAdjustOldestXid(TransactionId xid)
 		}
 	} 
 
-	if (MtmUseDtm) 
+	if (MtmUseDtm && !MtmVolksWagenMode) 
 	{ 
 		if (prev != NULL) { 
 			MTM_LOG2("%d: MtmAdjustOldestXid: oldestXid=%d, prev->xid=%d, prev->status=%d, prev->snapshot=%ld, ts->xid=%d, ts->status=%d, ts->snapshot=%ld, oldestSnapshot=%ld", 
@@ -606,6 +602,8 @@ MtmAdjustOldestXid(TransactionId xid)
 		}
 	} else { 
 		if (prev != NULL) { 
+			MTM_LOG2("%d: MtmAdjustOldestXid: oldestXid=%d, prev->xid=%d, prev->status=%d, prev->snapshot=%ld, ts->xid=%d, ts->status=%d, ts->snapshot=%ld, oldestSnapshot=%ld", 
+					 MyProcPid, xid, prev->xid, prev->status, prev->snapshot, (ts ? ts->xid : 0), (ts ? ts->status : -1), (ts ? ts->snapshot : -1), oldestSnapshot);
 			Mtm->transListHead = prev;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -580,10 +580,6 @@ MtmAdjustOldestXid(TransactionId xid)`
`580`	`580`	`ts != NULL`
`581`	`581`	`&& ts->csn < oldestSnapshot`
`582`	`582`	`&& TransactionIdPrecedes(ts->xid, xid);`
`583`		`-/*`
`584`		`- && (ts->status == TRANSACTION_STATUS_COMMITTED \|\|`
`585`		`- ts->status == TRANSACTION_STATUS_ABORTED);`
`586`		`-*/`
`587`	`583`	`prev = ts, ts = ts->next)`
`588`	`584`	`{`
`589`	`585`	`if (prev != NULL) {`
`@@ -594,7 +590,7 @@ MtmAdjustOldestXid(TransactionId xid)`
`594`	`590`	`}`
`595`	`591`	`}`
`596`	`592`
`597`		`- if (MtmUseDtm)`
	`593`	`+ if (MtmUseDtm && !MtmVolksWagenMode)`
`598`	`594`	`{`
`599`	`595`	`if (prev != NULL) {`
`600`	`596`	`MTM_LOG2("%d: MtmAdjustOldestXid: oldestXid=%d, prev->xid=%d, prev->status=%d, prev->snapshot=%ld, ts->xid=%d, ts->status=%d, ts->snapshot=%ld, oldestSnapshot=%ld",`
`@@ -606,6 +602,8 @@ MtmAdjustOldestXid(TransactionId xid)`
`606`	`602`	`}`
`607`	`603`	`} else {`
`608`	`604`	`if (prev != NULL) {`
	`605`	`+ MTM_LOG2("%d: MtmAdjustOldestXid: oldestXid=%d, prev->xid=%d, prev->status=%d, prev->snapshot=%ld, ts->xid=%d, ts->status=%d, ts->snapshot=%ld, oldestSnapshot=%ld",`
	`606`	`+ MyProcPid, xid, prev->xid, prev->status, prev->snapshot, (ts ? ts->xid : 0), (ts ? ts->status : -1), (ts ? ts->snapshot : -1), oldestSnapshot);`
`609`	`607`	`Mtm->transListHead = prev;`
`610`	`608`	`}`
`611`	`609`	`}`