git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

author Peter Eisentraut <peter@eisentraut.org>

2024年1月18日 08:35:12 +0000 (09:35 +0100)

committer Peter Eisentraut <peter@eisentraut.org>

2024年1月18日 08:35:12 +0000 (09:35 +0100)

per style guidelines

Author: Peter Smith <peter.b.smith@fujitsu.com>
Discussion: https://www.postgresql.org/message-id/flat/CAHut%2BPtzstExQ4%3DvFH%2BWzZ4g4xEx2JA%3DqxussxOdxVEwJce6bw%40mail.gmail.com

contrib/pg_surgery/heap_surgery.c patch | blob | blame | history

src/backend/commands/event_trigger.c patch | blob | blame | history

src/backend/storage/file/fd.c patch | blob | blame | history

src/backend/tcop/postgres.c patch | blob | blame | history

src/backend/utils/error/elog.c patch | blob | blame | history

src/bin/pgbench/t/001_pgbench_with_server.pl patch | blob | blame | history

diff --git a/contrib/pg_surgery/heap_surgery.c b/contrib/pg_surgery/heap_surgery.c

index 58641b8adfb3d1121f8726f7a3640f2135212e8e..37dffe3f7d57ac5211aca901465386fbf3347ad1 100644 (file)

--- a/contrib/pg_surgery/heap_surgery.c

+++ b/contrib/pg_surgery/heap_surgery.c

@@ -95,7 +95,7 @@ heap_force_common(FunctionCallInfo fcinfo, HeapTupleForceOption heap_force_opt)

ereport(ERROR,

(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),

errmsg("recovery is in progress"),

- errhint("heap surgery functions cannot be executed during recovery.")));

+ errhint("Heap surgery functions cannot be executed during recovery.")));

/* Check inputs. */

sanity_check_tid_array(ta, &ntids);

diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c

index b146d2aaf4430c3f668f058e86b7fa0c88835aa6..f193c7ddf60ea7b6988bd6e16b5e2823f2fd9054 100644 (file)

--- a/src/backend/commands/event_trigger.c

+++ b/src/backend/commands/event_trigger.c

@@ -174,7 +174,7 @@ CreateEventTrigger(CreateEventTrigStmt *stmt)

else if (strcmp(stmt->eventname, "login") == 0 && tags != NULL)

ereport(ERROR,

(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),

- errmsg("Tag filtering is not supported for login event trigger")));

+ errmsg("tag filtering is not supported for login event trigger")));

* Give user a nice error message if an event trigger of the same name

diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c

index 43d2b2a156e11b0b93c0c41ae241c376013d365d..d298e4842cac599d3bfdb5f595a7842c3cea2814 100644 (file)

--- a/src/backend/storage/file/fd.c

+++ b/src/backend/storage/file/fd.c

@@ -3961,7 +3961,7 @@ check_debug_io_direct(char **newval, void **extra, GucSource source)

if (!SplitGUCList(rawstring, ',', &elemlist))

{

- GUC_check_errdetail("invalid list syntax in parameter %s",

+ GUC_check_errdetail("Invalid list syntax in parameter %s",

"debug_io_direct");

pfree(rawstring);

list_free(elemlist);

@@ -3981,7 +3981,7 @@ check_debug_io_direct(char **newval, void **extra, GucSource source)

flags |= IO_DIRECT_WAL_INIT;

else

{

- GUC_check_errdetail("invalid option \"%s\"", item);

+ GUC_check_errdetail("Invalid option \"%s\"", item);

result = false;

break;

}

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c

index 1eaaf3c6c58db5fe10155d286d2fc6aa110daae7..1a34bd3715fb36fe9665779ac74b504a46db6f29 100644 (file)

--- a/src/backend/tcop/postgres.c

+++ b/src/backend/tcop/postgres.c

@@ -2479,7 +2479,7 @@ errdetail_params(ParamListInfo params)

str = BuildParamLogString(params, NULL, log_parameter_max_length);

if (str && str[0] != '0円')

- errdetail("parameters: %s", str);

+ errdetail("Parameters: %s", str);

}

return 0;

@@ -2494,7 +2494,7 @@ static int

errdetail_abort(void)

{

if (MyProc->recoveryConflictPending)

- errdetail("abort reason: recovery conflict");

+ errdetail("Abort reason: recovery conflict");

return 0;

}

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c

index 9ef7cfc1939201a9d7e3c9f86b9a43a3084105a2..2c7a20e3d3192e6c822e2e0df426681f6886b679 100644 (file)

--- a/src/backend/utils/error/elog.c

+++ b/src/backend/utils/error/elog.c

@@ -2140,7 +2140,7 @@ check_backtrace_functions(char **newval, void **extra, GucSource source)

", \n\t");

if (validlen != newvallen)

{

- GUC_check_errdetail("invalid character");

+ GUC_check_errdetail("Invalid character");

return false;

}

diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl

index 977bc7cdcc1ae43530e3c9ecabf32d31802b0c4b..fc57facf9e29be05f5c8094c2a2598c0206f1559 100644 (file)

--- a/src/bin/pgbench/t/001_pgbench_with_server.pl

+++ b/src/bin/pgbench/t/001_pgbench_with_server.pl

@@ -290,7 +290,7 @@ select column1::jsonb from (values (:value), (:long)) as q;

my $log = PostgreSQL::Test::Utils::slurp_file($node->logfile);

unlike(

$log,

- qr[DETAIL: parameters: \1ドル = '\{ invalid ',],

+ qr[DETAIL: Parameters: \1ドル = '\{ invalid ',],

"no parameters logged");

$log = undef;

@@ -331,7 +331,7 @@ select column1::jsonb from (values (:value), (:long)) as q;

$log = PostgreSQL::Test::Utils::slurp_file($node->logfile);

like(

$log,

- qr[DETAIL: parameters: \1ドル = '\{ invalid ', \2ドル = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que mirase bien lo que hacia\?'''],

+ qr[DETAIL: Parameters: \1ドル = '\{ invalid ', \2ドル = '''Valame Dios!'' dijo Sancho; ''no le dije yo a vuestra merced que mirase bien lo que hacia\?'''],

"parameter report does not truncate");

$log = undef;

@@ -376,7 +376,7 @@ select column1::jsonb from (values (:value), (:long)) as q;

$log = PostgreSQL::Test::Utils::slurp_file($node->logfile);

like(

$log,

- qr[DETAIL: parameters: \1ドル = '\{ inval\.\.\.', \2ドル = '''Valame\.\.\.'],

+ qr[DETAIL: Parameters: \1ドル = '\{ inval\.\.\.', \2ドル = '''Valame\.\.\.'],

"parameter report truncates");

$log = undef;

This is the main PostgreSQL git repository.

RSS Atom