mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-11-21 03:13:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Apply more quoting to GUC names in messages

Browse Source 
This is a continuation of 17974ec259.  More quotes are applied to
GUC names in error messages and hints, taking care of what seems to be
all the remaining holes currently in the tree for the GUCs.

Author: Peter Smith
Discussion: https://postgr.es/m/CAHut+Pv-kSN8SkxSdoHano_wPubqcg5789ejhCDZAcLFceBR-w@mail.gmail.com
This commit is contained in:
Michael Paquier 2024-09-04 13:50:44 +09:00
parent 6c2b5edecc
commit b4db64270e
15 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/oid2name/oid2name.c
View File

@ -353,7 +353,7 @@ sql_conn(struct options *my_opts)
res = PQexec(conn, ALWAYS_SECURE_SEARCH_PATH_SQL);
if (PQresultStatus(res) != PGRES_TUPLES_OK)
{
pg_log_error("could not clear search_path: %s",
pg_log_error("could not clear \"search_path\": %s",
PQerrorMessage(conn));
PQclear(res);
PQfinish(conn);

2
contrib/vacuumlo/vacuumlo.c
View File

@ -139,7 +139,7 @@ vacuumlo(const char *database, const struct _param *param)
res = PQexec(conn, ALWAYS_SECURE_SEARCH_PATH_SQL);
if (PQresultStatus(res) != PGRES_TUPLES_OK)
{
pg_log_error("failed to set search_path: %s", PQerrorMessage(conn));
pg_log_error("failed to set \"search_path\": %s", PQerrorMessage(conn));
PQclear(res);
PQfinish(conn);
return -1;

2
src/backend/access/transam/xlog.c
View File

@ -9111,7 +9111,7 @@ do_pg_backup_stop(BackupState *state, bool waitforarchive)
ereport(ERROR,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("WAL level not sufficient for making an online backup"),
errhint("wal_level must be set to \"replica\" or \"logical\" at server start.")));
errhint("\"wal_level\" must be set to \"replica\" or \"logical\" at server start.")));
/*
* OK to update backup counter and session-level lock.

2
src/backend/archive/shell_archive.c
View File

@ -48,7 +48,7 @@ shell_archive_configured(ArchiveModuleState *state)
if (XLogArchiveCommand[0] != '\0')
return true;
arch_module_check_errdetail("%s is not set.",
arch_module_check_errdetail("\"%s\" is not set.",
"archive_command");
return false;
}

2
src/backend/postmaster/bgworker.c
View File

@ -257,7 +257,7 @@ BackgroundWorkerStateChange(bool allow_new_workers)
if (max_worker_processes != BackgroundWorkerData->total_slots)
{
ereport(LOG,
(errmsg("inconsistent background worker state (max_worker_processes=%d, total_slots=%d)",
(errmsg("inconsistent background worker state (\"max_worker_processes\"=%d, total slots=%d)",
max_worker_processes,
BackgroundWorkerData->total_slots)));
return;

2
src/backend/postmaster/checkpointer.c
View File

@ -663,7 +663,7 @@ CheckArchiveTimeout(void)
* assume nothing happened.
*/
if (XLogSegmentOffset(switchpoint, wal_segment_size) != 0)
elog(DEBUG1, "write-ahead log switch forced (archive_timeout=%d)",
elog(DEBUG1, "write-ahead log switch forced (\"archive_timeout\"=%d)",
XLogArchiveTimeout);
}

2
src/backend/replication/logical/launcher.c
View File

