Commitadbcd44

committed

Add switching to next host:port to DTMD.

1 parent4aa6a83 commitadbcd44Copy full SHA for adbcd44

File tree

+133

-118

lines changed

+133

-118

lines changed

Lines changed: 1 addition & 5 deletions

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`	`structsockaddrsock;`
`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`	`+intlen= offsetof(structsockaddr,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`	`{`

Lines changed: 2 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -948,27 +948,20 @@ Datum dtm_join_transaction(PG_FUNCTION_ARGS)`
`948`	`948`
`949`	`949`	`voidDtmBackgroundWorker(Datumarg)`
`950`	`950`	`{`
`951`		`-elog(ERROR,"unix socket not supported yet");`
`952`		`-// FIXME: implement switching between multiple connections`
`953`		`-(int)0=0;`
`954`		`-`
`955`		`-/*`
`956`	`951`	`Shubshub;`
`957`	`952`	`ShubParamsparams;`
`958`	`953`	`charunix_sock_path[MAXPGPATH];`
`959`	`954`
`960`		`-snprintf(unix_sock_path, sizeof(unix_sock_path), "%s/p%d", Unix_socket_directories, DtmPort);`
	`955`	`+snprintf(unix_sock_path,sizeof(unix_sock_path),"%s/sh.unix",Unix_socket_directories);`
`961`	`956`
`962`	`957`	`ShubInitParams(&params);`
`963`	`958`
`964`		`-params.host = DtmHost;`
`965`		`-params.port = DtmPort;`
	`959`	`+params.hosts=DtmServers;`
`966`	`960`	`params.file=unix_sock_path;`
`967`	`961`	`params.buffer_size=DtmBufferSize;`
`968`	`962`
`969`	`963`	`ShubInitialize(&shub,&params);`
`970`	`964`	`ShubLoop(&shub);`
`971`		`-*/`
`972`	`965`	`}`
`973`	`966`
`974`	`967`	`staticvoidByteBufferAlloc(ByteBuffer*buf)`

Comments

(0)