Use PqMsg_* macros in basebackup_copy.c
Attached patch for $SUBJECT.
--
Fabrízio de Royes Mello
Attachments:
0001-Use-PqMsg_-macros-in-basebackup_copy.c.patchtext/x-patch; charset=US-ASCII; name=0001-Use-PqMsg_-macros-in-basebackup_copy.c.patchDownload
From 37a119f5c4c01dbf71efe32180e00b5fa0add517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabr=C3=ADzio=20de=20Royes=20Mello?=
<fabriziomello@gmail.com>
Date: Fri, 25 Jul 2025 11:45:48 -0300
Subject: [PATCH] Use PqMsg_* macros in basebackup_copy.c
---
src/backend/backup/basebackup_copy.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/backend/backup/basebackup_copy.c b/src/backend/backup/basebackup_copy.c
index 18b0b5a52d3..bc5b3882bf9 100644
--- a/src/backend/backup/basebackup_copy.c
+++ b/src/backend/backup/basebackup_copy.c
@@ -191,7 +191,7 @@ bbsink_copystream_archive_contents(bbsink *sink, size_t len)
if (mysink->send_to_client)
{
/* Add one because we're also sending a leading type byte. */
- pq_putmessage('d', mysink->msgbuffer, len + 1);
+ pq_putmessage(PqMsg_CopyData, mysink->msgbuffer, len + 1);
}
/* Consider whether to send a progress report to the client. */
@@ -277,7 +277,7 @@ bbsink_copystream_manifest_contents(bbsink *sink, size_t len)
if (mysink->send_to_client)
{
/* Add one because we're also sending a leading type byte. */
- pq_putmessage('d', mysink->msgbuffer, len + 1);
+ pq_putmessage(PqMsg_CopyData, mysink->msgbuffer, len + 1);
}
}
--
2.34.1
On Fri, Jul 25, 2025 at 11:47:52AM -0300, Fabr�zio de Royes Mello wrote:
Attached patch for $SUBJECT.
Could we move this to the existing thread on the topic [0]/messages/by-id/aIOW5_jI8YaBuBo0@nathan? I see one more
CopyData character in this file, plus some others that probably need their
own characters in protocol.h:
./basebackup_copy.c:146: mysink->msgbuffer[0]/messages/by-id/aIOW5_jI8YaBuBo0@nathan = 'd'; /* archive or manifest data */
./basebackup_copy.c:173: pq_sendbyte(&buf, 'n'); /* New archive */
./basebackup_copy.c:224: pq_sendbyte(&buf, 'p'); /* Progress report */
./basebackup_copy.c:250: pq_sendbyte(&buf, 'p'); /* Progress report */
./basebackup_copy.c:265: pq_sendbyte(&buf, 'm'); /* Manifest */
[0]: /messages/by-id/aIOW5_jI8YaBuBo0@nathan
--
nathan
On Fri, Jul 25, 2025 at 12:34 PM Nathan Bossart <nathandbossart@gmail.com>
wrote:
On Fri, Jul 25, 2025 at 11:47:52AM -0300, Fabrízio de Royes Mello wrote:
Attached patch for $SUBJECT.
Could we move this to the existing thread on the topic [0]? I see one
more
CopyData character in this file, plus some others that probably need their
own characters in protocol.h:
Absolutely
./basebackup_copy.c:146: mysink->msgbuffer[0] = 'd'; /* archive or
manifest data */
Missed that one.
./basebackup_copy.c:173: pq_sendbyte(&buf, 'n'); /* New
archive */
./basebackup_copy.c:224: pq_sendbyte(&buf, 'p');
/* Progress report */
./basebackup_copy.c:250: pq_sendbyte(&buf, 'p'); /*
Progress report */
./basebackup_copy.c:265: pq_sendbyte(&buf, 'm'); /*
Manifest */
Was doing a separate patch but agreed to do everything in the same
thread/patch.
Regards,
--
Fabrízio de Royes Mello