I have a couple of quick fixes here.
The first fixes up some things in nls.mk related to a file move. The
second is some cleanup because some function you are using has been
removed in the meantime; you probably found that yourself while rebasing.
The pg_walsummary patch doesn't have a nls.mk, but you also comment that
it doesn't have tests yet, so I assume it's not considered complete yet
anyway.
From 04aae4ee91ddd1d4ce061c36a99b0fa18bdd98ec Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Thu, 14 Dec 2023 12:50:33 +0100
Subject: [PATCH 2/6] fixup! Move src/bin/pg_verifybackup/parse_manifest.c into
src/common.
---
src/bin/pg_verifybackup/nls.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/pg_verifybackup/nls.mk b/src/bin/pg_verifybackup/nls.mk
index eba73a2c05..9e6a6049ba 100644
--- a/src/bin/pg_verifybackup/nls.mk
+++ b/src/bin/pg_verifybackup/nls.mk
@@ -1,10 +1,10 @@
# src/bin/pg_verifybackup/nls.mk
CATALOG_NAME = pg_verifybackup
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
- parse_manifest.c \
pg_verifybackup.c \
../../common/fe_memutils.c \
- ../../common/jsonapi.c
+ ../../common/jsonapi.c \
+ ../../common/parse_manifest.c
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
json_manifest_parse_failure:2 \
error_cb:2 \
--
2.43.0
From 25211044687a629e632ef0a2bfad30acea337266 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Thu, 14 Dec 2023 18:32:29 +0100
Subject: [PATCH 4/6] fixup! Add a new WAL summarizer process.
---
src/backend/backup/meson.build | 2 +-
src/backend/postmaster/walsummarizer.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/backend/backup/meson.build b/src/backend/backup/meson.build
index 0e2de91e9f..5d4ebe3ebe 100644
--- a/src/backend/backup/meson.build
+++ b/src/backend/backup/meson.build
@@ -13,5 +13,5 @@ backend_sources += files(
'basebackup_throttle.c',
'basebackup_zstd.c',
'walsummary.c',
- 'walsummaryfuncs.c'
+ 'walsummaryfuncs.c',
)
diff --git a/src/backend/postmaster/walsummarizer.c
b/src/backend/postmaster/walsummarizer.c
index 7c840c36b3..9fa155349e 100644
--- a/src/backend/postmaster/walsummarizer.c
+++ b/src/backend/postmaster/walsummarizer.c
@@ -290,7 +290,7 @@ WalSummarizerMain(void)
FlushErrorState();
/* Flush any leaked data in the top-level context */
- MemoryContextResetAndDeleteChildren(context);
+ MemoryContextReset(context);
/* Now we can allow interrupts again */
RESUME_INTERRUPTS();
@@ -342,7 +342,7 @@ WalSummarizerMain(void)
XLogRecPtr end_of_summary_lsn;
/* Flush any leaked data in the top-level context */
- MemoryContextResetAndDeleteChildren(context);
+ MemoryContextReset(context);
/* Process any signals received recently. */
HandleWalSummarizerInterrupts();
--
2.43.0
