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 76617e3f367b279f6d8e4d80017abc74fe913768..3963329655a44b067bead0cba03387246977c4fd 100644 (file)
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -188,7 +188,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()); \
@@ -264,7 +264,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 */
@@ -2262,8 +2262,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 9f49913f8d5a74a9eb630cc362c47eac9071c24f..4c31f19af958cd1cf35eef236092a86da07692f4 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -902,7 +902,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);
@@ -918,7 +918,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
    {
@@ -930,7 +930,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 936cfea10937f1bd5383c2e73a8ea827edc24ee0..591a00885de882de1aa12f6ac085a1ae93909ee1 100644 (file)
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -955,7 +955,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
@@ -1198,11 +1198,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 de1eb2af3698824c74b996568da9143fc5b16b21..945bc2901faf6969421ed1e01692180e988f4c9e 100644 (file)
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -1364,14 +1364,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)));
    }
 }
 
@@ -1442,7 +1442,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 5841631e8c3781fb6434c58f489ef610151d42c7..72e93107910a04384a76bf2c08cda77467facf3d 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -7975,11 +7975,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 */
@@ -8009,11 +8009,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 */
@@ -8043,11 +8043,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 */
@@ -8077,11 +8077,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 */
@@ -8111,12 +8111,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 7f948d5f80866e512c27c4b726d4d753a283e259..b7ffb717f9a412d02625b17e4fc8bf0b33077f6c 100644 (file)
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -2792,7 +2792,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 0227f1a18299bc84b4dac6d1d5bb1aad81b00f17..e03d7cead0ab11dadba9c0b496c48b114153b1a8 100644 (file)
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -4435,8 +4435,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,