Fix bug in get_cluster_info

knizhnik · knizhnik · commit eb3db1de427b · 2016-05-31T15:55:56.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -461,6 +461,7 @@ MtmAdjustOldestXid(TransactionId xid)
 	MtmTransState *ts = (MtmTransState*)hash_search(MtmXid2State, &xid, HASH_FIND, NULL);
 	MTM_LOG2("%d: MtmAdjustOldestXid(%d): snapshot=%ld, csn=%ld, status=%d", MyProcPid, xid, ts != NULL ? ts->snapshot : 0, ts != NULL ? ts->csn : 0, ts != NULL ? ts->status : -1);
 	Mtm->gcCount = 0;
+
 	if (ts != NULL) { 
 		oldestSnapshot = ts->snapshot;
 		Mtm->nodes[MtmNodeId-1].oldestSnapshot = oldestSnapshot;
@@ -487,6 +488,7 @@ MtmAdjustOldestXid(TransactionId xid)
 			}
 		}
 	} 
+
 	if (MtmUseDtm) 
 	{ 
 		if (prev != NULL) { 
@@ -2537,7 +2539,6 @@ mtm_get_cluster_info(PG_FUNCTION_ARGS)
 	tuple = BuildTupleFromCStrings(funcctx->attinmeta, values);
 	PQclear(result);
 	PQfinish(conn);
-	usrfctx->nodeId += 1;
 	SRF_RETURN_NEXT(funcctx, HeapTupleGetDatum(tuple));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -461,6 +461,7 @@ MtmAdjustOldestXid(TransactionId xid)`
`461`	`461`	`MtmTransState ts = (MtmTransState)hash_search(MtmXid2State, &xid, HASH_FIND, NULL);`
`462`	`462`	`MTM_LOG2("%d: MtmAdjustOldestXid(%d): snapshot=%ld, csn=%ld, status=%d", MyProcPid, xid, ts != NULL ? ts->snapshot : 0, ts != NULL ? ts->csn : 0, ts != NULL ? ts->status : -1);`
`463`	`463`	`Mtm->gcCount = 0;`
	`464`	`+`
`464`	`465`	`if (ts != NULL) {`
`465`	`466`	`oldestSnapshot = ts->snapshot;`
`466`	`467`	`Mtm->nodes[MtmNodeId-1].oldestSnapshot = oldestSnapshot;`
`@@ -487,6 +488,7 @@ MtmAdjustOldestXid(TransactionId xid)`
`487`	`488`	`}`
`488`	`489`	`}`
`489`	`490`	`}`
	`491`	`+`
`490`	`492`	`if (MtmUseDtm)`
`491`	`493`	`{`
`492`	`494`	`if (prev != NULL) {`
`@@ -2537,7 +2539,6 @@ mtm_get_cluster_info(PG_FUNCTION_ARGS)`
`2537`	`2539`	`tuple = BuildTupleFromCStrings(funcctx->attinmeta, values);`
`2538`	`2540`	`PQclear(result);`
`2539`	`2541`	`PQfinish(conn);`
`2540`		`- usrfctx->nodeId += 1;`
`2541`	`2542`	`SRF_RETURN_NEXT(funcctx, HeapTupleGetDatum(tuple));`
`2542`	`2543`	`}`
`2543`	`2544`