postgrespro
diff --git a/‎contrib/pg_dtm/libdtm.c
Lines changed: 1 addition & 5 deletions b/‎contrib/pg_dtm/libdtm.c
Lines changed: 1 addition & 5 deletions
diff --git a/‎contrib/pg_dtm/pg_dtm.c
Lines changed: 2 additions & 9 deletions b/‎contrib/pg_dtm/pg_dtm.c
Lines changed: 2 additions & 9 deletions
@@ -113,12 +113,9 @@ static bool DtmConnect(DTMConn conn)
 
 	if (conn->host == NULL)
 	{
-		perror("unix socket not supported yet");
-		*(int*)0 = 0;
-		/*
 		// use a UNIX socket
 		struct sockaddr sock;
-		int len = offsetof(struct sockaddr, sa_data) + snprintf(sock.sa_data, sizeof(sock.sa_data), "%s/p%u", dtm_unix_sock_dir, port);
+		int len = offsetof(struct sockaddr, sa_data) + snprintf(sock.sa_data, sizeof(sock.sa_data), "%s/sh.unix", dtm_unix_sock_dir);
 		sock.sa_family = AF_UNIX;
 
 		sd = socket(AF_UNIX, SOCK_STREAM, 0);
@@ -137,7 +134,6 @@ static bool DtmConnect(DTMConn conn)
 		}
 		conn->sock = sd;
 		return (connected = true);
-		*/
 	}
 	else
 	{
 
@@ -948,27 +948,20 @@ Datum dtm_join_transaction(PG_FUNCTION_ARGS)
 
 void DtmBackgroundWorker(Datum arg)
 {
-	elog(ERROR, "unix socket not supported yet");
-	// FIXME: implement switching between multiple connections
-	*(int*)0 = 0;
-
-	/*
 	Shub shub;
 	ShubParams params;
 	char unix_sock_path[MAXPGPATH];
 
-	snprintf(unix_sock_path, sizeof(unix_sock_path), "%s/p%d", Unix_socket_directories, DtmPort);
+	snprintf(unix_sock_path, sizeof(unix_sock_path), "%s/sh.unix", Unix_socket_directories);
 
 	ShubInitParams(&params);
 
-	params.host = DtmHost;
-	params.port = DtmPort;
+	params.hosts = DtmServers;
 	params.file = unix_sock_path;
 	params.buffer_size = DtmBufferSize;
 
 	ShubInitialize(&shub, &params);
 	ShubLoop(&shub);
-	*/
 }
 
 static void ByteBufferAlloc(ByteBuffer* buf)
Original file line number	Diff line number	Diff line change
`@@ -113,12 +113,9 @@ static bool DtmConnect(DTMConn conn)`
`113`	`113`
`114`	`114`	`if (conn->host == NULL)`
`115`	`115`	`{`
`116`		`- perror("unix socket not supported yet");`
`117`		`- (int)0 = 0;`
`118`		`- /*`
`119`	`116`	`// use a UNIX socket`
`120`	`117`	`struct sockaddr sock;`
`121`		`- int len = offsetof(struct sockaddr, sa_data) + snprintf(sock.sa_data, sizeof(sock.sa_data), "%s/p%u", dtm_unix_sock_dir, port);`
	`118`	`+ int len = offsetof(struct sockaddr, sa_data) + snprintf(sock.sa_data, sizeof(sock.sa_data), "%s/sh.unix", dtm_unix_sock_dir);`
`122`	`119`	`sock.sa_family = AF_UNIX;`
`123`	`120`
`124`	`121`	`sd = socket(AF_UNIX, SOCK_STREAM, 0);`
`@@ -137,7 +134,6 @@ static bool DtmConnect(DTMConn conn)`
`137`	`134`	`}`
`138`	`135`	`conn->sock = sd;`
`139`	`136`	`return (connected = true);`
`140`		`- */`
`141`	`137`	`}`
`142`	`138`	`else`
`143`	`139`	`{`