sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-05 00:02:04 -04:00
Code Issues Projects Releases Wiki Activity

Message style fixes

Browse Source
This commit is contained in:
Alvaro Herrera 2022-09-07 17:33:49 +02:00
parent 5265e91fd1
commit 4b4663fb4a
No known key found for this signature in database
GPG Key ID: 1C20ACB9D5C564AE
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/replication/logical/worker.c
View File

@ -3878,7 +3878,7 @@ maybe_start_skipping_changes(XLogRecPtr finish_lsn)
skip_xact_finish_lsn = finish_lsn; skip_xact_finish_lsn = finish_lsn;
ereport(LOG, 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))); LSN_FORMAT_ARGS(skip_xact_finish_lsn)));
} }
@ -3892,7 +3892,7 @@ stop_skipping_changes(void)
return; return;
ereport(LOG, 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)))); LSN_FORMAT_ARGS(skip_xact_finish_lsn))));
/* Stop skipping changes */ /* Stop skipping changes */
@ -3975,7 +3975,7 @@ clear_subscription_skip_lsn(XLogRecPtr finish_lsn)
if (myskiplsn != finish_lsn) if (myskiplsn != finish_lsn)
ereport(WARNING, ereport(WARNING,
errmsg("skip-LSN of logical replication subscription \"%s\" cleared", MySubscription->name), 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(finish_lsn),
LSN_FORMAT_ARGS(myskiplsn))); LSN_FORMAT_ARGS(myskiplsn)));
} }

7
src/backend/utils/init/postinit.c
View File

@ -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); actual_versionstr = get_collation_actual_version(dbform->datlocprovider, dbform->datlocprovider == COLLPROVIDER_ICU ? iculocale : collate);
if (!actual_versionstr) if (!actual_versionstr)
ereport(WARNING, /* should not happen */
(errmsg("database \"%s\" has no actual collation version, but a version was recorded", elog(WARNING,
name))); "database \"%s\" has no actual collation version, but a version was recorded",
name);
else if (strcmp(actual_versionstr, collversionstr) != 0) else if (strcmp(actual_versionstr, collversionstr) != 0)
ereport(WARNING, ereport(WARNING,
(errmsg("database \"%s\" has a collation version mismatch", (errmsg("database \"%s\" has a collation version mismatch",

2
src/backend/utils/misc/guc.c
View File

@ -2837,7 +2837,7 @@ static struct config_int ConfigureNamesInt[] =
{ {
{"wal_decode_buffer_size", PGC_POSTMASTER, WAL_RECOVERY, {"wal_decode_buffer_size", PGC_POSTMASTER, WAL_RECOVERY,
gettext_noop("Maximum buffer size for reading ahead in the WAL during 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 GUC_UNIT_BYTE
}, },
&wal_decode_buffer_size, &wal_decode_buffer_size,

2
src/test/subscription/t/029_on_error.pl
View File

@ -48,7 +48,7 @@ sub test_skip_lsn
# Check the log to ensure that the transaction is skipped, and advance the # Check the log to ensure that the transaction is skipped, and advance the
# offset of the log file for the next test. # offset of the log file for the next test.
$offset = $node_subscriber->wait_for_log( $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); $offset);
# Insert non-conflict data # Insert non-conflict data