From 4c786078b29d2f7ccb563761acb5fe423585c7de Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Mon, 20 Nov 2023 17:52:48 +1100 Subject: [PATCH v1] Simplify if/else logic of walsender CreateReplicationSlot --- src/backend/replication/walsender.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index e250b05..3bc9c82 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -1061,9 +1061,25 @@ CreateReplicationSlot(CreateReplicationSlotCmd *cmd) ReplicationSlotCreate(cmd->slotname, false, cmd->temporary ? RS_TEMPORARY : RS_PERSISTENT, false); + + if (reserve_wal) + { + ReplicationSlotReserveWal(); + + ReplicationSlotMarkDirty(); + + /* Write this slot to disk if it's a permanent one. */ + if (!cmd->temporary) + ReplicationSlotSave(); + } } else { + LogicalDecodingContext *ctx; + bool need_full_snapshot = false; + + Assert(cmd->kind == REPLICATION_KIND_LOGICAL); + CheckLogicalDecodingRequirements(); /* @@ -1076,12 +1092,6 @@ CreateReplicationSlot(CreateReplicationSlotCmd *cmd) ReplicationSlotCreate(cmd->slotname, true, cmd->temporary ? RS_TEMPORARY : RS_EPHEMERAL, two_phase); - } - - if (cmd->kind == REPLICATION_KIND_LOGICAL) - { - LogicalDecodingContext *ctx; - bool need_full_snapshot = false; /* * Do options check early so that we can bail before calling the @@ -1175,16 +1185,6 @@ CreateReplicationSlot(CreateReplicationSlotCmd *cmd) if (!cmd->temporary) ReplicationSlotPersist(); } - else if (cmd->kind == REPLICATION_KIND_PHYSICAL && reserve_wal) - { - ReplicationSlotReserveWal(); - - ReplicationSlotMarkDirty(); - - /* Write this slot to disk if it's a permanent one. */ - if (!cmd->temporary) - ReplicationSlotSave(); - } snprintf(xloc, sizeof(xloc), "%X/%X", LSN_FORMAT_ARGS(MyReplicationSlot->data.confirmed_flush)); -- 1.8.3.1