Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1af37ec

Browse files
committed
Replace errdetail("%s", ...) with errdetail_internal("%s", ...).
There may be some other places where we should use errdetail_internal,but they'll have to be evaluated case-by-case. This commit just hitsa bunch of places where invoking gettext is obviously a waste of cycles.
1 parent3ee7c87 commit1af37ec

File tree

12 files changed

+33
-32
lines changed

12 files changed

+33
-32
lines changed

‎contrib/dblink/dblink.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ typedef struct remoteConnHashEnt
188188
ereport(ERROR, \
189189
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \
190190
errmsg("could not establish connection"), \
191-
errdetail("%s", msg))); \
191+
errdetail_internal("%s", msg))); \
192192
} \
193193
dblink_security_check(conn, rconn); \
194194
PQsetClientEncoding(conn, GetDatabaseEncodingName()); \
@@ -264,7 +264,7 @@ dblink_connect(PG_FUNCTION_ARGS)
264264
ereport(ERROR,
265265
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
266266
errmsg("could not establish connection"),
267-
errdetail("%s",msg)));
267+
errdetail_internal("%s",msg)));
268268
}
269269

270270
/* check password actually used if not superuser */
@@ -2262,8 +2262,9 @@ dblink_res_error(const char *conname, PGresult *res, const char *dblink_context_
22622262

22632263
ereport(level,
22642264
(errcode(sqlstate),
2265-
message_primary ?errmsg("%s",message_primary) :errmsg("unknown error"),
2266-
message_detail ?errdetail("%s",message_detail) :0,
2265+
message_primary ?errmsg_internal("%s",message_primary) :
2266+
errmsg("unknown error"),
2267+
message_detail ?errdetail_internal("%s",message_detail) :0,
22672268
message_hint ?errhint("%s",message_hint) :0,
22682269
message_context ?errcontext("%s",message_context) :0,
22692270
errcontext("Error occurred on dblink connection named \"%s\": %s.",

‎src/backend/commands/trigger.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
902902
ereport(NOTICE,
903903
(errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
904904
constr_name,buf.data),
905-
errdetail("%s",_(funcdescr[funcnum]))));
905+
errdetail_internal("%s",_(funcdescr[funcnum]))));
906906
oldContext=MemoryContextSwitchTo(TopMemoryContext);
907907
info= (OldTriggerInfo*)palloc0(sizeof(OldTriggerInfo));
908908
info->args=copyObject(stmt->args);
@@ -918,7 +918,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
918918
ereport(NOTICE,
919919
(errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
920920
constr_name,buf.data),
921-
errdetail("%s",_(funcdescr[funcnum]))));
921+
errdetail_internal("%s",_(funcdescr[funcnum]))));
922922
}
923923
else
924924
{
@@ -930,7 +930,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
930930
ereport(NOTICE,
931931
(errmsg("converting trigger group into constraint \"%s\" %s",
932932
constr_name,buf.data),
933-
errdetail("%s",_(funcdescr[funcnum]))));
933+
errdetail_internal("%s",_(funcdescr[funcnum]))));
934934
fkcon->contype=CONSTR_FOREIGN;
935935
fkcon->location=-1;
936936
if (funcnum==2)

‎src/backend/commands/user.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ DropRole(DropRoleStmt *stmt)
953953
(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
954954
errmsg("role \"%s\" cannot be dropped because some objects depend on it",
955955
role),
956-
errdetail("%s",detail),
956+
errdetail_internal("%s",detail),
957957
errdetail_log("%s",detail_log)));
958958

959959
/*

‎src/backend/libpq/auth.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ pg_GSS_error(int severity, char *errmsg, OM_uint32 maj_stat, OM_uint32 min_stat)
955955
*/
956956
ereport(severity,
957957
(errmsg_internal("%s",errmsg),
958-
errdetail("%s: %s",msg_major,msg_minor)));
958+
errdetail_internal("%s: %s",msg_major,msg_minor)));
959959
}
960960

961961
staticint
@@ -1198,11 +1198,11 @@ pg_SSPI_error(int severity, const char *errmsg, SECURITY_STATUS r)
11981198
sysmsg,sizeof(sysmsg),NULL)==0)
11991199
ereport(severity,
12001200
(errmsg_internal("%s",errmsg),
1201-
errdetail("SSPI error %x", (unsignedint)r)));
1201+
errdetail_internal("SSPI error %x", (unsignedint)r)));
12021202
else
12031203
ereport(severity,
12041204
(errmsg_internal("%s",errmsg),
1205-
errdetail("%s (%x)",sysmsg, (unsignedint)r)));
1205+
errdetail_internal("%s (%x)",sysmsg, (unsignedint)r)));
12061206
}
12071207

12081208
staticint

‎src/backend/nodes/print.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ elog_node_display(int lev, const char *title, void *obj, bool pretty)
8282
pfree(s);
8383
ereport(lev,
8484
(errmsg_internal("%s:",title),
85-
errdetail("%s",f)));
85+
errdetail_internal("%s",f)));
8686
pfree(f);
8787
}
8888

‎src/backend/storage/lmgr/deadlock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ DeadLockReport(void)
939939
ereport(ERROR,
940940
(errcode(ERRCODE_T_R_DEADLOCK_DETECTED),
941941
errmsg("deadlock detected"),
942-
errdetail("%s",clientbuf.data),
942+
errdetail_internal("%s",clientbuf.data),
943943
errdetail_log("%s",logbuf.data),
944944
errhint("See server log for query details.")));
945945
}

‎src/backend/tcop/postgres.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4294,7 +4294,7 @@ ShowUsage(const char *title)
42944294

42954295
ereport(LOG,
42964296
(errmsg_internal("%s",title),
4297-
errdetail("%s",str.data)));
4297+
errdetail_internal("%s",str.data)));
42984298

42994299
pfree(str.data);
43004300
}

‎src/backend/utils/adt/xml.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1364,14 +1364,14 @@ xml_ereport(int level, int sqlcode, const char *msg)
13641364

13651365
ereport(level,
13661366
(errcode(sqlcode),
1367-
errmsg("%s",msg),
1368-
errdetail("%s",detail)));
1367+
errmsg_internal("%s",msg),
1368+
errdetail_internal("%s",detail)));
13691369
}
13701370
else
13711371
{
13721372
ereport(level,
13731373
(errcode(sqlcode),
1374-
errmsg("%s",msg)));
1374+
errmsg_internal("%s",msg)));
13751375
}
13761376
}
13771377

@@ -1442,7 +1442,7 @@ xml_ereport_by_code(int level, int sqlcode,
14421442

14431443
ereport(level,
14441444
(errcode(sqlcode),
1445-
errmsg("%s",msg),
1445+
errmsg_internal("%s",msg),
14461446
errdetail(det,code)));
14471447
}
14481448

‎src/backend/utils/fmgr/dfmgr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ incompatible_module_error(const char *libname,
378378
ereport(ERROR,
379379
(errmsg("incompatible library \"%s\": magic block mismatch",
380380
libname),
381-
errdetail("%s",details.data)));
381+
errdetail_internal("%s",details.data)));
382382
}
383383

