Add DtmdHost and DtmdPort variables

knizhnik · knizhnik · commit fe853cadd864 · 2015-10-04T11:21:42.000+03:00
diff --git a/contrib/pg_dtm/libdtm.c b/contrib/pg_dtm/libdtm.c
@@ -24,6 +24,10 @@ typedef struct DTMConnData
 
 typedef unsigned long long xid_t;
 
+int DtmdPort;
+char* DtmdHost;
+
+
 // Returns true if the write was successful.
 static bool dtm_write_char(DTMConn dtm, char c)
 {
@@ -237,7 +241,7 @@ static DTMConn GetConnection()
 	if (dtm == NULL)
 	{
 		// FIXME: add API for setting the host and port for dtm connection
-		dtm = DtmConnect("127.0.0.1", 5431);
+		dtm = DtmConnect(DtmdHost, DtmdPort);
         if (dtm == NULL) { 
             elog(ERROR, "Failed to connect to DTMD");
         }
diff --git a/contrib/pg_dtm/libdtm.h b/contrib/pg_dtm/libdtm.h
@@ -8,6 +8,9 @@
 
 #define INVALID_XID 0
 
+extern int DtmdPort;
+extern char* DtmdHost;
+
 void DtmInitSnapshot(Snapshot snapshot);
 
 // Starts a new global transaction. Returns the
diff --git a/contrib/pg_dtm/pg_dtm.c b/contrib/pg_dtm/pg_dtm.c
@@ -713,6 +713,33 @@ _PG_init(void)
 		NULL
 	);
 
+	DefineCustomIntVariable(
+		"dtm.dtmd_port",
+		"DTMD port",
+		NULL,
+		&DtmdPort,
+		5431,
+		1,
+		INT_MAX,
+		PGC_BACKEND,
+		0,
+		NULL,
+		NULL,
+		NULL
+	);
+
+	DefineCustomStringVariable(
+        "dtm.dtmd_host",
+        "DTMD host name",
+        NULL,
+        &DtmdHost,
+        "localhost",
+        PGC_BACKEND,
+        0,
+        NULL,
+        NULL,
+        NULL);
+
 	/*
 	 * Install hooks.
 	 */
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
@@ -1464,6 +1464,12 @@ HeapTupleIsSurelyDead(HeapTuple htup, TransactionId OldestXmin)
 	return TransactionIdPrecedes(HeapTupleHeaderGetRawXmax(tuple), OldestXmin);
 }
 
+bool 
+XidInMVCCSnapshot(TransactionId xid, Snapshot snapshot)
+{
+    return TM->IsInSnapshot(xid, snapshot);
+}
+
 /*
  * XidInMVCCSnapshot
  *		Is the given XID still-in-progress according to the snapshot?
@@ -1474,8 +1480,8 @@ HeapTupleIsSurelyDead(HeapTuple htup, TransactionId OldestXmin)
  * TransactionIdIsCurrentTransactionId first, except for known-committed
  * XIDs which could not be ours anyway.
  */
-static bool
-XidInMVCCSnapshot(TransactionId xid, Snapshot snapshot)
+bool
+PgXidInMVCCSnapshot(TransactionId xid, Snapshot snapshot)
 {
 	uint32		i;
 

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,10 @@ typedef struct DTMConnData`
`24`	`24`
`25`	`25`	`typedef unsigned long long xid_t;`
`26`	`26`
	`27`	`+int DtmdPort;`
	`28`	`+char* DtmdHost;`
	`29`	`+`
	`30`	`+`
`27`	`31`	`// Returns true if the write was successful.`
`28`	`32`	`static bool dtm_write_char(DTMConn dtm, char c)`
`29`	`33`	`{`
`@@ -237,7 +241,7 @@ static DTMConn GetConnection()`
`237`	`241`	`if (dtm == NULL)`
`238`	`242`	`{`
`239`	`243`	`// FIXME: add API for setting the host and port for dtm connection`
`240`		`- dtm = DtmConnect("127.0.0.1", 5431);`
	`244`	`+ dtm = DtmConnect(DtmdHost, DtmdPort);`
`241`	`245`	`if (dtm == NULL) {`
`242`	`246`	`elog(ERROR, "Failed to connect to DTMD");`
`243`	`247`	`}`