Commit4b4663f

committed

Message style fixes

1 parent5265e91 commit4b4663fCopy full SHA for 4b4663f

File tree

-8

lines changed

-8

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3878,7 +3878,7 @@ maybe_start_skipping_changes(XLogRecPtr finish_lsn)`
`3878`	`3878`	`skip_xact_finish_lsn=finish_lsn;`
`3879`	`3879`
`3880`	`3880`	`ereport(LOG,`
`3881`		`-errmsg("start skippinglogical replicationtransaction finished at %X/%X",`
	`3881`	`+errmsg("logical replicationstarts skipping transaction at LSN %X/%X",`
`3882`	`3882`	`LSN_FORMAT_ARGS(skip_xact_finish_lsn)));`
`3883`	`3883`	`}`
`3884`	`3884`
`@@ -3892,7 +3892,7 @@ stop_skipping_changes(void)`
`3892`	`3892`	`return;`
`3893`	`3893`
`3894`	`3894`	`ereport(LOG,`
`3895`		`-(errmsg("done skippinglogical replicationtransaction finished at %X/%X",`
	`3895`	`+(errmsg("logical replicationcompleted skipping transaction at LSN %X/%X",`
`3896`	`3896`	`LSN_FORMAT_ARGS(skip_xact_finish_lsn))));`
`3897`	`3897`
`3898`	`3898`	`/* Stop skipping changes */`
`@@ -3975,7 +3975,7 @@ clear_subscription_skip_lsn(XLogRecPtr finish_lsn)`
`3975`	`3975`	`if (myskiplsn!=finish_lsn)`
`3976`	`3976`	`ereport(WARNING,`
`3977`	`3977`	`errmsg("skip-LSN of logical replication subscription \"%s\" cleared",MySubscription->name),`
`3978`		`-errdetail("Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X",`
	`3978`	`+errdetail("Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X.",`
`3979`	`3979`	`LSN_FORMAT_ARGS(finish_lsn),`
`3980`	`3980`	`LSN_FORMAT_ARGS(myskiplsn)));`
`3981`	`3981`	`}`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -454,9 +454,10 @@ CheckMyDatabase(const char *name, bool am_superuser, bool override_allow_connect`
`454`	`454`
`455`	`455`	`actual_versionstr=get_collation_actual_version(dbform->datlocprovider,dbform->datlocprovider==COLLPROVIDER_ICU ?iculocale :collate);`
`456`	`456`	`if (!actual_versionstr)`
`457`		`-ereport(WARNING,`
`458`		`-(errmsg("database \"%s\" has no actual collation version, but a version was recorded",`
`459`		`-name)));`
	`457`	`+/* should not happen */`
	`458`	`+elog(WARNING,`
	`459`	`+"database \"%s\" has no actual collation version, but a version was recorded",`
	`460`	`+name);`
`460`	`461`	`elseif (strcmp(actual_versionstr,collversionstr)!=0)`
`461`	`462`	`ereport(WARNING,`
`462`	`463`	`(errmsg("database \"%s\" has a collation version mismatch",`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2837,7 +2837,7 @@ static struct config_int ConfigureNamesInt[] =`
`2837`	`2837`	`{`
`2838`	`2838`	`{"wal_decode_buffer_size",PGC_POSTMASTER,WAL_RECOVERY,`
`2839`	`2839`	`gettext_noop("Maximum buffer size for reading ahead in the WAL during recovery."),`
`2840`		`-gettext_noop("This controls the maximum distance we can read ahead in the WAL to prefetchreferenced blocks."),`
	`2840`	`+gettext_noop("This controls the maximum distance we can read ahead in the WAL to prefetchdata blocks referenced therein."),`
`2841`	`2841`	`GUC_UNIT_BYTE`
`2842`	`2842`	`},`
`2843`	`2843`	`&wal_decode_buffer_size,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ sub test_skip_lsn`
`48`	`48`	`# Check the log to ensure that the transaction is skipped, and advance the`
`49`	`49`	`# offset of the log file for the next test.`
`50`	`50`	`$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/,`
`52`	`52`	`$offset);`
`53`	`53`
`54`	`54`	`# Insert non-conflict data`

Comments

(0)