MMTS update

knizhnik · knizhnik · commit d092bc2bbedf · 2016-02-12T14:17:49.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -507,7 +507,7 @@ void MtmSendNotificationMessage(MtmTransState* ts)
 	}
 }
 
-static XidStatus 
+static bool
 MtmCommitTransaction(TransactionId xid, int nsubxids, TransactionId *subxids)
 {
 	MtmTransState* ts;
@@ -523,7 +523,7 @@ MtmCommitTransaction(TransactionId xid, int nsubxids, TransactionId *subxids)
 
 	MtmVoteForTransaction(ts); 
 
-	return ts->status;
+	return ts->status == TRANSACTION_STATUS_COMMITTED;
 }
 	
 static void 
@@ -558,7 +558,7 @@ MtmSetTransactionStatus(TransactionId xid, int nsubxids, TransactionId *subxids,
 		}
 		else
 		{
-			if (MtmCommitTransaction(xid, nsubxids, subxids) == TRANSACTION_STATUS_COMMITTED) { 
+			if (MtmCommitTransaction(xid, nsubxids, subxids)) {
 				MTM_TRACE("Commit transaction %d\n", xid);
 			} else { 
 				PgTransactionIdSetTreeStatus(xid, nsubxids, subxids, TRANSACTION_STATUS_ABORTED, lsn);

Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ void MtmSendNotificationMessage(MtmTransState* ts)`
`507`	`507`	`}`
`508`	`508`	`}`
`509`	`509`
`510`		`-static XidStatus`
	`510`	`+static bool`
`511`	`511`	`MtmCommitTransaction(TransactionId xid, int nsubxids, TransactionId *subxids)`
`512`	`512`	`{`
`513`	`513`	`MtmTransState* ts;`
`@@ -523,7 +523,7 @@ MtmCommitTransaction(TransactionId xid, int nsubxids, TransactionId *subxids)`
`523`	`523`
`524`	`524`	`MtmVoteForTransaction(ts);`
`525`	`525`
`526`		`- return ts->status;`
	`526`	`+ return ts->status == TRANSACTION_STATUS_COMMITTED;`
`527`	`527`	`}`
`528`	`528`
`529`	`529`	`static void`
`@@ -558,7 +558,7 @@ MtmSetTransactionStatus(TransactionId xid, int nsubxids, TransactionId *subxids,`
`558`	`558`	`}`
`559`	`559`	`else`
`560`	`560`	`{`
`561`		`- if (MtmCommitTransaction(xid, nsubxids, subxids) == TRANSACTION_STATUS_COMMITTED) {`
	`561`	`+ if (MtmCommitTransaction(xid, nsubxids, subxids)) {`
`562`	`562`	`MTM_TRACE("Commit transaction %d\n", xid);`
`563`	`563`	`} else {`
`564`	`564`	`PgTransactionIdSetTreeStatus(xid, nsubxids, subxids, TRANSACTION_STATUS_ABORTED, lsn);`