Error message refactoring

Take some untranslatable things out of the message and replace by
format placeholders, to reduce translatable strings and reduce
translation mistakes.

diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c
index 87b5593d2db166c861a5bfd886a05d863e113346..8395ae7b23ce3df2181cbcf8ecb4033a9979aa43 100644 (file)
--- a/src/backend/replication/logical/launcher.c
+++ b/src/backend/replication/logical/launcher.c
@@ -422,7 +422,7 @@ retry:
                ereport(WARNING,
                                (errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
                                 errmsg("out of logical replication worker slots"),
-                                errhint("You might need to increase max_logical_replication_workers.")));
+                                errhint("You might need to increase %s.", "max_logical_replication_workers")));
                return false;
        }
 
@@ -496,7 +496,7 @@ retry:
                ereport(WARNING,
                                (errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
                                 errmsg("out of background worker slots"),
-                                errhint("You might need to increase max_worker_processes.")));
+                                errhint("You might need to increase %s.", "max_worker_processes")));
                return false;
        }
 

diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c
index 8021aaa0a8c1df9fd8094dae22b2423a9e6f9d67..1dc27264f61ee97220dcdd830a6bca00394340a2 100644 (file)
--- a/src/backend/replication/slot.c
+++ b/src/backend/replication/slot.c
@@ -1287,7 +1287,7 @@ ReportSlotInvalidation(ReplicationSlotInvalidationCause cause,
                        errmsg("invalidating obsolete replication slot \"%s\"",
                                   NameStr(slotname)),
                        errdetail_internal("%s", err_detail.data),
-                       hint ? errhint("You might need to increase max_slot_wal_keep_size.") : 0);
+                       hint ? errhint("You might need to increase %s.", "max_slot_wal_keep_size") : 0);
 
        pfree(err_detail.data);
 }

diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 193f50fc0f41f1b56909a556571babed3a6bc322..0a692ee0a6d91eb8a283222cea0075fd48ad20f6 100644 (file)
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -980,7 +980,7 @@ LockAcquireExtended(const LOCKTAG *locktag,
                                ereport(ERROR,
                                                (errcode(ERRCODE_OUT_OF_MEMORY),
                                                 errmsg("out of shared memory"),
-                                                errhint("You might need to increase max_locks_per_transaction.")));
+                                                errhint("You might need to increase %s.", "max_locks_per_transaction")));
                        else
                                return LOCKACQUIRE_NOT_AVAIL;
                }
@@ -1018,7 +1018,7 @@ LockAcquireExtended(const LOCKTAG *locktag,
                        ereport(ERROR,
                                        (errcode(ERRCODE_OUT_OF_MEMORY),
                                         errmsg("out of shared memory"),
-                                        errhint("You might need to increase max_locks_per_transaction.")));
+                                        errhint("You might need to increase %s.", "max_locks_per_transaction")));
                else
                        return LOCKACQUIRE_NOT_AVAIL;
        }
@@ -2808,7 +2808,7 @@ FastPathGetRelationLockEntry(LOCALLOCK *locallock)
                        ereport(ERROR,
                                        (errcode(ERRCODE_OUT_OF_MEMORY),
                                         errmsg("out of shared memory"),
-                                        errhint("You might need to increase max_locks_per_transaction.")));
+                                        errhint("You might need to increase %s.", "max_locks_per_transaction")));
                }
                GrantLock(proclock->tag.myLock, proclock, lockmode);
                FAST_PATH_CLEAR_LOCKMODE(MyProc, f, lockmode);
@@ -4193,7 +4193,7 @@ lock_twophase_recover(TransactionId xid, uint16 info,
                ereport(ERROR,
                                (errcode(ERRCODE_OUT_OF_MEMORY),
                                 errmsg("out of shared memory"),
-                                errhint("You might need to increase max_locks_per_transaction.")));
+                                errhint("You might need to increase %s.", "max_locks_per_transaction")));
        }
 
        /*
@@ -4258,7 +4258,7 @@ lock_twophase_recover(TransactionId xid, uint16 info,
                ereport(ERROR,
                                (errcode(ERRCODE_OUT_OF_MEMORY),
                                 errmsg("out of shared memory"),
-                                errhint("You might need to increase max_locks_per_transaction.")));
+                                errhint("You might need to increase %s.", "max_locks_per_transaction")));
        }
 
        /*
@@ -4608,7 +4608,7 @@ VirtualXactLock(VirtualTransactionId vxid, bool wait)
                        ereport(ERROR,
                                        (errcode(ERRCODE_OUT_OF_MEMORY),
                                         errmsg("out of shared memory"),
-                                        errhint("You might need to increase max_locks_per_transaction.")));
+                                        errhint("You might need to increase %s.", "max_locks_per_transaction")));
                }
                GrantLock(proclock->tag.myLock, proclock, ExclusiveLock);
 

diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c
index 533f6165412ae0c975d2841c57951fa88e27bf13..1af41213b41be783ed5461c089756813d87c3062 100644 (file)
--- a/src/backend/storage/lmgr/predicate.c
+++ b/src/backend/storage/lmgr/predicate.c
@@ -2410,7 +2410,7 @@ CreatePredicateLock(const PREDICATELOCKTARGETTAG *targettag,
                ereport(ERROR,
                                (errcode(ERRCODE_OUT_OF_MEMORY),
                                 errmsg("out of shared memory"),
-                                errhint("You might need to increase max_pred_locks_per_transaction.")));
+                                errhint("You might need to increase %s.", "max_pred_locks_per_transaction")));
        if (!found)
                dlist_init(&target->predicateLocks);
 
@@ -2425,7 +2425,7 @@ CreatePredicateLock(const PREDICATELOCKTARGETTAG *targettag,
                ereport(ERROR,
                                (errcode(ERRCODE_OUT_OF_MEMORY),
                                 errmsg("out of shared memory"),
-                                errhint("You might need to increase max_pred_locks_per_transaction.")));
+                                errhint("You might need to increase %s.", "max_pred_locks_per_transaction")));
 
        if (!found)
        {
@@ -3822,7 +3822,7 @@ ReleaseOneSerializableXact(SERIALIZABLEXACT *sxact, bool partial,
                                ereport(ERROR,
                                                (errcode(ERRCODE_OUT_OF_MEMORY),
                                                 errmsg("out of shared memory"),
-                                                errhint("You might need to increase max_pred_locks_per_transaction.")));
+                                                errhint("You might need to increase %s.", "max_pred_locks_per_transaction")));
                        if (found)
                        {
                                Assert(predlock->commitSeqNo != 0);