Remove TransactionIsInProgress from DTM API

knizhnik · knizhnik · commit 0a03a1b93026 · 2015-09-18T16:29:39.000+03:00
diff --git a/contrib/pg_xtm/dtmd/include/util.h b/contrib/pg_xtm/dtmd/include/util.h
@@ -16,7 +16,7 @@ char *join_path(const char *dir, const char *file);
 bool inrange(xid_t min, xid_t x, xid_t max);
 int falloc(int fd, off64_t size);
 
-#ifdef NDEBUG
+#ifndef DEBUG
 #define shout(...)
 #else
 #define shout(...) \
diff --git a/contrib/pg_xtm/libdtm.c b/contrib/pg_xtm/libdtm.c
@@ -97,10 +97,8 @@ DTMConn DtmConnect(char *host, int port) {
 			continue;
 		}
 
-		#ifdef NODELAY
 		int one = 1;
 		setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one));
-		#endif
 
 		if (connect(sock, a->ai_addr, a->ai_addrlen) == -1) {
 			perror("failed to connect to an address");
diff --git a/contrib/pg_xtm/pg_dtm--1.0.sql b/contrib/pg_xtm/pg_dtm--1.0.sql
@@ -4,7 +4,3 @@
 CREATE FUNCTION dtm_begin_transaction(nodes integer[], xids integer[]) RETURNS void
 AS 'MODULE_PATHNAME','dtm_begin_transaction'
 LANGUAGE C;
-
-CREATE FUNCTION dtm_get_snapshot() RETURNS void
-AS 'MODULE_PATHNAME','dtm_get_snapshot'
-LANGUAGE C;
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -45,7 +45,6 @@ static void DtmCopySnapshot(Snapshot dst, Snapshot src);
 static XidStatus DtmGetTransactionStatus(TransactionId xid, XLogRecPtr *lsn);
 static void DtmSetTransactionStatus(TransactionId xid, int nsubxids, TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
 static void DtmUpdateRecentXmin(void);
-static bool DtmTransactionIsInProgress(TransactionId xid);
 static bool TransactionIdIsInDtmSnapshot(Snapshot s, TransactionId xid);
 static bool TransactionIdIsInDoubt(Snapshot s, TransactionId xid);
 
@@ -54,7 +53,7 @@ static DTMConn DtmConn;
 static SnapshotData DtmSnapshot = { HeapTupleSatisfiesMVCC };
 static bool DtmHasSnapshot = false;
 static bool DtmGlobalTransaction = false;
-static TransactionManager DtmTM = { DtmGetTransactionStatus, DtmSetTransactionStatus, DtmGetSnapshot, DtmTransactionIsInProgress };
+static TransactionManager DtmTM = { DtmGetTransactionStatus, DtmSetTransactionStatus, DtmGetSnapshot };
 static DTMConn DtmConn;
 
 #define XTM_TRACE(fmt, ...) 
@@ -206,12 +205,6 @@ static Snapshot DtmGetSnapshot(Snapshot snapshot)
 }
 
 
-static bool DtmTransactionIsInProgress(TransactionId xid)
-{
-    XTM_TRACE("XTM: DtmTransactionIsInProgress \n");
-    return TransactionIdIsRunning(xid);// || (DtmHasSnapshot && TransactionIdIsInDtmSnapshot(&DtmSnapshot, xid));
-}
-
 static XidStatus DtmGetTransactionStatus(TransactionId xid, XLogRecPtr *lsn)
 {
     XidStatus status = CLOGTransactionIdGetStatus(xid, lsn);
@@ -288,7 +281,6 @@ _PG_fini(void)
 PG_MODULE_MAGIC;
 
 PG_FUNCTION_INFO_V1(dtm_begin_transaction);
-PG_FUNCTION_INFO_V1(dtm_get_snapshot);
 
 Datum
 dtm_begin_transaction(PG_FUNCTION_ARGS)
@@ -308,16 +300,3 @@ dtm_begin_transaction(PG_FUNCTION_ARGS)
     }
 	PG_RETURN_VOID();
 }
