From 23ef544b82b7b25c2c30cbaacafed400d597fe08 Mon Sep 17 00:00:00 2001 From: Masahiko Sawada Date: Wed, 18 Aug 2021 13:20:43 +0900 Subject: [PATCH] Rename LOGICAL_REP_MSG_STREAM_END to LOGICAL_REP_MSG_STREAM_STOP. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, we had LOGICAL_REP_MSG_STREAM_END enum value in LogicalRepMsgType but we used the term “STREAM Stop” much in the codes, the logical decoding callback function name, and the documentation. There were only a few places where we used the term “STREAM END”. Since we have LOGICAL_REP_MSG_STREAM_START, the term “STREAM STOP” matches better. This commit improves the cosistency by renaming LOGICAL_REP_MSG_STREAM_END to LOGICAL_REP_MSG_STREAM_STOP. --- doc/src/sgml/protocol.sgml | 2 +- src/backend/replication/logical/proto.c | 2 +- src/backend/replication/logical/worker.c | 2 +- src/include/replication/logicalproto.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml index 91ec237c21..a232546b1d 100644 --- a/doc/src/sgml/protocol.sgml +++ b/doc/src/sgml/protocol.sgml @@ -7212,7 +7212,7 @@ Truncate -The following messages (Stream Start, Stream End, Stream Commit, and +The following messages (Stream Start, Stream Stop, Stream Commit, and Stream Abort) are available since protocol version 2. diff --git a/src/backend/replication/logical/proto.c b/src/backend/replication/logical/proto.c index 52b65e9572..9732982d93 100644 --- a/src/backend/replication/logical/proto.c +++ b/src/backend/replication/logical/proto.c @@ -1074,7 +1074,7 @@ logicalrep_read_stream_start(StringInfo in, bool *first_segment) void logicalrep_write_stream_stop(StringInfo out) { - pq_sendbyte(out, LOGICAL_REP_MSG_STREAM_END); + pq_sendbyte(out, LOGICAL_REP_MSG_STREAM_STOP); } /* diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c index ecaed157f2..38b493e4f5 100644 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@ -2380,7 +2380,7 @@ apply_dispatch(StringInfo s) apply_handle_stream_start(s); return; - case LOGICAL_REP_MSG_STREAM_END: + case LOGICAL_REP_MSG_STREAM_STOP: apply_handle_stream_stop(s); return; diff --git a/src/include/replication/logicalproto.h b/src/include/replication/logicalproto.h index 2e29513151..95c1561ca0 100644 --- a/src/include/replication/logicalproto.h +++ b/src/include/replication/logicalproto.h @@ -65,7 +65,7 @@ typedef enum LogicalRepMsgType LOGICAL_REP_MSG_COMMIT_PREPARED = 'K', LOGICAL_REP_MSG_ROLLBACK_PREPARED = 'r', LOGICAL_REP_MSG_STREAM_START = 'S', - LOGICAL_REP_MSG_STREAM_END = 'E', + LOGICAL_REP_MSG_STREAM_STOP = 'E', LOGICAL_REP_MSG_STREAM_COMMIT = 'c', LOGICAL_REP_MSG_STREAM_ABORT = 'A', LOGICAL_REP_MSG_STREAM_PREPARE = 'p' -- 2.24.3 (Apple Git-128)