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.

diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index b8d0342085d6fc539a4f09f5de1f373bfd4aca47..0812a3b2b561fec011f4559b648c8e779cf89582 100644 (file)
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -187,7 +187,7 @@ typedef struct remoteConnHashEnt
                    ereport(ERROR, \
                            (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), \
                             errmsg("could not establish connection"), \
-                            errdetail("%s", msg))); \
+                            errdetail_internal("%s", msg))); \
                } \
                dblink_security_check(conn, rconn); \
                PQsetClientEncoding(conn, GetDatabaseEncodingName()); \
@@ -263,7 +263,7 @@ dblink_connect(PG_FUNCTION_ARGS)
        ereport(ERROR,
                (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION),
                 errmsg("could not establish connection"),
-                errdetail("%s", msg)));
+                errdetail_internal("%s", msg)));
    }
 
    /* check password actually used if not superuser */
@@ -2261,8 +2261,9 @@ dblink_res_error(const char *conname, PGresult *res, const char *dblink_context_
 
    ereport(level,
            (errcode(sqlstate),
-   message_primary ? errmsg("%s", message_primary) : errmsg("unknown error"),
-            message_detail ? errdetail("%s", message_detail) : 0,
+            message_primary ? errmsg_internal("%s", message_primary) :
+            errmsg("unknown error"),
+            message_detail ? errdetail_internal("%s", message_detail) : 0,
             message_hint ? errhint("%s", message_hint) : 0,
             message_context ? errcontext("%s", message_context) : 0,
          errcontext("Error occurred on dblink connection named \"%s\": %s.",

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 27dcd1707a85ec5c10eee2fb25765a8e33cb1ff9..0b3f93faca7b58543d81674328a2e821a0923bb9 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -891,7 +891,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
        ereport(NOTICE,
        (errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
                constr_name, buf.data),
-        errdetail("%s", _(funcdescr[funcnum]))));
+        errdetail_internal("%s", _(funcdescr[funcnum]))));
        oldContext = MemoryContextSwitchTo(TopMemoryContext);
        info = (OldTriggerInfo *) palloc0(sizeof(OldTriggerInfo));
        info->args = copyObject(stmt->args);
@@ -907,7 +907,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
        ereport(NOTICE,
        (errmsg("ignoring incomplete trigger group for constraint \"%s\" %s",
                constr_name, buf.data),
-        errdetail("%s", _(funcdescr[funcnum]))));
+        errdetail_internal("%s", _(funcdescr[funcnum]))));
    }
    else
    {
@@ -919,7 +919,7 @@ ConvertTriggerToFK(CreateTrigStmt *stmt, Oid funcoid)
        ereport(NOTICE,
                (errmsg("converting trigger group into constraint \"%s\" %s",
                        constr_name, buf.data),
-                errdetail("%s", _(funcdescr[funcnum]))));
+                errdetail_internal("%s", _(funcdescr[funcnum]))));
        fkcon->contype = CONSTR_FOREIGN;
        fkcon->location = -1;
        if (funcnum == 2)

diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 838d6eba2056509fdfa84670e4b360469c658fa3..871bda7cc59a8e14d2cb721bf001121c7d51f965 100644 (file)
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -953,7 +953,7 @@ DropRole(DropRoleStmt *stmt)
                    (errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
                     errmsg("role \"%s\" cannot be dropped because some objects depend on it",
                            role),
-                    errdetail("%s", detail),
+                    errdetail_internal("%s", detail),
                     errdetail_log("%s", detail_log)));
 
        /*

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 875d0a39a18fe0c43bd7aae4eec40fedf80c7b16..76dffc1906aefd6b52234989e3164698c30c0183 100644 (file)
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -959,7 +959,7 @@ pg_GSS_error(int severity, char *errmsg, OM_uint32 maj_stat, OM_uint32 min_stat)
     */
    ereport(severity,
            (errmsg_internal("%s", errmsg),
-            errdetail("%s: %s", msg_major, msg_minor)));
+            errdetail_internal("%s: %s", msg_major, msg_minor)));
 }
 
 static int
@@ -1202,11 +1202,11 @@ pg_SSPI_error(int severity, const char *errmsg, SECURITY_STATUS r)
                      sysmsg, sizeof(sysmsg), NULL) == 0)
        ereport(severity,
                (errmsg_internal("%s", errmsg),
-                errdetail("SSPI error %x", (unsigned int) r)));
+                errdetail_internal("SSPI error %x", (unsigned int) r)));
    else
        ereport(severity,
                (errmsg_internal("%s", errmsg),
-                errdetail("%s (%x)", sysmsg, (unsigned int) r)));
+                errdetail_internal("%s (%x)", sysmsg, (unsigned int) r)));
 }
 
 static int

diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index cd119dbabb8c78a72af30a0902397680328c26db..e22824a7dcd4cebd7bd5d9ce44fff5c4ef039d59 100644 (file)
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -82,7 +82,7 @@ elog_node_display(int lev, const char *title, void *obj, bool pretty)
    pfree(s);
    ereport(lev,
            (errmsg_internal("%s:", title),
-            errdetail("%s", f)));
+            errdetail_internal("%s", f)));
    pfree(f);
 }
 

diff --git a/src/backend/storage/lmgr/deadlock.c b/src/backend/storage/lmgr/deadlock.c
index 837f0296c6118205e4e07627af96b4e1fe9dc4a5..7e7f6af21b7e7a3df7719fc3b0cd142d5d1cdff8 100644 (file)
--- a/src/backend/storage/lmgr/deadlock.c
+++ b/src/backend/storage/lmgr/deadlock.c
@@ -939,7 +939,7 @@ DeadLockReport(void)
    ereport(ERROR,
            (errcode(ERRCODE_T_R_DEADLOCK_DETECTED),
             errmsg("deadlock detected"),
-            errdetail("%s", clientbuf.data),
+            errdetail_internal("%s", clientbuf.data),
             errdetail_log("%s", logbuf.data),
             errhint("See server log for query details.")));
 }

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 80d07f8f2daeb1d911df163830918942efdcb74a..f035a48e9b4aa5e32c1b50926b68be0acc5bbf16 100644 (file)
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -4294,7 +4294,7 @@ ShowUsage(const char *title)
 
    ereport(LOG,
            (errmsg_internal("%s", title),
-            errdetail("%s", str.data)));
+            errdetail_internal("%s", str.data)));
 
    pfree(str.data);
 }

diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index 702b9e3e9f489276e660f4677ceed37979365567..99fdec34483e50d708ed2511cb05828413b72cb1 100644 (file)
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -1363,14 +1363,14 @@ xml_ereport(int level, int sqlcode, const char *msg)
 
        ereport(level,
                (errcode(sqlcode),
-                errmsg("%s", msg),
-                errdetail("%s", detail)));
+                errmsg_internal("%s", msg),
+                errdetail_internal("%s", detail)));
    }
    else
    {
        ereport(level,
                (errcode(sqlcode),
-                errmsg("%s", msg)));
+                errmsg_internal("%s", msg)));
    }
 }
 
@@ -1441,7 +1441,7 @@ xml_ereport_by_code(int level, int sqlcode,
 
    ereport(level,
            (errcode(sqlcode),
-            errmsg("%s", msg),
+            errmsg_internal("%s", msg),
             errdetail(det, code)));
 }
 

diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 97a3bd51e5d8dfd9fe30b19be5b0ae2710bf0057..734bd0568918d03bca1574282cb924bd12748724 100644 (file)
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -378,7 +378,7 @@ incompatible_module_error(const char *libname,
    ereport(ERROR,
            (errmsg("incompatible library \"%s\": magic block mismatch",
                    libname),
-            errdetail("%s", details.data)));
+            errdetail_internal("%s", details.data)));
 }
 
 /*

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 1460214293d68e4bc100cc9bf097f418c92da630..6507ad62bf2cbae6b65e74f902e113704004078a 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -7985,11 +7985,11 @@ call_bool_check_hook(struct config_bool * conf, bool *newval, void **extra,
        ereport(elevel,
                (errcode(GUC_check_errcode_value),
                 GUC_check_errmsg_string ?
-                errmsg("%s", GUC_check_errmsg_string) :
+                errmsg_internal("%s", GUC_check_errmsg_string) :
                 errmsg("invalid value for parameter \"%s\": %d",
                        conf->gen.name, (int) *newval),
                 GUC_check_errdetail_string ?
-                errdetail("%s", GUC_check_errdetail_string) : 0,
+                errdetail_internal("%s", GUC_check_errdetail_string) : 0,
                 GUC_check_errhint_string ?
                 errhint("%s", GUC_check_errhint_string) : 0));
        /* Flush any strings created in ErrorContext */
