Message fixes and style improvements

petere · petere · commit b1b53f15bbac · 2020-09-14T06:42:07.000+02:00
diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c
@@ -681,11 +681,10 @@ heap_vacuum_rel(Relation onerel, VacuumParams *params,
 							 read_rate, write_rate);
 			appendStringInfo(&buf, _("system usage: %s\n"), pg_rusage_show(&ru0));
 			appendStringInfo(&buf,
-							 _("WAL usage: %ld records, %ld full page images, "
-							   UINT64_FORMAT " bytes"),
+							 _("WAL usage: %ld records, %ld full page images, %llu bytes"),
 							 walusage.wal_records,
 							 walusage.wal_fpi,
-							 walusage.wal_bytes);
+							 (unsigned long long) walusage.wal_bytes);
 
 			ereport(LOG,
 					(errmsg_internal("%s", buf.data)));
@@ -3488,9 +3487,10 @@ parallel_vacuum_main(dsm_segment *seg, shm_toc *toc)
 										   false);
 	elevel = lvshared->elevel;
 
-	ereport(DEBUG1,
-			(errmsg("starting parallel vacuum worker for %s",
-					lvshared->for_cleanup ? "cleanup" : "bulk delete")));
+	if (lvshared->for_cleanup)
+		elog(DEBUG1, "starting parallel vacuum worker for cleanup");
+	else
+		elog(DEBUG1, "starting parallel vacuum worker for bulk delete");
 
 	/* Set debug_query_string for individual workers */
 	sharedquery = shm_toc_lookup(toc, PARALLEL_VACUUM_KEY_QUERY_TEXT, false);
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -12515,7 +12515,7 @@ StartupRequestWalReceiverRestart(void)
 	if (currentSource == XLOG_FROM_STREAM && WalRcvRunning())
 	{
 		ereport(LOG,
-				(errmsg("wal receiver process shutdown requested")));
+				(errmsg("WAL receiver process shutdown requested")));
 
 		pendingWalRcvRestart = true;
 	}
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
@@ -1156,23 +1156,23 @@ assignProcTypes(OpFamilyMember *member, Oid amoid, Oid typeoid,
 				(OidIsValid(member->righttype) && member->righttype != typeoid))
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-						 errmsg("associated data types for opclass options parsing functions must match opclass input type")));
+						 errmsg("associated data types for operator class options parsing functions must match opclass input type")));
 		}
 		else
 		{
 			if (member->lefttype != member->righttype)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-						 errmsg("left and right associated data types for opclass options parsing functions must match")));
+						 errmsg("left and right associated data types for operator class options parsing functions must match")));
 		}
 
 		if (procform->prorettype != VOIDOID ||
 			procform->pronargs != 1 ||
 			procform->proargtypes.values[0] != INTERNALOID)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-					 errmsg("invalid opclass options parsing function"),