-
-Datum
-dtm_get_snapshot(PG_FUNCTION_ARGS)
-{
-    DtmEnsureConnection();
-    DtmGlobalGetSnapshot(DtmConn, DtmNodeId, GetCurrentTransactionId(), &DtmSnapshot);
-
-    XTM_TRACE("XTM: dtm_get_snapshot \n");
-    DtmHasSnapshot = true;
-    DtmGlobalTransaction = true;
-	PG_RETURN_VOID();
-}
-
diff --git a/contrib/pg_xtm/tests/transfers.go b/contrib/pg_xtm/tests/transfers.go
@@ -3,7 +3,7 @@ package main
 import (
     "fmt"
     "sync"
-    "math/rand"
+//    "math/rand"
     "github.com/jackc/pgx"
 )
 
@@ -107,8 +107,8 @@ func transfer(id int, wg *sync.WaitGroup) {
     for i := 0; i < N_ITERATIONS; i++ {
         //amount := 2*rand.Intn(2) - 1
         amount := 1
-        account1 := rand.Intn(N_ACCOUNTS) 
-        account2 := rand.Intn(N_ACCOUNTS)
+        account1 := id//rand.Intn(N_ACCOUNTS) 
+        account2 := id//rand.Intn(N_ACCOUNTS)
 
         // strt transaction
         exec(conn1, "begin")
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
@@ -44,7 +44,7 @@
 #include "miscadmin.h"
 #include "pg_trace.h"
 
-TransactionManager DefaultTM = { CLOGTransactionIdGetStatus, CLOGTransactionIdSetTreeStatus, GetLocalSnapshotData, TransactionIdIsRunning };
+TransactionManager DefaultTM = { CLOGTransactionIdGetStatus, CLOGTransactionIdSetTreeStatus, GetLocalSnapshotData };
 TransactionManager* TM = &DefaultTM;
 
 /*
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
@@ -962,12 +962,6 @@ ProcArrayApplyXidAssignment(TransactionId topxid,
 	LWLockRelease(ProcArrayLock);
 }
 
-bool
-TransactionIdIsInProgress(TransactionId xid)
-{
-    return TM->IsInProgress(xid);
-}
-
 /*
  * TransactionIdIsInProgress -- is given transaction running in some backend
  *
@@ -995,7 +989,7 @@ TransactionIdIsInProgress(TransactionId xid)
  * PGXACT again anyway; see GetNewTransactionId).
  */
 bool
-TransactionIdIsRunning(TransactionId xid)
+TransactionIdIsInProgress(TransactionId xid)
 {
 	static TransactionId *xids = NULL;
 	int			nxids = 0;
diff --git a/src/include/access/xtm.h b/src/include/access/xtm.h
@@ -19,7 +19,6 @@ typedef struct
     XidStatus (*GetTransactionStatus)(TransactionId xid, XLogRecPtr *lsn);
     void (*SetTransactionStatus)(TransactionId xid, int nsubxids, TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
     Snapshot (*GetSnapshot)(Snapshot snapshot);
-    bool (*IsInProgress)(TransactionId xid);
 } TransactionManager;
 
 extern TransactionManager* TM;

Original file line number	Diff line number	Diff line change
`@@ -97,10 +97,8 @@ DTMConn DtmConnect(char *host, int port) {`
`97`	`97`	`continue;`
`98`	`98`	`}`
`99`	`99`
`100`		`- #ifdef NODELAY`
`101`	`100`	`int one = 1;`
`102`	`101`	`setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one));`
`103`		`- #endif`
`104`	`102`
`105`	`103`	`if (connect(sock, a->ai_addr, a->ai_addrlen) == -1) {`
`106`	`104`	`perror("failed to connect to an address");`