@@ -8019,11 +8019,11 @@ call_int_check_hook(struct config_int * conf, int *newval, void **extra,
        ereport(elevel,
                (errcode(GUC_check_errcode_value),
                 GUC_check_errmsg_string ?
-                errmsg("%s", GUC_check_errmsg_string) :
+                errmsg_internal("%s", GUC_check_errmsg_string) :
                 errmsg("invalid value for parameter \"%s\": %d",
                        conf->gen.name, *newval),
                 GUC_check_errdetail_string ?
-                errdetail("%s", GUC_check_errdetail_string) : 0,
+                errdetail_internal("%s", GUC_check_errdetail_string) : 0,
                 GUC_check_errhint_string ?
                 errhint("%s", GUC_check_errhint_string) : 0));
        /* Flush any strings created in ErrorContext */
@@ -8053,11 +8053,11 @@ call_real_check_hook(struct config_real * conf, double *newval, void **extra,
        ereport(elevel,
                (errcode(GUC_check_errcode_value),
                 GUC_check_errmsg_string ?
-                errmsg("%s", GUC_check_errmsg_string) :
+                errmsg_internal("%s", GUC_check_errmsg_string) :
                 errmsg("invalid value for parameter \"%s\": %g",
                        conf->gen.name, *newval),
                 GUC_check_errdetail_string ?
-                errdetail("%s", GUC_check_errdetail_string) : 0,
+                errdetail_internal("%s", GUC_check_errdetail_string) : 0,
                 GUC_check_errhint_string ?
                 errhint("%s", GUC_check_errhint_string) : 0));
        /* Flush any strings created in ErrorContext */
@@ -8087,11 +8087,11 @@ call_string_check_hook(struct config_string * conf, char **newval, void **extra,
        ereport(elevel,
                (errcode(GUC_check_errcode_value),
                 GUC_check_errmsg_string ?
-                errmsg("%s", GUC_check_errmsg_string) :
+                errmsg_internal("%s", GUC_check_errmsg_string) :
                 errmsg("invalid value for parameter \"%s\": \"%s\"",
                        conf->gen.name, *newval ? *newval : ""),
                 GUC_check_errdetail_string ?
-                errdetail("%s", GUC_check_errdetail_string) : 0,
+                errdetail_internal("%s", GUC_check_errdetail_string) : 0,
                 GUC_check_errhint_string ?
                 errhint("%s", GUC_check_errhint_string) : 0));
        /* Flush any strings created in ErrorContext */
@@ -8121,12 +8121,12 @@ call_enum_check_hook(struct config_enum * conf, int *newval, void **extra,
        ereport(elevel,
                (errcode(GUC_check_errcode_value),
                 GUC_check_errmsg_string ?
-                errmsg("%s", GUC_check_errmsg_string) :
+                errmsg_internal("%s", GUC_check_errmsg_string) :
                 errmsg("invalid value for parameter \"%s\": \"%s\"",
                        conf->gen.name,
                        config_enum_lookup_by_value(conf, *newval)),
                 GUC_check_errdetail_string ?
-                errdetail("%s", GUC_check_errdetail_string) : 0,
+                errdetail_internal("%s", GUC_check_errdetail_string) : 0,
                 GUC_check_errhint_string ?
                 errhint("%s", GUC_check_errhint_string) : 0));
        /* Flush any strings created in ErrorContext */

diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index 906a485853f1232c181a2fdabb3a25b3dbe04c36..164c38d295230c9c6c1ce9340246a70e72659fea 100644 (file)
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -2791,7 +2791,7 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
    ereport(stmt->elog_level,
            (err_code ? errcode(err_code) : 0,
             errmsg_internal("%s", err_message),
-            (err_detail != NULL) ? errdetail("%s", err_detail) : 0,
+            (err_detail != NULL) ? errdetail_internal("%s", err_detail) : 0,
             (err_hint != NULL) ? errhint("%s", err_hint) : 0));
 
    estate->err_text = NULL;    /* un-suppress... */

diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index 9081cffb498bedfc411afecab374441c8a58bda6..17c1a544ecb0e6254ee770f9397c740a8a7b71ec 100644 (file)
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -4434,8 +4434,8 @@ PLy_elog(int elevel, const char *fmt,...)
    PG_TRY();
    {
        ereport(elevel,
-               (errmsg("%s", primary ? primary : "no exception data"),
-                (detail) ? errdetail("%s", detail) : 0,
+               (errmsg_internal("%s", primary ? primary : "no exception data"),
+                (detail) ? errdetail_internal("%s", detail) : 0,
                 (tb_depth > 0 && tbmsg) ? errcontext("%s", tbmsg) : 0,
                 (hint) ? errhint("%s", hint) : 0,
                 (query) ? internalerrquery(query) : 0,