From 214a015557573f25b5db7ae1bcec90ea92366fb0 Mon Sep 17 00:00:00 2001 From: Bertrand Drouvot Date: Mon, 19 Aug 2024 09:53:03 +0000 Subject: [PATCH v2 4/5] Define PG_LOGICAL_REPLORIGIN_CHECKPOINT_DIR Replace the places where "pg_logical/replorigin_checkpoint" is used in .c files with a new PG_LOGICAL_REPLORIGIN_CHECKPOINT_DIR define. --- src/backend/replication/logical/origin.c | 6 +++--- src/include/replication/origin.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) 67.1% src/backend/replication/logical/ 32.8% src/include/replication/ diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c index 419e4814f0..a4aaefa97c 100644 --- a/src/backend/replication/logical/origin.c +++ b/src/backend/replication/logical/origin.c @@ -572,8 +572,8 @@ ReplicationOriginShmemInit(void) void CheckPointReplicationOrigin(void) { - const char *tmppath = "pg_logical/replorigin_checkpoint.tmp"; - const char *path = "pg_logical/replorigin_checkpoint"; + const char *tmppath = PG_LOGICAL_REPLORIGIN_CHECKPOINT_TMP_DIR; + const char *path = PG_LOGICAL_REPLORIGIN_CHECKPOINT_DIR; int tmpfd; int i; uint32 magic = REPLICATION_STATE_MAGIC; @@ -698,7 +698,7 @@ CheckPointReplicationOrigin(void) void StartupReplicationOrigin(void) { - const char *path = "pg_logical/replorigin_checkpoint"; + const char *path = PG_LOGICAL_REPLORIGIN_CHECKPOINT_DIR; int fd; int readBytes; uint32 magic = REPLICATION_STATE_MAGIC; diff --git a/src/include/replication/origin.h b/src/include/replication/origin.h index 7189ba9e76..1cb44be58d 100644 --- a/src/include/replication/origin.h +++ b/src/include/replication/origin.h @@ -15,6 +15,9 @@ #include "access/xlogreader.h" #include "catalog/pg_replication_origin.h" +#define PG_LOGICAL_REPLORIGIN_CHECKPOINT_DIR "pg_logical/replorigin_checkpoint" +#define PG_LOGICAL_REPLORIGIN_CHECKPOINT_TMP_DIR PG_LOGICAL_REPLORIGIN_CHECKPOINT_DIR ".tmp" + typedef struct xl_replorigin_set { XLogRecPtr remote_lsn; -- 2.34.1