Skip to content

Commit 5e7fc46

Browse files
committed
Remove very-obsolete estimates of shmem usage from postgresql.conf.sample.
runtime.sgml used to contain a table of estimated shared memory consumption rates for max_connections and some other GUCs. Commit 390bfc6 removed that on the well-founded grounds that (a) we weren't maintaining the entries well and (b) it no longer mattered so much once we got out from under SysV shmem limits. But it missed that there were even-more-obsolete versions of some of those numbers in comments in postgresql.conf.sample. Remove those too. Back-patch to 9.3 where the aforesaid commit went in.
1 parent f102bd8 commit 5e7fc46

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@
6262
# (change requires restart)
6363
#port = 5432 # (change requires restart)
6464
#max_connections = 100 # (change requires restart)
65-
# Note: Increasing max_connections costs ~400 bytes of shared memory per
66-
# connection slot, plus lock space (see max_locks_per_transaction).
6765
#superuser_reserved_connections = 3 # (change requires restart)
6866
#unix_socket_directories = '/tmp' # comma-separated list of directories
6967
# (change requires restart)
@@ -116,10 +114,8 @@
116114
#temp_buffers = 8MB # min 800kB
117115
#max_prepared_transactions = 0 # zero disables the feature
118116
# (change requires restart)
119-
# Note: Increasing max_prepared_transactions costs ~600 bytes of shared memory
120-
# per transaction slot, plus lock space (see max_locks_per_transaction).
121-
# It is not advisable to set max_prepared_transactions nonzero unless you
122-
# actively intend to use prepared transactions.
117+
# Caution: it is not advisable to set max_prepared_transactions nonzero unless
118+
# you actively intend to use prepared transactions.
123119
#work_mem = 1MB # min 64kB
124120
#maintenance_work_mem = 16MB # min 1MB
125121
#max_stack_depth = 2MB # min 100kB
@@ -541,9 +537,6 @@
541537
#deadlock_timeout = 1s
542538
#max_locks_per_transaction = 64 # min 10
543539
# (change requires restart)
544-
# Note: Each lock table slot uses ~270 bytes of shared memory, and there are
545-
# max_locks_per_transaction * (max_connections + max_prepared_transactions)
546-
# lock table slots.
547540
#max_pred_locks_per_transaction = 64 # min 10
548541
# (change requires restart)
549542

0 commit comments

Comments
 (0)