From 66a8f090485e3e897a4804121fdbe856cba72d70 Mon Sep 17 00:00:00 2001 From: Bruce Momjian <bruce@momjian.us> Date: Thu, 12 Nov 2020 14:08:59 -0500 Subject: [PATCH] change wire protocol data type for history file content This was marked as BYTEA, but is more like TEXT, which is how we already pass the history timeline file name. Internally, we don't do any encoding or bytea escape handling, but TEXT seems closest. This should cause no behavioral change. Reported-by: Brar Piening Discussion: https://postgr.es/m/6a1b9cd9-17e3-df67-be55-86102af6bdf5@gmx.de Backpatch-through: master --- doc/src/sgml/protocol.sgml | 6 ++++-- src/backend/replication/walsender.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml index 9a95d7b734..cee28889e1 100644 --- a/doc/src/sgml/protocol.sgml +++ b/doc/src/sgml/protocol.sgml @@ -1859,7 +1859,9 @@ The commands accepted in replication mode are: <para> Requests the server to send over the timeline history file for timeline <replaceable class="parameter">tli</replaceable>. Server replies with a - result set of a single row, containing two fields: + result set of a single row, containing two fields. While the fields + are labeled as <type>text</type>, they effectively return raw bytes, + with no encoding conversion: </para> <para> @@ -1877,7 +1879,7 @@ The commands accepted in replication mode are: <varlistentry> <term> - <literal>content</literal> (<type>bytea</type>) + <literal>content</literal> (<type>text</type>) </term> <listitem> <para> diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 1a25be92c2..5d1b1a16be 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -496,7 +496,7 @@ SendTimeLineHistory(TimeLineHistoryCmd *cmd) pq_sendstring(&buf, "content"); /* col name */ pq_sendint32(&buf, 0); /* table oid */ pq_sendint16(&buf, 0); /* attnum */ - pq_sendint32(&buf, BYTEAOID); /* type oid */ + pq_sendint32(&buf, TEXTOID); /* type oid */ pq_sendint16(&buf, -1); /* typlen */ pq_sendint32(&buf, 0); /* typmod */ pq_sendint16(&buf, 0); /* format code */