Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit144cefa

Browse files
committed
Message style fixes
1 parent25996a8 commit144cefa

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

‎src/backend/replication/logical/worker.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3876,7 +3876,7 @@ maybe_start_skipping_changes(XLogRecPtr finish_lsn)
38763876
skip_xact_finish_lsn=finish_lsn;
38773877

38783878
ereport(LOG,
3879-
errmsg("start skippinglogical replicationtransaction finished at %X/%X",
3879+
errmsg("logical replicationstarts skipping transaction at LSN %X/%X",
38803880
LSN_FORMAT_ARGS(skip_xact_finish_lsn)));
38813881
}
38823882

@@ -3890,7 +3890,7 @@ stop_skipping_changes(void)
38903890
return;
38913891

38923892
ereport(LOG,
3893-
(errmsg("done skippinglogical replicationtransaction finished at %X/%X",
3893+
(errmsg("logical replicationcompleted skipping transaction at LSN %X/%X",
38943894
LSN_FORMAT_ARGS(skip_xact_finish_lsn))));
38953895

38963896
/* Stop skipping changes */
@@ -3973,7 +3973,7 @@ clear_subscription_skip_lsn(XLogRecPtr finish_lsn)
39733973
if (myskiplsn!=finish_lsn)
39743974
ereport(WARNING,
39753975
errmsg("skip-LSN of logical replication subscription \"%s\" cleared",MySubscription->name),
3976-
errdetail("Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X",
3976+
errdetail("Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X.",
39773977
LSN_FORMAT_ARGS(finish_lsn),
39783978
LSN_FORMAT_ARGS(myskiplsn)));
39793979
}

‎src/backend/utils/init/postinit.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -453,9 +453,10 @@ CheckMyDatabase(const char *name, bool am_superuser, bool override_allow_connect
453453

454454
actual_versionstr=get_collation_actual_version(dbform->datlocprovider,dbform->datlocprovider==COLLPROVIDER_ICU ?iculocale :collate);
455455
if (!actual_versionstr)
456-
ereport(WARNING,
457-
(errmsg("database \"%s\" has no actual collation version, but a version was recorded",
458-
name)));
456+
/* should not happen */
457+
elog(WARNING,
458+
"database \"%s\" has no actual collation version, but a version was recorded",
459+
name);
459460
elseif (strcmp(actual_versionstr,collversionstr)!=0)
460461
ereport(WARNING,
461462
(errmsg("database \"%s\" has a collation version mismatch",

‎src/backend/utils/misc/guc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2838,7 +2838,7 @@ static struct config_int ConfigureNamesInt[] =
28382838
{
28392839
{"wal_decode_buffer_size",PGC_POSTMASTER,WAL_RECOVERY,
28402840
gettext_noop("Maximum buffer size for reading ahead in the WAL during recovery."),
2841-
gettext_noop("This controls the maximum distance we can read ahead in the WAL to prefetchreferenced blocks."),
2841+
gettext_noop("This controls the maximum distance we can read ahead in the WAL to prefetchdata blocks referenced therein."),
28422842
GUC_UNIT_BYTE
28432843
},
28442844
&wal_decode_buffer_size,

‎src/test/subscription/t/029_on_error.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ sub test_skip_lsn
4848
# Check the log to ensure that the transaction is skipped, and advance the
4949
# offset of the log file for the next test.
5050
$offset =$node_subscriber->wait_for_log(
51-
qr/LOG: ( [A-Z0-9]+:)?done skippinglogical replicationtransaction finished at$lsn/,
51+
qr/LOG: ( [A-Z0-9]+:)? logical replicationcompleted skipping transaction at LSN$lsn/,
5252
$offset);
5353

5454
# Insert non-conflict data

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp