>From b9f73cef1a9dc1aa96ad1807893e78c924f690f6 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Mon, 29 Sep 2014 15:35:40 +0200 Subject: [PATCH 2/4] Message and comment policing of pg_recvlogical.c. Several comments still referred to 'initiating', 'freeing', 'stopping' replication slots. These were terms used during different phases of the development of logical decoding, but are no long accurate. Author: Michael Paquier Backpatch to 9.4 where pg_recvlogical was introduced. --- src/bin/pg_basebackup/pg_recvlogical.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c index f3b0f34..4144688 100644 --- a/src/bin/pg_basebackup/pg_recvlogical.c +++ b/src/bin/pg_basebackup/pg_recvlogical.c @@ -868,7 +868,7 @@ main(int argc, char **argv) /* - * stop a replication slot + * drop a replication slot */ if (do_drop_slot) { @@ -876,7 +876,7 @@ main(int argc, char **argv) if (verbose) fprintf(stderr, - _("%s: freeing replication slot \"%s\"\n"), + _("%s: dropping replication slot \"%s\"\n"), progname, replication_slot); snprintf(query, sizeof(query), "DROP_REPLICATION_SLOT \"%s\"", @@ -892,8 +892,8 @@ main(int argc, char **argv) if (PQntuples(res) != 0 || PQnfields(res) != 0) { fprintf(stderr, - _("%s: could not stop logical replication: got %d rows and %d fields, expected %d rows and %d fields\n"), - progname, PQntuples(res), PQnfields(res), 0, 0); + _("%s: could not drop replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields\n"), + progname, replication_slot, PQntuples(res), PQnfields(res), 0, 0); disconnect_and_exit(1); } @@ -902,7 +902,7 @@ main(int argc, char **argv) } /* - * init a replication slot + * create a replication slot */ if (do_create_slot) { @@ -910,7 +910,7 @@ main(int argc, char **argv) if (verbose) fprintf(stderr, - _("%s: initializing replication slot \"%s\"\n"), + _("%s: creating replication slot \"%s\"\n"), progname, replication_slot); snprintf(query, sizeof(query), "CREATE_REPLICATION_SLOT \"%s\" LOGICAL \"%s\"", @@ -927,8 +927,8 @@ main(int argc, char **argv) if (PQntuples(res) != 1 || PQnfields(res) != 4) { fprintf(stderr, - _("%s: could not init logical replication: got %d rows and %d fields, expected %d rows and %d fields\n"), - progname, PQntuples(res), PQnfields(res), 1, 4); + _("%s: could not create replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields\n"), + progname, replication_slot, PQntuples(res), PQnfields(res), 1, 4); disconnect_and_exit(1); } -- 1.8.3.251.g1462b67