Fix logical replication with different encodings

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

diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
index 44a89c73fde9876fe38e650fbc74d92f90db8d94..44ded74f51980d30e44ca8eb8fbbdc356c67766a 100644 (file)
--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -22,6 +22,7 @@
 #include "libpq-fe.h"
 #include "pqexpbuffer.h"
 #include "access/xlog.h"
+#include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "pgstat.h"
 #include "replication/logicalproto.h"
@@ -134,9 +135,16 @@ libpqrcv_connect(const char *conninfo, bool logical, const char *appname,
        }
        keys[++i] = "fallback_application_name";
        vals[i] = appname;
+       if (logical)
+       {
+               keys[++i] = "client_encoding";
+               vals[i] = GetDatabaseEncodingName();
+       }
        keys[++i] = NULL;
        vals[i] = NULL;
 
+       Assert(i < sizeof(keys));
+
        conn = palloc0(sizeof(WalReceiverConn));
        conn->streamConn = PQconnectdbParams(keys, vals, /* expand_dbname = */ true);
        if (PQstatus(conn->streamConn) != CONNECTION_OK)

diff --git a/src/backend/replication/logical/proto.c b/src/backend/replication/logical/proto.c
index 142cd993cd858519e657030cee72c4f643bb4ab0..bc6e9b5a98cb726cd3697825f0d76e6a4abba192 100644 (file)
--- a/src/backend/replication/logical/proto.c
+++ b/src/backend/replication/logical/proto.c
@@ -444,7 +444,7 @@ logicalrep_write_tuple(StringInfo out, Relation rel, HeapTuple tuple)
                outputstr = OidOutputFunctionCall(typclass->typoutput, values[i]);
                len = strlen(outputstr) + 1;    /* null terminated */
                pq_sendint(out, len, 4);                /* length */
-               appendBinaryStringInfo(out, outputstr, len); /* data */
+               pq_sendstring(out, outputstr);  /* data */
 
                pfree(outputstr);