Reify code

knizhnik · knizhnik · commit b0400974703e · 2015-09-14T18:29:02.000+03:00
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -114,20 +114,21 @@ static Snapshot DtmGetSnapshot(Snapshot snapshot)
 {
     if (DtmHasSnapshot) { 
         DtmCopySnapshot(snapshot, &DtmSnapshot);
-        return snapshot;
+        DtmUpdateRecentXmin();
+    } else { 
+        snapshot = GetLocalSnapshotData(snapshot);
     }
-    snapshot = GetLocalSnapshotData(snapshot);
-//    DtmUpdateRecentXmin();
     return snapshot;
 }
 
-
+#if 0
 static bool IsInDtmSnapshot(TransactionId xid)
 {
     return DtmHasSnapshot
         && (/*xid > DtmSnapshot.xmax 
               || */bsearch(&xid, DtmSnapshot.xip, DtmSnapshot.xcnt, sizeof(TransactionId), xidComparator) != NULL);
 }
+#endif
         
 static bool DtmTransactionIsInProgress(TransactionId xid)
 {
@@ -254,11 +255,7 @@ dtm_get_snapshot(PG_FUNCTION_ARGS)
     DtmEnsureConnection();
     DtmGlobalGetSnapshot(DtmConn, DtmNodeId, GetCurrentTransactionId(), &DtmSnapshot);
 
-    //    VacuumProcArray(&DtmSnapshot);
-
     /* Move it to DtmGlobalGetSnapshot? */
-    DtmUpdateRecentXmin();
-	DtmSnapshot.curcid = GetCurrentCommandId(false);
     DtmHasSnapshot = true;
 	PG_RETURN_VOID();
 }
diff --git a/contrib/pg_xtm/tests/transfers.go b/contrib/pg_xtm/tests/transfers.go
@@ -221,8 +221,7 @@ func execQuery(conn *pgx.Conn, stmt string, arguments ...interface{}) int32 {
 
 func checkErr(err error) {
     if err != nil {
-        //panic(err)
-	fmt.Println(err)
+        panic(err)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -114,20 +114,21 @@ static Snapshot DtmGetSnapshot(Snapshot snapshot)`
`114`	`114`	`{`
`115`	`115`	`if (DtmHasSnapshot) {`
`116`	`116`	`DtmCopySnapshot(snapshot, &DtmSnapshot);`
`117`		`- return snapshot;`
	`117`	`+ DtmUpdateRecentXmin();`
	`118`	`+ } else {`
	`119`	`+ snapshot = GetLocalSnapshotData(snapshot);`
`118`	`120`	`}`
`119`		`- snapshot = GetLocalSnapshotData(snapshot);`
`120`		`-// DtmUpdateRecentXmin();`
`121`	`121`	`return snapshot;`
`122`	`122`	`}`
`123`	`123`
`124`		`-`
	`124`	`+#if 0`
`125`	`125`	`static bool IsInDtmSnapshot(TransactionId xid)`
`126`	`126`	`{`
`127`	`127`	`return DtmHasSnapshot`
`128`	`128`	`&& (/*xid > DtmSnapshot.xmax`
`129`	`129`	`\|\| */bsearch(&xid, DtmSnapshot.xip, DtmSnapshot.xcnt, sizeof(TransactionId), xidComparator) != NULL);`
`130`	`130`	`}`
	`131`	`+#endif`
`131`	`132`
`132`	`133`	`static bool DtmTransactionIsInProgress(TransactionId xid)`
`133`	`134`	`{`
`@@ -254,11 +255,7 @@ dtm_get_snapshot(PG_FUNCTION_ARGS)`
`254`	`255`	`DtmEnsureConnection();`
`255`	`256`	`DtmGlobalGetSnapshot(DtmConn, DtmNodeId, GetCurrentTransactionId(), &DtmSnapshot);`
`256`	`257`
`257`		`- // VacuumProcArray(&DtmSnapshot);`
`258`		`-`
`259`	`258`	`/* Move it to DtmGlobalGetSnapshot? */`
`260`		`- DtmUpdateRecentXmin();`
`261`		`- DtmSnapshot.curcid = GetCurrentCommandId(false);`
`262`	`259`	`DtmHasSnapshot = true;`
`263`	`260`	`PG_RETURN_VOID();`
`264`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -221,8 +221,7 @@ func execQuery(conn *pgx.Conn, stmt string, arguments ...interface{}) int32 {`
`221`	`221`
`222`	`222`	`func checkErr(err error) {`
`223`	`223`	`if err != nil {`
`224`		`- //panic(err)`
`225`		`- fmt.Println(err)`
	`224`	`+ panic(err)`
`226`	`225`	`}`
`227`	`226`	`}`
`228`	`227`