384384
/*

‎src/backend/utils/misc/guc.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7975,11 +7975,11 @@ call_bool_check_hook(struct config_bool * conf, bool *newval, void **extra,
79757975
ereport(elevel,
79767976
(errcode(GUC_check_errcode_value),
79777977
GUC_check_errmsg_string ?
7978-
errmsg("%s",GUC_check_errmsg_string) :
7978+
errmsg_internal("%s",GUC_check_errmsg_string) :
79797979
errmsg("invalid value for parameter \"%s\": %d",
79807980
conf->gen.name, (int)*newval),
79817981
GUC_check_errdetail_string ?
7982-
errdetail("%s",GUC_check_errdetail_string) :0,
7982+
errdetail_internal("%s",GUC_check_errdetail_string) :0,
79837983
GUC_check_errhint_string ?
79847984
errhint("%s",GUC_check_errhint_string) :0));
79857985
/* Flush any strings created in ErrorContext */
@@ -8009,11 +8009,11 @@ call_int_check_hook(struct config_int * conf, int *newval, void **extra,
80098009
ereport(elevel,
80108010
(errcode(GUC_check_errcode_value),
80118011
GUC_check_errmsg_string ?
8012-
errmsg("%s",GUC_check_errmsg_string) :
8012+
errmsg_internal("%s",GUC_check_errmsg_string) :
80138013
errmsg("invalid value for parameter \"%s\": %d",
80148014
conf->gen.name,*newval),
80158015
GUC_check_errdetail_string ?
8016-
errdetail("%s",GUC_check_errdetail_string) :0,
8016+
errdetail_internal("%s",GUC_check_errdetail_string) :0,
80178017
GUC_check_errhint_string ?
80188018
errhint("%s",GUC_check_errhint_string) :0));
80198019
/* Flush any strings created in ErrorContext */
@@ -8043,11 +8043,11 @@ call_real_check_hook(struct config_real * conf, double *newval, void **extra,
80438043
ereport(elevel,
80448044
(errcode(GUC_check_errcode_value),
80458045
GUC_check_errmsg_string ?
8046-
errmsg("%s",GUC_check_errmsg_string) :
8046+
errmsg_internal("%s",GUC_check_errmsg_string) :
80478047
errmsg("invalid value for parameter \"%s\": %g",
80488048
conf->gen.name,*newval),
80498049
GUC_check_errdetail_string ?
8050-
errdetail("%s",GUC_check_errdetail_string) :0,
8050+
errdetail_internal("%s",GUC_check_errdetail_string) :0,
80518051
GUC_check_errhint_string ?
80528052
errhint("%s",GUC_check_errhint_string) :0));
80538053
/* Flush any strings created in ErrorContext */
@@ -8077,11 +8077,11 @@ call_string_check_hook(struct config_string * conf, char **newval, void **extra,
80778077
ereport(elevel,
80788078
(errcode(GUC_check_errcode_value),
80798079
GUC_check_errmsg_string ?
8080-
errmsg("%s",GUC_check_errmsg_string) :
8080+
errmsg_internal("%s",GUC_check_errmsg_string) :
80818081
errmsg("invalid value for parameter \"%s\": \"%s\"",
80828082
conf->gen.name,*newval ?*newval :""),
80838083
GUC_check_errdetail_string ?
8084-
errdetail("%s",GUC_check_errdetail_string) :0,
8084+
errdetail_internal("%s",GUC_check_errdetail_string) :0,
80858085
GUC_check_errhint_string ?
80868086
errhint("%s",GUC_check_errhint_string) :0));
80878087
/* Flush any strings created in ErrorContext */
@@ -8111,12 +8111,12 @@ call_enum_check_hook(struct config_enum * conf, int *newval, void **extra,
81118111
ereport(elevel,
81128112
(errcode(GUC_check_errcode_value),
81138113
GUC_check_errmsg_string ?
8114-
errmsg("%s",GUC_check_errmsg_string) :
8114+
errmsg_internal("%s",GUC_check_errmsg_string) :
81158115
errmsg("invalid value for parameter \"%s\": \"%s\"",
81168116
conf->gen.name,
81178117
config_enum_lookup_by_value(conf,*newval)),
81188118
GUC_check_errdetail_string ?
8119-
errdetail("%s",GUC_check_errdetail_string) :0,
8119+
errdetail_internal("%s",GUC_check_errdetail_string) :0,
81208120
GUC_check_errhint_string ?
81218121
errhint("%s",GUC_check_errhint_string) :0));
81228122
/* Flush any strings created in ErrorContext */

‎src/pl/plpgsql/src/pl_exec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2792,7 +2792,7 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
27922792
ereport(stmt->elog_level,
27932793
(err_code ?errcode(err_code) :0,
27942794
errmsg_internal("%s",err_message),
2795-
(err_detail!=NULL) ?errdetail("%s",err_detail) :0,
2795+
(err_detail!=NULL) ?errdetail_internal("%s",err_detail) :0,
27962796
(err_hint!=NULL) ?errhint("%s",err_hint) :0));
27972797

27982798
estate->err_text=NULL;/* un-suppress... */

‎src/pl/plpython/plpython.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4435,8 +4435,8 @@ PLy_elog(int elevel, const char *fmt,...)
44354435
PG_TRY();
44364436
{
44374437
ereport(elevel,
4438-
(errmsg("%s",primary ?primary :"no exception data"),
4439-
(detail) ?errdetail("%s",detail) :0,
4438+
(errmsg_internal("%s",primary ?primary :"no exception data"),
4439+
(detail) ?errdetail_internal("%s",detail) :0,
44404440
(tb_depth>0&&tbmsg) ?errcontext("%s",tbmsg) :0,
44414441
(hint) ?errhint("%s",hint) :0,
44424442
(query) ?internalerrquery(query) :0,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp