Add low bound parameter to DtmGlobalReserve

knizhnik · knizhnik · commit 5fb4f7fe1044 · 2015-09-21T19:50:12.000+03:00
diff --git a/contrib/pg_xtm/pg_dtm--1.0.sql b/contrib/pg_xtm/pg_dtm--1.0.sql
@@ -6,7 +6,7 @@ AS 'MODULE_PATHNAME','dtm_begin_transaction'
 LANGUAGE C;
 
 CREATE FUNCTION dtm_join_transaction(xid integer) RETURNS void
-AS 'MODULE_PATHNAME','dtm_get_snapshot'
+AS 'MODULE_PATHNAME','dtm_join_transaction'
 LANGUAGE C;
 
 CREATE FUNCTION dtm_get_current_snapshot_xmin() RETURNS integer
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -242,9 +242,10 @@ static TransactionId DtmGetNextXid()
     } else {        
         LWLockAcquire(dtm->xidLock, LW_EXCLUSIVE);
         if (dtm->nReservedXids == 0) { 
-            xid = DtmGlobalReserve(DtmLocalXidReserve);        
+            xid = DtmGlobalReserve(dtm->nextXid, DtmLocalXidReserve);        
             dtm->nReservedXids = DtmLocalXidReserve;
             ShmemVariableCache->nextXid = xid;
+            dtm->nextXid = xid;
         } 
         Assert(dtm->nextXid == ShmemVariableCache->nextXid);
         xid = ShmemVariableCache->nextXid;
@@ -452,13 +453,6 @@ PG_FUNCTION_INFO_V1(dtm_get_current_snapshot_xmin);
 Datum
 dtm_get_current_snapshot_xmin(PG_FUNCTION_ARGS)
 {
-    // if (IsolationUsesXactSnapshot()){ /* RR & S */
-    //     DtmEnsureConnection();
-    //     DtmGlobalGetSnapshot(DtmConn, DtmNodeId, gtid.xids[DtmNodeId], &DtmSnapshot);
-    //     Assert(CurrentTransactionSnapshot != NULL);
-    //     DtmMergeSnapshots(CurrentTransactionSnapshot, &DtmSnapshot);
-    //     DtmUpdateRecentXmin();
-    // }
     PG_RETURN_INT32(CurrentTransactionSnapshot->xmin);
 }
 
