From 6a77e9385eb46829ce80971bc655df9f3ef00d9a Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Tue, 15 Feb 2011 08:00:04 -0500 Subject: [PATCH] Rename max_predicate_locks_per_transaction. The new name, max_pred_locks_per_transaction, is shorter. Kevin Grittner, per discussion. --- doc/src/sgml/config.sgml | 8 ++++---- src/backend/storage/lmgr/predicate.c | 10 +++++----- src/backend/utils/misc/guc.c | 4 ++-- src/backend/utils/misc/postgresql.conf.sample | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index 63c6283f91..b6f8621278 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -5188,15 +5188,15 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir' - - max_predicate_locks_per_transaction (integer) + + max_pred_locks_per_transaction (integer) - max_predicate_locks_per_transaction configuration parameter + max_pred_locks_per_transaction configuration parameter The shared predicate lock table tracks locks on - max_predicate_locks_per_transaction * (max_pred_locks_per_transaction * ( + ) objects (e.g., tables); hence, no more than this many distinct objects can be locked at diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c index 0fdceb255d..e2d79e20b4 100644 --- a/src/backend/storage/lmgr/predicate.c +++ b/src/backend/storage/lmgr/predicate.c @@ -1874,7 +1874,7 @@ DeleteChildTargetLocks(const PREDICATELOCKTARGETTAG *newtargettag) * thresholds are, either making it proportional to the number of * tuples in a page & pages in a relation, or at least making it a * GUC. Currently the threshold is 3 for a page lock, and - * max_predicate_locks_per_transaction/2 for a relation lock, chosen + * max_pred_locks_per_transaction/2 for a relation lock, chosen * entirely arbitrarily (and without benchmarking). */ static int @@ -2063,7 +2063,7 @@ CreatePredicateLock(const PREDICATELOCKTARGETTAG *targettag, ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), - errhint("You might need to increase max_predicate_locks_per_transaction."))); + errhint("You might need to increase max_pred_locks_per_transaction."))); if (!found) { SHMQueueInit(&(target->predicateLocks)); @@ -2082,7 +2082,7 @@ CreatePredicateLock(const PREDICATELOCKTARGETTAG *targettag, ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), - errhint("You might need to increase max_predicate_locks_per_transaction."))); + errhint("You might need to increase max_pred_locks_per_transaction."))); if (!found) { @@ -2341,7 +2341,7 @@ PredicateLockTupleRowVersionLink(const Relation relation, ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), - errhint("You might need to increase max_predicate_locks_per_transaction."))); + errhint("You might need to increase max_pred_locks_per_transaction."))); if (!found) { SHMQueueInit(&(newtarget->predicateLocks)); @@ -3337,7 +3337,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_predicate_locks_per_transaction."))); + errhint("You might need to increase max_pred_locks_per_transaction."))); if (found) { if (predlock->commitSeqNo < sxact->commitSeqNo) diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 470183d4ab..56885576b9 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -1725,10 +1725,10 @@ static struct config_int ConfigureNamesInt[] = }, { - {"max_predicate_locks_per_transaction", PGC_POSTMASTER, LOCK_MANAGEMENT, + {"max_pred_locks_per_transaction", PGC_POSTMASTER, LOCK_MANAGEMENT, gettext_noop("Sets the maximum number of predicate locks per transaction."), gettext_noop("The shared predicate lock table is sized on the assumption that " - "at most max_predicate_locks_per_transaction * max_connections distinct " + "at most max_pred_locks_per_transaction * max_connections distinct " "objects will need to be locked at any one time.") }, &max_predicate_locks_per_xact, diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 5d31365dab..3b00a03262 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -503,7 +503,7 @@ # Note: Each lock table slot uses ~270 bytes of shared memory, and there are # max_locks_per_transaction * (max_connections + max_prepared_transactions) # lock table slots. -#max_predicate_locks_per_transaction = 64 # min 10 +#max_pred_locks_per_transaction = 64 # min 10 # (change requires restart) #------------------------------------------------------------------------------