Message style fixes

diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c
index 5f8c5417630a5344b93211cdc75a89041a65d2e0..eaca406d3017751c99791b1831b87f3c148e32ad 100644 (file)
--- a/src/backend/replication/logical/worker.c
+++ b/src/backend/replication/logical/worker.c
@@ -3878,7 +3878,7 @@ maybe_start_skipping_changes(XLogRecPtr finish_lsn)
        skip_xact_finish_lsn = finish_lsn;
 
        ereport(LOG,
-                       errmsg("start skipping logical replication transaction finished at %X/%X",
+                       errmsg("logical replication starts skipping transaction at LSN %X/%X",
                                   LSN_FORMAT_ARGS(skip_xact_finish_lsn)));
 }
 
@@ -3892,7 +3892,7 @@ stop_skipping_changes(void)
                return;
 
        ereport(LOG,
-                       (errmsg("done skipping logical replication transaction finished at %X/%X",
+                       (errmsg("logical replication completed skipping transaction at LSN %X/%X",
                                        LSN_FORMAT_ARGS(skip_xact_finish_lsn))));
 
        /* Stop skipping changes */
@@ -3975,7 +3975,7 @@ clear_subscription_skip_lsn(XLogRecPtr finish_lsn)
                if (myskiplsn != finish_lsn)
                        ereport(WARNING,
                                        errmsg("skip-LSN of logical replication subscription \"%s\" cleared", MySubscription->name),
-                                       errdetail("Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X",
+                                       errdetail("Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X.",
                                                          LSN_FORMAT_ARGS(finish_lsn),
                                                          LSN_FORMAT_ARGS(myskiplsn)));
        }

diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 0d557a8684b58ac4f0c586a52cd55f4ff5cf1ddc..2b65ef3deb02b9d77b3592419f903a155b9a9338 100644 (file)
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -454,9 +454,10 @@ CheckMyDatabase(const char *name, bool am_superuser, bool override_allow_connect
 
                actual_versionstr = get_collation_actual_version(dbform->datlocprovider, dbform->datlocprovider == COLLPROVIDER_ICU ? iculocale : collate);
                if (!actual_versionstr)
-                       ereport(WARNING,
-                                       (errmsg("database \"%s\" has no actual collation version, but a version was recorded",
-                                                       name)));
+                       /* should not happen */
+                       elog(WARNING,
+                                "database \"%s\" has no actual collation version, but a version was recorded",
+                                name);
                else if (strcmp(actual_versionstr, collversionstr) != 0)
                        ereport(WARNING,
                                        (errmsg("database \"%s\" has a collation version mismatch",

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index c336698ad583ff26a081e7919f9e187ccd77f0fd..55bf9985112b6f3ee61994cdfb78e1d874d2fb6c 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -2837,7 +2837,7 @@ static struct config_int ConfigureNamesInt[] =
        {
                {"wal_decode_buffer_size", PGC_POSTMASTER, WAL_RECOVERY,
                        gettext_noop("Maximum buffer size for reading ahead in the WAL during recovery."),
-                       gettext_noop("This controls the maximum distance we can read ahead in the WAL to prefetch referenced blocks."),
+                       gettext_noop("This controls the maximum distance we can read ahead in the WAL to prefetch data blocks referenced therein."),
                        GUC_UNIT_BYTE
                },
                &wal_decode_buffer_size,

diff --git a/src/test/subscription/t/029_on_error.pl b/src/test/subscription/t/029_on_error.pl
index 05daa77c58a3c0593d7ea0e05914e62bd71768ff..add8788370c603226f2b976588dc1f18d3d3e2f8 100644 (file)
--- a/src/test/subscription/t/029_on_error.pl
+++ b/src/test/subscription/t/029_on_error.pl
@@ -48,7 +48,7 @@ sub test_skip_lsn
        # Check the log to ensure that the transaction is skipped, and advance the
        # offset of the log file for the next test.
        $offset = $node_subscriber->wait_for_log(
-               qr/LOG: ( [A-Z0-9]+:)? done skipping logical replication transaction finished at $lsn/,
+               qr/LOG: ( [A-Z0-9]+:)? logical replication completed skipping transaction at LSN $lsn/,
                $offset);
 
        # Insert non-conflict data