@ -337,7 +337,7 @@ logicalrep_worker_launch(LogicalRepWorkerType wtype,
if (max_replication_slots == 0)
ereport(ERROR,
(errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
errmsg("cannot start logical replication workers when max_replication_slots = 0")));
errmsg("cannot start logical replication workers when \"max_replication_slots\"=0")));
/*
* We need to do the modification of the shared memory under lock so that

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

@ -962,14 +962,14 @@ validate_remote_info(WalReceiverConn *wrconn)
if (res->status != WALRCV_OK_TUPLES)
ereport(ERROR,
errmsg("could not fetch primary_slot_name \"%s\" info from the primary server: %s",
errmsg("could not fetch primary slot name \"%s\" info from the primary server: %s",
PrimarySlotName, res->err),
errhint("Check if primary_slot_name is configured correctly."));
errhint("Check if \"primary_slot_name\" is configured correctly."));
tupslot = MakeSingleTupleTableSlot(res->tupledesc, &TTSOpsMinimalTuple);
if (!tuplestore_gettupleslot(res->tuplestore, true, false, tupslot))
elog(ERROR,
"failed to fetch tuple for the primary server slot specified by primary_slot_name");
"failed to fetch tuple for the primary server slot specified by \"primary_slot_name\"");
remote_in_recovery = DatumGetBool(slot_getattr(tupslot, 1, &isnull));
Assert(!isnull);

2
src/backend/storage/file/fd.c
View File

@ -2254,7 +2254,7 @@ FileWriteV(File file, const struct iovec *iov, int iovcnt, off_t offset,
if (newTotal > (uint64) temp_file_limit * (uint64) 1024)
ereport(ERROR,
(errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
errmsg("temporary file size exceeds temp_file_limit (%dkB)",
errmsg("temporary file size exceeds \"temp_file_limit\" (%dkB)",
temp_file_limit)));
}
}

10
src/backend/utils/misc/guc_tables.c
View File

@ -2356,7 +2356,7 @@ struct config_int ConfigureNamesInt[] =
{
{"commit_timestamp_buffers", PGC_POSTMASTER, RESOURCES_MEM,
gettext_noop("Sets the size of the dedicated buffer pool used for the commit timestamp cache."),
gettext_noop("Specify 0 to have this value determined as a fraction of shared_buffers."),
gettext_noop("Specify 0 to have this value determined as a fraction of \"shared_buffers\"."),
GUC_UNIT_BLOCKS
},
&commit_timestamp_buffers,
@ -2411,7 +2411,7 @@ struct config_int ConfigureNamesInt[] =
{
{"subtransaction_buffers", PGC_POSTMASTER, RESOURCES_MEM,
gettext_noop("Sets the size of the dedicated buffer pool used for the subtransaction cache."),
gettext_noop("Specify 0 to have this value determined as a fraction of shared_buffers."),
gettext_noop("Specify 0 to have this value determined as a fraction of \"shared_buffers\"."),
GUC_UNIT_BLOCKS
},
&subtransaction_buffers,
@ -2422,7 +2422,7 @@ struct config_int ConfigureNamesInt[] =
{
{"transaction_buffers", PGC_POSTMASTER, RESOURCES_MEM,
gettext_noop("Sets the size of the dedicated buffer pool used for the transaction status cache."),
gettext_noop("Specify 0 to have this value determined as a fraction of shared_buffers."),
gettext_noop("Specify 0 to have this value determined as a fraction of \"shared_buffers\"."),
GUC_UNIT_BLOCKS
},
&transaction_buffers,
@ -2942,7 +2942,7 @@ struct config_int ConfigureNamesInt[] =
{
{"wal_buffers", PGC_POSTMASTER, WAL_SETTINGS,
gettext_noop("Sets the number of disk-page buffers in shared memory for WAL."),
gettext_noop("Specify -1 to have this value determined as a fraction of shared_buffers."),
gettext_noop("Specify -1 to have this value determined as a fraction of \"shared_buffers\"."),
GUC_UNIT_XBLOCKS
},
&XLOGbuffers,
@ -3068,7 +3068,7 @@ struct config_int ConfigureNamesInt[] =
{"log_min_duration_sample", PGC_SUSET, LOGGING_WHEN,
gettext_noop("Sets the minimum execution time above which "
"a sample of statements will be logged."
" Sampling is determined by log_statement_sample_rate."),
" Sampling is determined by \"log_statement_sample_rate\"."),
gettext_noop("Zero logs a sample of all queries. -1 turns this feature off."),
GUC_UNIT_MS
},

2
src/bin/pg_archivecleanup/pg_archivecleanup.c
View File

@ -270,7 +270,7 @@ usage(void)
" clean up\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\n"
"For use as archive_cleanup_command in postgresql.conf:\n"
"For use as \"archive_cleanup_command\" in postgresql.conf:\n"
" archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION %%r'\n"
"e.g.\n"
" archive_cleanup_command = 'pg_archivecleanup /mnt/server/archiverdir %%r'\n"));

4
src/bin/pg_basebackup/pg_createsubscriber.c
View File

@ -523,7 +523,7 @@ connect_database(const char *conninfo, bool exit_on_error)
res = PQexec(conn, ALWAYS_SECURE_SEARCH_PATH_SQL);
if (PQresultStatus(res) != PGRES_TUPLES_OK)
{
pg_log_error("could not clear search_path: %s",
pg_log_error("could not clear \"search_path\": %s",
PQresultErrorMessage(res));
PQclear(res);
PQfinish(conn);
@ -911,7 +911,7 @@ check_publisher(const struct LogicalRepInfo *dbinfo)
if (strcmp(wal_level, "logical") != 0)
{
pg_log_error("publisher requires wal_level >= \"logical\"");
pg_log_error("publisher requires \"wal_level\" >= \"logical\"");
failed = true;
}

2
src/bin/pg_dump/pg_backup_db.c
View File

@ -39,7 +39,7 @@ _check_database_version(ArchiveHandle *AH)
remoteversion_str = PQparameterStatus(AH->connection, "server_version");
remoteversion = PQserverVersion(AH->connection);
if (remoteversion == 0 || !remoteversion_str)
pg_fatal("could not get server_version from libpq");
pg_fatal("could not get \"server_version\" from libpq");
AH->public.remoteVersionStr = pg_strdup(remoteversion_str);
AH->public.remoteVersion = remoteversion;

2
src/bin/pg_rewind/pg_rewind.c
View File

@ -1104,7 +1104,7 @@ getRestoreCommand(const char *argv0)
restore_command = pipe_read_line(postgres_cmd->data);
if (restore_command == NULL)
pg_fatal("could not read restore_command from target cluster");
pg_fatal("could not read \"restore_command\" from target cluster");
(void) pg_strip_crlf(restore_command);

4
src/include/libpq/libpq-be-fe-helpers.h
View File

@ -142,13 +142,13 @@ libpqsrv_connect_prepare(void)
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
errmsg("could not establish connection"),
errdetail("There are too many open files on the local server."),
errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits.")));
errhint("Raise the server's \"max_files_per_process\" and/or \"ulimit -n\" limits.")));
#else
ereport(ERROR,
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
errmsg("could not establish connection"),
errdetail("There are too many open files on the local server."),
errhint("Raise the server's max_files_per_process setting.")));
errhint("Raise the server's \"max_files_per_process\" setting.")));
#endif
}
}