Commitc3368f9

committed

Fix logical replication with different encodings

reported by Shinoda, Noriyoshi <noriyoshi.shinoda@hpe.com>; partialpatch by Kyotaro HORIGUCHI <horiguchi.kyotaro@lab.ntt.co.jp>

1 parente8d016d commitc3368f9Copy full SHA for c3368f9

File tree

-1

lines changed

src/backend/replication
- libpqwalreceiver
  - libpqwalreceiver.c
- logical
  - proto.c

-1

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#include"libpq-fe.h"`
`23`	`23`	`#include"pqexpbuffer.h"`
`24`	`24`	`#include"access/xlog.h"`
	`25`	`+#include"mb/pg_wchar.h"`
`25`	`26`	`#include"miscadmin.h"`
`26`	`27`	`#include"pgstat.h"`
`27`	`28`	`#include"replication/logicalproto.h"`
`@@ -134,9 +135,16 @@ libpqrcv_connect(const char conninfo, bool logical, const char appname,`
`134`	`135`	`}`
`135`	`136`	`keys[++i]="fallback_application_name";`
`136`	`137`	`vals[i]=appname;`
	`138`	`+if (logical)`
	`139`	`+{`
	`140`	`+keys[++i]="client_encoding";`
	`141`	`+vals[i]=GetDatabaseEncodingName();`
	`142`	`+}`
`137`	`143`	`keys[++i]=NULL;`
`138`	`144`	`vals[i]=NULL;`
`139`	`145`
	`146`	`+Assert(i<sizeof(keys));`
	`147`	`+`
`140`	`148`	`conn=palloc0(sizeof(WalReceiverConn));`
`141`	`149`	`conn->streamConn=PQconnectdbParams(keys,vals,/* expand_dbname = */ true);`
`142`	`150`	`if (PQstatus(conn->streamConn)!=CONNECTION_OK)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,7 @@ logicalrep_write_tuple(StringInfo out, Relation rel, HeapTuple tuple)`
`444`	`444`	`outputstr=OidOutputFunctionCall(typclass->typoutput,values[i]);`
`445`	`445`	`len=strlen(outputstr)+1;/* null terminated */`
`446`	`446`	`pq_sendint(out,len,4);/* length */`
`447`		`-appendBinaryStringInfo(out,outputstr,len);/* data */`
	`447`	`+pq_sendstring(out,outputstr);/* data */`
`448`	`448`
`449`	`449`	`pfree(outputstr);`
`450`	`450`

Comments

(0)