public inbox for [email protected]
help / color / mirror / Atom feedFrom: Kyotaro Horiguchi <[email protected]>
Subject: [PATCH 2/3] 002
Date: Thu, 18 Jun 2020 11:25:25 +0900
---
src/backend/replication/slot.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c
index dcc76c4783..8893516f00 100644
--- a/src/backend/replication/slot.c
+++ b/src/backend/replication/slot.c
@@ -380,7 +380,7 @@ static int
ReplicationSlotAcquireInternal(ReplicationSlot *slot, const char *name,
SlotAcquireBehavior behavior)
{
- ReplicationSlot *s;
+ ReplicationSlot *s = NULL;
int active_pid;
retry:
@@ -393,8 +393,12 @@ retry:
* acquire is not given. If the slot is not found, we either
* return -1 or error out.
*/
- s = (slot == NULL) ? SearchNamedReplicationSlot(name) : slot;
- if (s == NULL || !s->in_use || strcmp(name, NameStr(s->data.name)) != 0)
+ if (!slot)
+ s = SearchNamedReplicationSlot(name);
+ else if(s->in_use && strcmp(name, NameStr(s->data.name)))
+ s = slot;
+
+ if (s == NULL)
{
if (behavior == SAB_Inquire)
{
--
2.18.4
----Next_Part(Thu_Jun_18_11_44_29_2020_989)--
Content-Type: Text/X-Patch; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="0003.patch"
view thread (21+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected]
Subject: Re: [PATCH 2/3] 002
In-Reply-To: <no-message-id-1865536@localhost>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox