Skip to content

Commit fbd847a

Browse files
tglsfdctglsfdc
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 hits a bunch of places where invoking gettext is obviously a waste of cycles.
1 parent 3b41d49 commit fbd847a

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
@@ -187,7 +187,7 @@ typedef struct remoteConnHashEnt
187187
ereport(ERROR, \
188188
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \
189189
errmsg("could not establish connection"), \
190-
errdetail("%s", msg))); \
190+
errdetail_internal("%s", msg))); \
191191
} \
192192
dblink_security_check(conn, rconn); \
193193
PQsetClientEncoding(conn, GetDatabaseEncodingName()); \
@@ -263,7 +263,7 @@ dblink_connect(PG_FUNCTION_ARGS)
263263
ereport(ERROR,
264264
(errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
265265
errmsg("could not establish connection"),
266-
errdetail("%s", msg)));
266+
errdetail_internal("%s", msg)));
267267
}
268268

269269
/* check password actually used if not superuser */
@@ -2261,8 +2261,9 @@ dblink_res_error(const char *conname, PGresult *res, const char *dblink_context_
22612261

22622262
ereport(level,
22632263
(errcode(sqlstate),
2264-
message_primary ? errmsg("%s", message_primary) : errmsg("unknown error"),
2265-
message_detail ? errdetail("%s", message_detail) : 0,
2264+
message_primary ? errmsg_internal("%s", message_primary) :
2265+
errmsg("unknown error"),
2266+
message_detail ? errdetail_internal("%s", message_detail) : 0,
22662267
message_hint ? errhint("%s", message_hint) : 0,
22672268
message_context ? errcontext("%s", message_context) : 0,
22682269
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
@@ -891,7 +891,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
891891
ereport(NOTICE,
892892
(errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
893893
constr_name, buf.data),
894-
errdetail("%s", _(funcdescr[funcnum]))));
894+
errdetail_internal("%s", _(funcdescr[funcnum]))));
895895
oldContext = MemoryContextSwitchTo(TopMemoryContext);
896896
info = (OldTriggerInfo *) palloc0(sizeof(OldTriggerInfo));
897897
info->args = copyObject(stmt->args);
@@ -907,7 +907,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
907907
ereport(NOTICE,
908908
(errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
909909
constr_name, buf.data),
910-
errdetail("%s", _(funcdescr[funcnum]))));
910+
errdetail_internal("%s", _(funcdescr[funcnum]))));
911911
}
912912
else
913913
{
@@ -919,7 +919,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
919919
ereport(NOTICE,
920920
(errmsg("converting trigger group into constraint \"%s\" %s",
921921
constr_name, buf.data),
922-
errdetail("%s", _(funcdescr[funcnum]))));
922+
errdetail_internal("%s", _(funcdescr[funcnum]))));
923923
fkcon->contype = CONSTR_FOREIGN;
924924
fkcon->location = -1;
925925
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
@@ -959,7 +959,7 @@ pg_GSS_error(int severity, char *errmsg, OM_uint32 maj_stat, OM_uint32 min_stat)
959959
*/
960960
ereport(severity,
961961
(errmsg_internal("%s", errmsg),
962-
errdetail("%s: %s", msg_major, msg_minor)));
962+
errdetail_internal("%s: %s", msg_major, msg_minor)));
963963
}
964964

965965
static int
@@ -1202,11 +1202,11 @@ pg_SSPI_error(int severity, const char *errmsg, SECURITY_STATUS r)
12021202
sysmsg, sizeof(sysmsg), NULL) == 0)
12031203
ereport(severity,
12041204
(errmsg_internal("%s", errmsg),
1205-
errdetail("SSPI error %x", (unsigned int) r)));
1205+
errdetail_internal("SSPI error %x", (unsigned int) r)));
12061206
else
12071207
ereport(severity,
12081208
(errmsg_internal("%s", errmsg),
1209-
errdetail("%s (%x)", sysmsg, (unsigned int) r)));
1209+
errdetail_internal("%s (%x)", sysmsg, (unsigned int) r)));
12101210
}
12111211

12121212
static int

‎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
@@ -1363,14 +1363,14 @@ xml_ereport(int level, int sqlcode, const char *msg)
13631363

13641364
ereport(level,
13651365
(errcode(sqlcode),
1366-
errmsg("%s", msg),
1367-
errdetail("%s", detail)));
1366+
errmsg_internal("%s", msg),
1367+
errdetail_internal("%s", detail)));
13681368
}
13691369
else
13701370
{
13711371
ereport(level,
13721372
(errcode(sqlcode),
1373-
errmsg("%s", msg)));
1373+
errmsg_internal("%s", msg)));
13741374
}
13751375
}
13761376