-					 errhint("Valid signature of opclass options parsing function is '%s'.",
+					 errmsg("invalid operator class options parsing function"),
+					 errhint("Valid signature of operator class options parsing function is %s.",
 							 "(internal) RETURNS void")));
 	}
 
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -6853,7 +6853,7 @@ NotNullImpliedByRelConstraints(Relation rel, Form_pg_attribute attr)
 	if (ConstraintImpliedByRelConstraint(rel, list_make1(nnulltest), NIL))
 	{
 		ereport(DEBUG1,
-				(errmsg("existing constraints on column \"%s\".\"%s\" are sufficient to prove that it does not contain nulls",
+				(errmsg("existing constraints on column \"%s.%s\" are sufficient to prove that it does not contain nulls",
 						RelationGetRelationName(rel), NameStr(attr->attname))));
 		return true;
 	}
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
@@ -1722,10 +1722,10 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline,
 			{
 				ereport(elevel,
 						(errcode(ERRCODE_CONFIG_FILE_ERROR),
-						 errmsg("clientcert can not be set to \"no-verify\" when using \"cert\" authentication"),
+						 errmsg("clientcert cannot be set to \"no-verify\" when using \"cert\" authentication"),
 						 errcontext("line %d of configuration file \"%s\"",
 									line_num, HbaFileName)));
-				*err_msg = "clientcert can not be set to \"no-verify\" when using \"cert\" authentication";
+				*err_msg = "clientcert cannot be set to \"no-verify\" when using \"cert\" authentication";
 				return false;
 			}
 			hbaline->clientcert = clientCertOff;
diff --git a/src/backend/nodes/params.c b/src/backend/nodes/params.c
@@ -356,9 +356,9 @@ ParamsErrorCallback(void *arg)
 		return;
 
 	if (data->portalName && data->portalName[0] != '\0')
-		errcontext("extended query \"%s\" with parameters: %s",
+		errcontext("portal \"%s\" with parameters: %s",
 				   data->portalName, data->params->paramValuesStr);
 	else
-		errcontext("extended query with parameters: %s",
+		errcontext("unnamed portal with parameters: %s",
 				   data->params->paramValuesStr);
 }
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -16161,7 +16161,7 @@ insertSelectOptions(SelectStmt *stmt,
 		if (!stmt->sortClause && limitClause->limitOption == LIMIT_OPTION_WITH_TIES)
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("WITH TIES options can not be specified without ORDER BY clause")));
+					 errmsg("WITH TIES cannot be specified without ORDER BY clause")));
 		stmt->limitOption = limitClause->limitOption;
 	}
 	if (withClause)
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
@@ -1770,7 +1770,7 @@ transformLimitClause(ParseState *pstate, Node *clause,
 		IsA(clause, A_Const) && ((A_Const *) clause)->val.type == T_Null)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_ROW_COUNT_IN_LIMIT_CLAUSE),
-				 errmsg("row count cannot be NULL in FETCH FIRST ... WITH TIES clause")));
+				 errmsg("row count cannot be null in FETCH FIRST ... WITH TIES clause")));
 
 	return qual;
 }
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
@@ -721,7 +721,10 @@ perform_base_backup(basebackup_options *opt)
 	{
 		if (total_checksum_failures > 1)
 			ereport(WARNING,
-					(errmsg("%lld total checksum verification failures", total_checksum_failures)));
+					(errmsg_plural("%lld total checksum verification failure",
+								   "%lld total checksum verification failures",
+								   total_checksum_failures,
+								   total_checksum_failures)));
 
 		ereport(ERROR,
 				(errcode(ERRCODE_DATA_CORRUPTED),
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
@@ -3011,7 +3011,7 @@ TerminateOtherDBBackends(Oid databaseId)
 	if (nprepared > 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_IN_USE),
-				 errmsg("database \"%s\" is being used by prepared transaction",
+				 errmsg("database \"%s\" is being used by prepared transactions",
 						get_database_name(databaseId)),
 				 errdetail_plural("There is %d prepared transaction using the database.",
 								  "There are %d prepared transactions using the database.",
diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
@@ -2587,9 +2587,9 @@ checkTimezoneIsUsedForCast(bool useTz, const char *type1, const char *type2)
 	if (!useTz)
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("cannot convert value from %s to %s without timezone usage",
+				 errmsg("cannot convert value from %s to %s without time zone usage",
 						type1, type2),
-				 errhint("Use *_tz() function for timezone support.")));
+				 errhint("Use *_tz() function for time zone support.")));
 }
 
 /* Convert time datum to timetz datum */
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
@@ -2000,7 +2000,7 @@ get_fn_opclass_options(FmgrInfo *flinfo)
 
 	ereport(ERROR,
 			(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-			 errmsg("opclass options info is absent in function call context")));
+			 errmsg("operator class options info is absent in function call context")));
 
 	return NULL;
 }
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -2830,7 +2830,7 @@ static struct config_int ConfigureNamesInt[] =
 			gettext_noop("Sets the minimum execution time above which "
 						 "a sample of statements will be logged."
 						 " Sampling is determined by log_statement_sample_rate."),
-			gettext_noop("Zero log a sample of all queries. -1 turns this feature off."),
+			gettext_noop("Zero logs a sample of all queries. -1 turns this feature off."),
 			GUC_UNIT_MS
 		},
 		&log_min_duration_sample,
