Improve log messages from pg_import_system_collations().

tglsfdc · tglsfdc · commit 69e31d05b0a3 · 2021-09-14T18:55:15.000-04:00
pg_import_system_collations() was a bit inconsistent about how it reported locales (names output by "locale -a") that it didn't make pg_collation entries for. IMV we should print some suitable message for every locale that we reject, except when it matches a pre-existing pg_collation entry. (This is all at DEBUG1 log level, though, so as not to create noise during initdb.) Add messages for the two cases that were previously not logged, namely unrecognized encoding and client-only encoding. Re-word the existing messages to have a consistent style. Anton Voloshin and Tom Lane Discussion: https://postgr.es/m/429d64ee-188d-3ce1-106a-53a8b45c4fce@postgrespro.ru
diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c
@@ -576,7 +576,7 @@ pg_import_system_collations(PG_FUNCTION_ARGS)
 
 			if (len == 0 || localebuf[len - 1] != '\n')
 			{
-				elog(DEBUG1, "locale name too long, skipped: \"%s\"", localebuf);
+				elog(DEBUG1, "skipping locale with too-long name: \"%s\"", localebuf);
 				continue;
 			}
 			localebuf[len - 1] = '\0';
@@ -590,18 +590,22 @@ pg_import_system_collations(PG_FUNCTION_ARGS)
 			 */
 			if (!pg_is_ascii(localebuf))
 			{
-				elog(DEBUG1, "locale name has non-ASCII characters, skipped: \"%s\"", localebuf);
+				elog(DEBUG1, "skipping locale with non-ASCII name: \"%s\"", localebuf);
 				continue;
 			}
 
 			enc = pg_get_encoding_from_locale(localebuf, false);
 			if (enc < 0)
 			{
-				/* error message printed by pg_get_encoding_from_locale() */
+				elog(DEBUG1, "skipping locale with unrecognized encoding: \"%s\"",
+					 localebuf);
 				continue;
 			}
 			if (!PG_VALID_BE_ENCODING(enc))
-				continue;		/* ignore locales for client-only encodings */
+			{
+				elog(DEBUG1, "skipping locale with client-only encoding: \"%s\"", localebuf);
+				continue;
+			}
 			if (enc == PG_SQL_ASCII)
 				continue;		/* C/POSIX are already in the catalog */
 

Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,7 @@ pg_import_system_collations(PG_FUNCTION_ARGS)`
`576`	`576`
`577`	`577`	`if (len == 0 \|\| localebuf[len - 1] != '\n')`
`578`	`578`	`{`
`579`		`- elog(DEBUG1, "locale name too long, skipped: \"%s\"", localebuf);`
	`579`	`+ elog(DEBUG1, "skipping locale with too-long name: \"%s\"", localebuf);`
`580`	`580`	`continue;`
`581`	`581`	`}`
`582`	`582`	`localebuf[len - 1] = '\0';`
`@@ -590,18 +590,22 @@ pg_import_system_collations(PG_FUNCTION_ARGS)`
`590`	`590`	`*/`
`591`	`591`	`if (!pg_is_ascii(localebuf))`
`592`	`592`	`{`
`593`		`- elog(DEBUG1, "locale name has non-ASCII characters, skipped: \"%s\"", localebuf);`
	`593`	`+ elog(DEBUG1, "skipping locale with non-ASCII name: \"%s\"", localebuf);`
`594`	`594`	`continue;`
`595`	`595`	`}`
`596`	`596`
`597`	`597`	`enc = pg_get_encoding_from_locale(localebuf, false);`
`598`	`598`	`if (enc < 0)`
`599`	`599`	`{`
`600`		`- /* error message printed by pg_get_encoding_from_locale() */`
	`600`	`+ elog(DEBUG1, "skipping locale with unrecognized encoding: \"%s\"",`
	`601`	`+ localebuf);`
`601`	`602`	`continue;`
`602`	`603`	`}`
`603`	`604`	`if (!PG_VALID_BE_ENCODING(enc))`
`604`		`- continue; /* ignore locales for client-only encodings */`
	`605`	`+ {`
	`606`	`+ elog(DEBUG1, "skipping locale with client-only encoding: \"%s\"", localebuf);`
	`607`	`+ continue;`
	`608`	`+ }`
`605`	`609`	`if (enc == PG_SQL_ASCII)`
`606`	`610`	`continue; /* C/POSIX are already in the catalog */`
`607`	`611`