@@ -1441,7 +1441,7 @@ xml_ereport_by_code(int level, int sqlcode,
14411441

14421442
ereport(level,
14431443
(errcode(sqlcode),
1444-
errmsg("%s", msg),
1444+
errmsg_internal("%s", msg),
14451445
errdetail(det, code)));
14461446
}
14471447

‎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
@@ -7985,11 +7985,11 @@ call_bool_check_hook(struct config_bool * conf, bool *newval, void **extra,
79857985
ereport(elevel,
79867986
(errcode(GUC_check_errcode_value),
79877987
GUC_check_errmsg_string ?
7988-
errmsg("%s", GUC_check_errmsg_string) :
7988+
errmsg_internal("%s", GUC_check_errmsg_string) :
79897989
errmsg("invalid value for parameter \"%s\": %d",
79907990
conf->gen.name, (int) *newval),
79917991
GUC_check_errdetail_string ?
7992-
errdetail("%s", GUC_check_errdetail_string) : 0,
7992+
errdetail_internal("%s", GUC_check_errdetail_string) : 0,
79937993
GUC_check_errhint_string ?
79947994
errhint("%s", GUC_check_errhint_string) : 0));
79957995
/* Flush any strings created in ErrorContext */
@@ -8019,11 +8019,11 @@ call_int_check_hook(struct config_int * conf, int *newval, void **extra,
80198019
ereport(elevel,
80208020
(errcode(GUC_check_errcode_value),
80218021
GUC_check_errmsg_string ?
8022-
errmsg("%s", GUC_check_errmsg_string) :
8022+
errmsg_internal("%s", GUC_check_errmsg_string) :
80238023
errmsg("invalid value for parameter \"%s\": %d",
80248024
conf->gen.name, *newval),
80258025
GUC_check_errdetail_string ?
8026-
errdetail("%s", GUC_check_errdetail_string) : 0,
8026+
errdetail_internal("%s", GUC_check_errdetail_string) : 0,
80278027
GUC_check_errhint_string ?
80288028
errhint("%s", GUC_check_errhint_string) : 0));
80298029
/* Flush any strings created in ErrorContext */
@@ -8053,11 +8053,11 @@ call_real_check_hook(struct config_real * conf, double *newval, void **extra,
80538053
ereport(elevel,
80548054
(errcode(GUC_check_errcode_value),
80558055
GUC_check_errmsg_string ?
8056-
errmsg("%s", GUC_check_errmsg_string) :
8056+
errmsg_internal("%s", GUC_check_errmsg_string) :
80578057
errmsg("invalid value for parameter \"%s\": %g",
80588058
conf->gen.name, *newval),
80598059
GUC_check_errdetail_string ?
8060-
errdetail("%s", GUC_check_errdetail_string) : 0,
8060+
errdetail_internal("%s", GUC_check_errdetail_string) : 0,
80618061
GUC_check_errhint_string ?
80628062
errhint("%s", GUC_check_errhint_string) : 0));
80638063
/* Flush any strings created in ErrorContext */
@@ -8087,11 +8087,11 @@ call_string_check_hook(struct config_string * conf, char **newval, void **extra,
80878087
ereport(elevel,
80888088
(errcode(GUC_check_errcode_value),
80898089
GUC_check_errmsg_string ?
8090-
errmsg("%s", GUC_check_errmsg_string) :
8090+
errmsg_internal("%s", GUC_check_errmsg_string) :
80918091
errmsg("invalid value for parameter \"%s\": \"%s\"",
80928092
conf->gen.name, *newval ? *newval : ""),
80938093
GUC_check_errdetail_string ?
8094-
errdetail("%s", GUC_check_errdetail_string) : 0,
8094+
errdetail_internal("%s", GUC_check_errdetail_string) : 0,
80958095
GUC_check_errhint_string ?
80968096
errhint("%s", GUC_check_errhint_string) : 0));
80978097
/* Flush any strings created in ErrorContext */
@@ -8121,12 +8121,12 @@ call_enum_check_hook(struct config_enum * conf, int *newval, void **extra,
81218121
ereport(elevel,
81228122
(errcode(GUC_check_errcode_value),
81238123
GUC_check_errmsg_string ?
8124-
errmsg("%s", GUC_check_errmsg_string) :
8124+
errmsg_internal("%s", GUC_check_errmsg_string) :
81258125
errmsg("invalid value for parameter \"%s\": \"%s\"",
81268126
conf->gen.name,
81278127
config_enum_lookup_by_value(conf, *newval)),
81288128
GUC_check_errdetail_string ?
8129-
errdetail("%s", GUC_check_errdetail_string) : 0,
8129+
errdetail_internal("%s", GUC_check_errdetail_string) : 0,
81308130
GUC_check_errhint_string ?
81318131
errhint("%s", GUC_check_errhint_string) : 0));
81328132
/* Flush any strings created in ErrorContext */

0 commit comments

Comments
 (0)