@@ -3682,7 +3682,7 @@ static struct config_string ConfigureNamesString[] =
 
 	{
 		{"restore_command", PGC_POSTMASTER, WAL_ARCHIVE_RECOVERY,
-			gettext_noop("Sets the shell command that will retrieve an archived WAL file."),
+			gettext_noop("Sets the shell command that will be called to retrieve an archived WAL file."),
 			NULL
 		},
 		&recoveryRestoreCommand,
diff --git a/src/backend/utils/sort/sharedtuplestore.c b/src/backend/utils/sort/sharedtuplestore.c
@@ -566,7 +566,7 @@ sts_parallel_scan_next(SharedTuplestoreAccessor *accessor, void *meta_data)
 			if (BufFileSeekBlock(accessor->read_file, read_page) != 0)
 				ereport(ERROR,
 						(errcode_for_file_access(),
-						 errmsg("could not seek block %u in shared tuplestore temporary file",
+						 errmsg("could not seek to block %u in shared tuplestore temporary file",
 								read_page)));
 			nread = BufFileRead(accessor->read_file, &chunk_header,
 								STS_CHUNK_HEADER_SIZE);
diff --git a/src/bin/pg_verifybackup/parse_manifest.c b/src/bin/pg_verifybackup/parse_manifest.c
@@ -325,7 +325,7 @@ json_manifest_object_field_start(void *state, char *fname, bool isnull)
 
 			/* It's not a field we recognize. */
 			json_manifest_parse_failure(parse->context,
-										"unknown toplevel field");
+										"unrecognized top-level field");
 			break;
 
 		case JM_EXPECT_THIS_FILE_FIELD:
@@ -358,7 +358,7 @@ json_manifest_object_field_start(void *state, char *fname, bool isnull)
 				parse->wal_range_field = JMWRF_END_LSN;
 			else
 				json_manifest_parse_failure(parse->context,
-											"unexpected wal range field");
+											"unexpected WAL range field");
 			parse->state = JM_EXPECT_THIS_WAL_RANGE_VALUE;
 			break;
 
@@ -469,10 +469,10 @@ json_manifest_finalize_file(JsonManifestParseState *parse)
 
 	/* Pathname and size are required. */
 	if (parse->pathname == NULL && parse->encoded_pathname == NULL)
-		json_manifest_parse_failure(parse->context, "missing pathname");
+		json_manifest_parse_failure(parse->context, "missing path name");
 	if (parse->pathname != NULL && parse->encoded_pathname != NULL)
 		json_manifest_parse_failure(parse->context,
-									"both pathname and encoded pathname");
+									"both path name and encoded path name");
 	if (parse->size == NULL)
 		json_manifest_parse_failure(parse->context, "missing size");
 	if (parse->algorithm == NULL && parse->checksum != NULL)
@@ -491,7 +491,7 @@ json_manifest_finalize_file(JsonManifestParseState *parse)
 							  parse->encoded_pathname,
 							  raw_length))
 			json_manifest_parse_failure(parse->context,
-										"unable to decode filename");
+										"could not decode file name");
 		parse->pathname[raw_length] = '\0';
 		pfree(parse->encoded_pathname);
 		parse->encoded_pathname = NULL;
@@ -582,10 +582,10 @@ json_manifest_finalize_wal_range(JsonManifestParseState *parse)
 									"timeline is not an integer");
 	if (!parse_xlogrecptr(&start_lsn, parse->start_lsn))
 		json_manifest_parse_failure(parse->context,
-									"unable to parse start LSN");
+									"could not parse start LSN");
 	if (!parse_xlogrecptr(&end_lsn, parse->end_lsn))
 		json_manifest_parse_failure(parse->context,
-									"unable to parse end LSN");
+									"could not parse end LSN");
 
 	/* Invoke the callback with the details we've gathered. */
 	context->perwalrange_cb(context, tli, start_lsn, end_lsn);
diff --git a/src/bin/pg_verifybackup/pg_verifybackup.c b/src/bin/pg_verifybackup/pg_verifybackup.c
@@ -471,7 +471,7 @@ record_manifest_details_for_file(JsonManifestParseContext *context,
 	/* Make a new entry in the hash table for this file. */
 	m = manifest_files_insert(ht, pathname, &found);
 	if (found)
-		report_fatal_error("duplicate pathname in backup manifest: \"%s\"",
+		report_fatal_error("duplicate path name in backup manifest: \"%s\"",
 						   pathname);
 
 	/* Initialize the entry. */
diff --git a/src/bin/pg_verifybackup/t/005_bad_manifest.pl b/src/bin/pg_verifybackup/t/005_bad_manifest.pl
@@ -38,19 +38,19 @@
 {"PostgreSQL-Backup-Manifest-Version": 1, "Files": true}
 EOM
 
-test_parse_error('unknown toplevel field', <<EOM);
+test_parse_error('unrecognized top-level field', <<EOM);
 {"PostgreSQL-Backup-Manifest-Version": 1, "Oops": 1}
 EOM
 
 test_parse_error('unexpected object start', <<EOM);
 {"PostgreSQL-Backup-Manifest-Version": 1, "Files": {}}
 EOM
 
-test_parse_error('missing pathname', <<EOM);
+test_parse_error('missing path name', <<EOM);
 {"PostgreSQL-Backup-Manifest-Version": 1, "Files": [{}]}
 EOM
 
-test_parse_error('both pathname and encoded pathname', <<EOM);
+test_parse_error('both path name and encoded path name', <<EOM);
 {"PostgreSQL-Backup-Manifest-Version": 1, "Files": [
     {"Path": "x", "Encoded-Path": "1234"}
 ]}
@@ -74,13 +74,13 @@
 ]}
 EOM
 
-test_parse_error('unable to decode filename', <<EOM);
+test_parse_error('could not decode file name', <<EOM);
 {"PostgreSQL-Backup-Manifest-Version": 1, "Files": [
     {"Encoded-Path": "123", "Size": 0}
 ]}
 EOM
 
-test_fatal_error('duplicate pathname in backup manifest', <<EOM);
+test_fatal_error('duplicate path name in backup manifest', <<EOM);
 {"PostgreSQL-Backup-Manifest-Version": 1, "Files": [
     {"Path": "x", "Size": 0},
     {"Path": "x", "Size": 0}
@@ -117,7 +117,7 @@
 ]}
 EOM
 
-test_parse_error('unexpected wal range field', <<EOM);
+test_parse_error('unexpected WAL range field', <<EOM);
 {"PostgreSQL-Backup-Manifest-Version": 1, "WAL-Ranges": [
     {"Oops": 1}
 ]}
@@ -141,13 +141,13 @@
 ]}
 EOM
 
-test_parse_error('unable to parse start LSN', <<EOM);
+test_parse_error('could not parse start LSN', <<EOM);
 {"PostgreSQL-Backup-Manifest-Version": 1, "WAL-Ranges": [
     {"Timeline": 1, "Start-LSN": "oops", "End-LSN": "0/0"}
 ]}
 EOM
 
-test_parse_error('unable to parse end LSN', <<EOM);
+test_parse_error('could not parse end LSN', <<EOM);
 {"PostgreSQL-Backup-Manifest-Version": 1, "WAL-Ranges": [
     {"Timeline": 1, "Start-LSN": "0/0", "End-LSN": "oops"}
 ]}
diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl
@@ -287,7 +287,7 @@ sub pgbench
 	[],
 	[
 		qr{ERROR:  invalid input syntax for type json},
-		qr{(?!extended query with parameters)}
+		qr{(?!unnamed portal with parameters)}
 	],
 	'server parameter logging',
 	{
@@ -314,7 +314,7 @@ sub pgbench
 	[],
 	[
 		qr{ERROR:  division by zero},
-		qr{CONTEXT:  extended query with parameters: \$1 = '1', \$2 = NULL}
+		qr{CONTEXT:  unnamed portal with parameters: \$1 = '1', \$2 = NULL}
 	],
 	'server parameter logging',
 	{
@@ -328,7 +328,7 @@ sub pgbench
 	[],
 	[
 		qr{ERROR:  invalid input syntax for type json},
-		qr[CONTEXT:  JSON data, line 1: \{ invalid\.\.\.[\r\n]+extended query with parameters: \$1 = '\{ invalid ', \$2 = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que \.\.\.']m
+		qr[CONTEXT:  JSON data, line 1: \{ invalid\.\.\.[\r\n]+unnamed portal with parameters: \$1 = '\{ invalid ', \$2 = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que \.\.\.']m
 	],
 	'server parameter logging',
 	{
@@ -356,7 +356,7 @@ sub pgbench
 	[],
 	[
 		qr{ERROR:  division by zero},
-		qr{CONTEXT:  extended query with parameters: \$1 = '1', \$2 = NULL}
+		qr{CONTEXT:  unnamed portal with parameters: \$1 = '1', \$2 = NULL}
 	],
 	'server parameter logging',
 	{
@@ -373,7 +373,7 @@ sub pgbench
 	[],
 	[
 		qr{ERROR:  invalid input syntax for type json},
-		qr[CONTEXT:  JSON data, line 1: \{ invalid\.\.\.[\r\n]+extended query with parameters: \$1 = '\{ invalid ', \$2 = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que mirase bien lo que hacia\?']m
+		qr[CONTEXT:  JSON data, line 1: \{ invalid\.\.\.[\r\n]+unnamed portal with parameters: \$1 = '\{ invalid ', \$2 = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que mirase bien lo que hacia\?']m
 	],
 	'server parameter logging',
 	{
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
@@ -281,7 +281,7 @@ main(int argc, char *argv[])
 		}
 		if (vacopts.full)
 		{
-			pg_log_error("cannot use the \"%s\" option when performing full",
+			pg_log_error("cannot use the \"%s\" option when performing full vacuum",
 						 "parallel");
 			exit(1);
 		}
diff --git a/src/fe_utils/archive.c b/src/fe_utils/archive.c
@@ -50,7 +50,7 @@ RestoreArchivedFile(const char *path, const char *xlogfname,
 										 xlogfname, NULL);
 	if (xlogRestoreCmd == NULL)
 	{
-		pg_log_fatal("could not use restore_command with %%r alias");
+		pg_log_fatal("cannot use restore_command with %%r placeholder");
 		exit(1);
 	}
 
@@ -109,7 +109,7 @@ RestoreArchivedFile(const char *path, const char *xlogfname,
 	 */
 	if (wait_result_is_any_signal(rc, true))
 	{
-		pg_log_fatal("restore_command failed due to the signal: %s",
+		pg_log_fatal("restore_command failed: %s",
 					 wait_result_to_str(rc));
 		exit(1);
 	}
diff --git a/src/test/modules/test_misc/t/001_constraint_validation.pl b/src/test/modules/test_misc/t/001_constraint_validation.pl
diff --git a/src/test/regress/expected/alter_generic.out b/src/test/regress/expected/alter_generic.out
diff --git a/src/test/regress/expected/jsonb_jsonpath.out b/src/test/regress/expected/jsonb_jsonpath.out
diff --git a/src/test/regress/expected/limit.out b/src/test/regress/expected/limit.out

Original file line number	Diff line number	Diff line change
`@@ -12515,7 +12515,7 @@ StartupRequestWalReceiverRestart(void)`
`12515`	`12515`	`if (currentSource == XLOG_FROM_STREAM && WalRcvRunning())`
`12516`	`12516`	`{`
`12517`	`12517`	`ereport(LOG,`
`12518`		`- (errmsg("wal receiver process shutdown requested")));`
	`12518`	`+ (errmsg("WAL receiver process shutdown requested")));`
`12519`	`12519`
`12520`	`12520`	`pendingWalRcvRestart = true;`
`12521`	`12521`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6853,7 +6853,7 @@ NotNullImpliedByRelConstraints(Relation rel, Form_pg_attribute attr)`
`6853`	`6853`	`if (ConstraintImpliedByRelConstraint(rel, list_make1(nnulltest), NIL))`
`6854`	`6854`	`{`
`6855`	`6855`	`ereport(DEBUG1,`
`6856`		`- (errmsg("existing constraints on column \"%s\".\"%s\" are sufficient to prove that it does not contain nulls",`
	`6856`	`+ (errmsg("existing constraints on column \"%s.%s\" are sufficient to prove that it does not contain nulls",`
`6857`	`6857`	`RelationGetRelationName(rel), NameStr(attr->attname))));`
`6858`	`6858`	`return true;`
`6859`	`6859`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1722,10 +1722,10 @@ parse_hba_auth_opt(char name, char val, HbaLine *hbaline,`
`1722`	`1722`	`{`
`1723`	`1723`	`ereport(elevel,`
`1724`	`1724`	`(errcode(ERRCODE_CONFIG_FILE_ERROR),`
`1725`		`- errmsg("clientcert can not be set to \"no-verify\" when using \"cert\" authentication"),`
	`1725`	`+ errmsg("clientcert cannot be set to \"no-verify\" when using \"cert\" authentication"),`
`1726`	`1726`	`errcontext("line %d of configuration file \"%s\"",`
`1727`	`1727`	`line_num, HbaFileName)));`
`1728`		`- *err_msg = "clientcert can not be set to \"no-verify\" when using \"cert\" authentication";`
	`1728`	`+ *err_msg = "clientcert cannot be set to \"no-verify\" when using \"cert\" authentication";`
`1729`	`1729`	`return false;`
`1730`	`1730`	`}`
`1731`	`1731`	`hbaline->clientcert = clientCertOff;`
Original file line number	Diff line number	Diff line change
`@@ -16161,7 +16161,7 @@ insertSelectOptions(SelectStmt *stmt,`
`16161`	`16161`	`if (!stmt->sortClause && limitClause->limitOption == LIMIT_OPTION_WITH_TIES)`
`16162`	`16162`	`ereport(ERROR,`
`16163`	`16163`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`16164`		`- errmsg("WITH TIES options can not be specified without ORDER BY clause")));`
	`16164`	`+ errmsg("WITH TIES cannot be specified without ORDER BY clause")));`
`16165`	`16165`	`stmt->limitOption = limitClause->limitOption;`
`16166`	`16166`	`}`
`16167`	`16167`	`if (withClause)`
Original file line number	Diff line number	Diff line change
`@@ -1770,7 +1770,7 @@ transformLimitClause(ParseState pstate, Node clause,`
`1770`	`1770`	`IsA(clause, A_Const) && ((A_Const *) clause)->val.type == T_Null)`
`1771`	`1771`	`ereport(ERROR,`
`1772`	`1772`	`(errcode(ERRCODE_INVALID_ROW_COUNT_IN_LIMIT_CLAUSE),`
`1773`		`- errmsg("row count cannot be NULL in FETCH FIRST ... WITH TIES clause")));`
	`1773`	`+ errmsg("row count cannot be null in FETCH FIRST ... WITH TIES clause")));`
`1774`	`1774`
`1775`	`1775`	`return qual;`
`1776`	`1776`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2000,7 +2000,7 @@ get_fn_opclass_options(FmgrInfo *flinfo)`
`2000`	`2000`
`2001`	`2001`	`ereport(ERROR,`
`2002`	`2002`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`2003`		`- errmsg("opclass options info is absent in function call context")));`
	`2003`	`+ errmsg("operator class options info is absent in function call context")));`
`2004`	`2004`
`2005`	`2005`	`return NULL;`
`2006`	`2006`	`}`
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ sub pgbench`
`287`	`287`	`[],`
`288`	`288`	`[`
`289`	`289`	`qr{ERROR: invalid input syntax for type json},`
`290`		`- qr{(?!extended query with parameters)}`
	`290`	`+ qr{(?!unnamed portal with parameters)}`
`291`	`291`	`],`
`292`	`292`	`'server parameter logging',`
`293`	`293`	`{`
`@@ -314,7 +314,7 @@ sub pgbench`
`314`	`314`	`[],`
`315`	`315`	`[`
`316`	`316`	`qr{ERROR: division by zero},`
`317`		`- qr{CONTEXT: extended query with parameters: \$1 = '1', \$2 = NULL}`
	`317`	`+ qr{CONTEXT: unnamed portal with parameters: \$1 = '1', \$2 = NULL}`
`318`	`318`	`],`
`319`	`319`	`'server parameter logging',`
`320`	`320`	`{`
`@@ -328,7 +328,7 @@ sub pgbench`
`328`	`328`	`[],`
`329`	`329`	`[`
`330`	`330`	`qr{ERROR: invalid input syntax for type json},`
`331`		`- qr[CONTEXT: JSON data, line 1: \{ invalid\.\.\.[\r\n]+extended query with parameters: \$1 = '\{ invalid ', \$2 = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que \.\.\.']m`
	`331`	`+ qr[CONTEXT: JSON data, line 1: \{ invalid\.\.\.[\r\n]+unnamed portal with parameters: \$1 = '\{ invalid ', \$2 = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que \.\.\.']m`
`332`	`332`	`],`
`333`	`333`	`'server parameter logging',`
`334`	`334`	`{`
`@@ -356,7 +356,7 @@ sub pgbench`
`356`	`356`	`[],`
`357`	`357`	`[`
`358`	`358`	`qr{ERROR: division by zero},`
`359`		`- qr{CONTEXT: extended query with parameters: \$1 = '1', \$2 = NULL}`
	`359`	`+ qr{CONTEXT: unnamed portal with parameters: \$1 = '1', \$2 = NULL}`
`360`	`360`	`],`
`361`	`361`	`'server parameter logging',`
`362`	`362`	`{`
`@@ -373,7 +373,7 @@ sub pgbench`
`373`	`373`	`[],`
`374`	`374`	`[`
`375`	`375`	`qr{ERROR: invalid input syntax for type json},`
`376`		`- qr[CONTEXT: JSON data, line 1: \{ invalid\.\.\.[\r\n]+extended query with parameters: \$1 = '\{ invalid ', \$2 = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que mirase bien lo que hacia\?']m`
	`376`	`+ qr[CONTEXT: JSON data, line 1: \{ invalid\.\.\.[\r\n]+unnamed portal with parameters: \$1 = '\{ invalid ', \$2 = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que mirase bien lo que hacia\?']m`
`377`	`377`	`],`
`378`	`378`	`'server parameter logging',`
`379`	`379`	`{`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ main(int argc, char *argv[])`
`281`	`281`	`}`
`282`	`282`	`if (vacopts.full)`
`283`	`283`	`{`
`284`		`- pg_log_error("cannot use the \"%s\" option when performing full",`
	`284`	`+ pg_log_error("cannot use the \"%s\" option when performing full vacuum",`
`285`	`285`	`"parallel");`
`286`	`286`	`exit(1);`
`287`	`287`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ RestoreArchivedFile(const char path, const char xlogfname,`
`50`	`50`	`xlogfname, NULL);`
`51`	`51`	`if (xlogRestoreCmd == NULL)`
`52`	`52`	`{`
`53`		`- pg_log_fatal("could not use restore_command with %%r alias");`
	`53`	`+ pg_log_fatal("cannot use restore_command with %%r placeholder");`
`54`	`54`	`exit(1);`
`55`	`55`	`}`
`56`	`56`
`@@ -109,7 +109,7 @@ RestoreArchivedFile(const char path, const char xlogfname,`
`109`	`109`	`*/`
`110`	`110`	`if (wait_result_is_any_signal(rc, true))`
`111`	`111`	`{`
`112`		`- pg_log_fatal("restore_command failed due to the signal: %s",`
	`112`	`+ pg_log_fatal("restore_command failed: %s",`
`113`	`113`	`wait_result_to_str(rc));`
`114`	`114`	`exit(1);`
`115`	`115`	`}`