Skip to content

Commit 6a77e93

Browse files
robertmhaasrobertmhaas
committed
Rename max_predicate_locks_per_transaction.
The new name, max_pred_locks_per_transaction, is shorter. Kevin Grittner, per discussion.
1 parent 2fd7706 commit 6a77e93

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

‎doc/src/sgml/config.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5188,15 +5188,15 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
51885188
</listitem>
51895189
</varlistentry>
51905190

5191-
<varlistentry id="guc-max-predicate-locks-per-transaction" xreflabel="max_predicate_locks_per_transaction">
5192-
<term><varname>max_predicate_locks_per_transaction</varname> (<type>integer</type>)</term>
5191+
<varlistentry id="guc-max-pred-locks-per-transaction" xreflabel="max_pred_locks_per_transaction">
5192+
<term><varname>max_pred_locks_per_transaction</varname> (<type>integer</type>)</term>
51935193
<indexterm>
5194-
<primary><varname>max_predicate_locks_per_transaction</> configuration parameter</primary>
5194+
<primary><varname>max_pred_locks_per_transaction</> configuration parameter</primary>
51955195
</indexterm>
51965196
<listitem>
51975197
<para>
51985198
The shared predicate lock table tracks locks on
5199-
<varname>max_predicate_locks_per_transaction</varname> * (<xref
5199+
<varname>max_pred_locks_per_transaction</varname> * (<xref
52005200
linkend="guc-max-connections"> + <xref
52015201
linkend="guc-max-prepared-transactions">) objects (e.g., tables);
52025202
hence, no more than this many distinct objects can be locked at

‎src/backend/storage/lmgr/predicate.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1874,7 +1874,7 @@ DeleteChildTargetLocks(const PREDICATELOCKTARGETTAG *newtargettag)
18741874
* thresholds are, either making it proportional to the number of
18751875
* tuples in a page & pages in a relation, or at least making it a
18761876
* GUC. Currently the threshold is 3 for a page lock, and
1877-
* max_predicate_locks_per_transaction/2 for a relation lock, chosen
1877+
* max_pred_locks_per_transaction/2 for a relation lock, chosen
18781878
* entirely arbitrarily (and without benchmarking).
18791879
*/
18801880
static int
@@ -2063,7 +2063,7 @@ CreatePredicateLock(const PREDICATELOCKTARGETTAG *targettag,
20632063
ereport(ERROR,
20642064
(errcode(ERRCODE_OUT_OF_MEMORY),
20652065
errmsg("out of shared memory"),
2066-
errhint("You might need to increase max_predicate_locks_per_transaction.")));
2066+
errhint("You might need to increase max_pred_locks_per_transaction.")));
20672067
if (!found)
20682068
{
20692069
SHMQueueInit(&(target->predicateLocks));
@@ -2082,7 +2082,7 @@ CreatePredicateLock(const PREDICATELOCKTARGETTAG *targettag,
20822082
ereport(ERROR,
20832083
(errcode(ERRCODE_OUT_OF_MEMORY),
20842084
errmsg("out of shared memory"),
2085-
errhint("You might need to increase max_predicate_locks_per_transaction.")));
2085+
errhint("You might need to increase max_pred_locks_per_transaction.")));
20862086

20872087
if (!found)
20882088
{
@@ -2341,7 +2341,7 @@ PredicateLockTupleRowVersionLink(const Relation relation,
23412341
ereport(ERROR,
23422342
(errcode(ERRCODE_OUT_OF_MEMORY),
23432343
errmsg("out of shared memory"),
2344-
errhint("You might need to increase max_predicate_locks_per_transaction.")));
2344+
errhint("You might need to increase max_pred_locks_per_transaction.")));
23452345
if (!found)
23462346
{
23472347
SHMQueueInit(&(newtarget->predicateLocks));
@@ -3337,7 +3337,7 @@ ReleaseOneSerializableXact(SERIALIZABLEXACT *sxact, bool partial,
33373337
ereport(ERROR,
33383338
(errcode(ERRCODE_OUT_OF_MEMORY),
33393339
errmsg("out of shared memory"),
3340-
errhint("You might need to increase max_predicate_locks_per_transaction.")));
3340+
errhint("You might need to increase max_pred_locks_per_transaction.")));
33413341
if (found)
33423342
{
33433343
if (predlock->commitSeqNo < sxact->commitSeqNo)

‎src/backend/utils/misc/guc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1725,10 +1725,10 @@ static struct config_int ConfigureNamesInt[] =
17251725
},
17261726

17271727
{
1728-
{"max_predicate_locks_per_transaction", PGC_POSTMASTER, LOCK_MANAGEMENT,
1728+
{"max_pred_locks_per_transaction", PGC_POSTMASTER, LOCK_MANAGEMENT,
17291729
gettext_noop("Sets the maximum number of predicate locks per transaction."),
17301730
gettext_noop("The shared predicate lock table is sized on the assumption that "
1731-
"at most max_predicate_locks_per_transaction * max_connections distinct "
1731+
"at most max_pred_locks_per_transaction * max_connections distinct "
17321732
"objects will need to be locked at any one time.")
17331733
},
17341734
&max_predicate_locks_per_xact,

‎src/backend/utils/misc/postgresql.conf.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@
503503
# Note: Each lock table slot uses ~270 bytes of shared memory, and there are
504504
# max_locks_per_transaction * (max_connections + max_prepared_transactions)
505505
# lock table slots.
506-
#max_predicate_locks_per_transaction = 64 # min 10
506+
#max_pred_locks_per_transaction = 64 # min 10
507507
# (change requires restart)
508508

509509
#------------------------------------------------------------------------------

0 commit comments

Comments
 (0)