Merge branch 'master' of github.com:postgrespro/postgres_cluster

kelvich · kelvich · commit 746b5ff6bcde · 2015-12-21T13:54:22.000+03:00
diff --git a/contrib/multimaster/multimaster.c b/contrib/multimaster/multimaster.c
@@ -158,6 +158,7 @@ static BackgroundWorker DtmWorker = {
 
 static void DumpSnapshot(Snapshot s, char *name)
 {
+#ifdef DUMP_SNAPSHOT
 	int i;
 	char buf[10000];
 	char *cursor = buf;
@@ -175,6 +176,7 @@ static void DumpSnapshot(Snapshot s, char *name)
 	}
 	cursor += sprintf(cursor, "]");
 	XTM_INFO("%s\n", buf);
+#endif
 }
 
 /* In snapshots provided by DTMD xip array is sorted, so we can use bsearch */
@@ -244,7 +246,9 @@ static void DtmMergeWithGlobalSnapshot(Snapshot dst)
 	for (xid = dst->xmax; xid < src->xmax; xid++)
 		if (TransactionIdIsInDoubt(xid))
 			goto GetLocalSnapshot;
-	DumpSnapshot(dst, "local");
+
+    GetCurrentTransactionId();
+    DumpSnapshot(dst, "local");
 	DumpSnapshot(src, "DTM");
 
 	if (src->xmax < dst->xmax) dst->xmax = src->xmax;
@@ -764,6 +768,7 @@ DtmXactCallback(XactEvent event, void *arg)
             MMBeginTransaction();
         }
         break;
+#if 0
     case XACT_EVENT_PRE_COMMIT:
     case XACT_EVENT_PARALLEL_PRE_COMMIT:
     { 
@@ -774,6 +779,7 @@ DtmXactCallback(XactEvent event, void *arg)
         }
         break;
     }
+#endif
     case XACT_EVENT_COMMIT:
     case XACT_EVENT_ABORT:
 		if (TransactionIdIsValid(DtmNextXid))

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ static BackgroundWorker DtmWorker = {`
`158`	`158`
`159`	`159`	`static void DumpSnapshot(Snapshot s, char *name)`
`160`	`160`	`{`
	`161`	`+#ifdef DUMP_SNAPSHOT`
`161`	`162`	`int i;`
`162`	`163`	`char buf[10000];`
`163`	`164`	`char *cursor = buf;`
`@@ -175,6 +176,7 @@ static void DumpSnapshot(Snapshot s, char *name)`
`175`	`176`	`}`
`176`	`177`	`cursor += sprintf(cursor, "]");`
`177`	`178`	`XTM_INFO("%s\n", buf);`
	`179`	`+#endif`
`178`	`180`	`}`
`179`	`181`
`180`	`182`	`/* In snapshots provided by DTMD xip array is sorted, so we can use bsearch */`
`@@ -244,7 +246,9 @@ static void DtmMergeWithGlobalSnapshot(Snapshot dst)`
`244`	`246`	`for (xid = dst->xmax; xid < src->xmax; xid++)`
`245`	`247`	`if (TransactionIdIsInDoubt(xid))`
`246`	`248`	`goto GetLocalSnapshot;`
`247`		`- DumpSnapshot(dst, "local");`
	`249`	`+`
	`250`	`+ GetCurrentTransactionId();`
	`251`	`+ DumpSnapshot(dst, "local");`
`248`	`252`	`DumpSnapshot(src, "DTM");`
`249`	`253`
`250`	`254`	`if (src->xmax < dst->xmax) dst->xmax = src->xmax;`
`@@ -764,6 +768,7 @@ DtmXactCallback(XactEvent event, void *arg)`
`764`	`768`	`MMBeginTransaction();`
`765`	`769`	`}`
`766`	`770`	`break;`
	`771`	`+#if 0`
`767`	`772`	`case XACT_EVENT_PRE_COMMIT:`
`768`	`773`	`case XACT_EVENT_PARALLEL_PRE_COMMIT:`
`769`	`774`	`{`
`@@ -774,6 +779,7 @@ DtmXactCallback(XactEvent event, void *arg)`
`774`	`779`	`}`
`775`	`780`	`break;`
`776`	`781`	`}`
	`782`	`+#endif`
`777`	`783`	`case XACT_EVENT_COMMIT:`
`778`	`784`	`case XACT_EVENT_ABORT:`
`779`	`785`	`if (TransactionIdIsValid(DtmNextXid))`