Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 80df9c4

Browse files
committed
Add unit documentation for various postgresql.conf settings.
1 parent 5ae9f82 commit 80df9c4

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

src/backend/utils/misc/guc.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.499 2009/04/02 19:57:19 momjian Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.500 2009/04/06 21:00:52 momjian Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -1530,7 +1530,7 @@ static struct config_int ConfigureNamesInt[] =
15301530

15311531
{
15321532
{"statement_timeout", PGC_USERSET, CLIENT_CONN_STATEMENT,
1533-
gettext_noop("Sets the maximum allowed duration of any statement."),
1533+
gettext_noop("Sets the maximum duration of any statement, in milliseconds."),
15341534
gettext_noop("A value of 0 turns off the timeout."),
15351535
GUC_UNIT_MS
15361536
},
@@ -1684,7 +1684,7 @@ static struct config_int ConfigureNamesInt[] =
16841684

16851685
{
16861686
{"log_autovacuum_min_duration", PGC_SIGHUP, LOGGING_WHAT,
1687-
gettext_noop("Sets the minimum execution time above which "
1687+
gettext_noop("Sets the minimum execution milliseconds above which "
16881688
"autovacuum actions will be logged."),
16891689
gettext_noop("Zero prints all actions. -1 turns autovacuum logging off."),
16901690
GUC_UNIT_MS
@@ -1871,7 +1871,7 @@ static struct config_int ConfigureNamesInt[] =
18711871

18721872
{
18731873
{"tcp_keepalives_idle", PGC_USERSET, CLIENT_CONN_OTHER,
1874-
gettext_noop("Time between issuing TCP keepalives."),
1874+
gettext_noop("Seconds between issuing TCP keepalives."),
18751875
gettext_noop("A value of 0 uses the system default."),
18761876
GUC_UNIT_S
18771877
},
@@ -1881,7 +1881,7 @@ static struct config_int ConfigureNamesInt[] =
18811881

18821882
{
18831883
{"tcp_keepalives_interval", PGC_USERSET, CLIENT_CONN_OTHER,
1884-
gettext_noop("Time between TCP keepalive retransmits."),
1884+
gettext_noop("Seconds between TCP keepalive retransmits."),
18851885
gettext_noop("A value of 0 uses the system default."),
18861886
GUC_UNIT_S
18871887
},

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

+12-10
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122

123123
# - Cost-Based Vacuum Delay -
124124

125-
#vacuum_cost_delay = 0 # 0-100 milliseconds
125+
#vacuum_cost_delay = 0ms # 0-100 milliseconds
126126
#vacuum_cost_page_hit = 1 # 0-10000 credits
127127
#vacuum_cost_page_miss = 10 # 0-10000 credits
128128
#vacuum_cost_page_dirty = 20 # 0-10000 credits
@@ -175,7 +175,7 @@
175175
# (change requires restart)
176176
#archive_command = '' # command to use to archive a logfile segment
177177
#archive_timeout = 0 # force a logfile segment switch after this
178-
# time; 0 is off
178+
# number of seconds; 0 is off
179179

180180

181181
#------------------------------------------------------------------------------
@@ -306,9 +306,10 @@
306306
# fatal
307307
# panic (effectively off)
308308

309-
#log_min_duration_statement = -1ms # -1 is disabled, 0 logs all statements
309+
#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements
310310
# and their durations, > 0 logs only
311-
# statements running at least this time.
311+
# statements running at least this number
312+
# of milliseconds
312313

313314
#silent_mode = off # DO NOT USE without syslog or
314315
# logging_collector
@@ -346,7 +347,7 @@
346347
#log_lock_waits = off # log lock waits >= deadlock_timeout
347348
#log_statement = 'none' # none, ddl, mod, all
348349
#log_temp_files = -1 # log temporary files equal or larger
349-
# than specified size;
350+
# than the specified size in kilobytes;
350351
# -1 disables, 0 logs all temp files
351352
#log_timezone = unknown # actually, defaults to TZ environment
352353
# setting
@@ -382,7 +383,8 @@
382383
# requires track_counts to also be on.
383384
#log_autovacuum_min_duration = -1 # -1 disables, 0 logs all actions and
384385
# their durations, > 0 logs only
385-
# actions running at least that time.
386+
# actions running at least this number
387+
# of milliseconds.
386388
#autovacuum_max_workers = 3 # max number of autovacuum subprocesses
387389
#autovacuum_naptime = 1min # time between autovacuum runs
388390
#autovacuum_vacuum_threshold = 50 # min number of row updates before
@@ -393,9 +395,9 @@
393395
#autovacuum_analyze_scale_factor = 0.1 # fraction of table size before analyze
394396
#autovacuum_freeze_max_age = 200000000 # maximum XID age before forced vacuum
395397
# (change requires restart)
396-
#autovacuum_vacuum_cost_delay = 20 # default vacuum cost delay for
397-
# autovacuum, -1 means use
398-
# vacuum_cost_delay
398+
#autovacuum_vacuum_cost_delay = 20ms # default vacuum cost delay for
399+
# autovacuum, in milliseconds;
400+
# -1 means use vacuum_cost_delay
399401
#autovacuum_vacuum_cost_limit = -1 # default vacuum cost limit for
400402
# autovacuum, -1 means use
401403
# vacuum_cost_limit
@@ -415,7 +417,7 @@
415417
#default_transaction_isolation = 'read committed'
416418
#default_transaction_read_only = off
417419
#session_replication_role = 'origin'
418-
#statement_timeout = 0 # 0 is disabled
420+
#statement_timeout = 0 # in milliseconds, 0 is disabled
419421
#vacuum_freeze_min_age = 50000000
420422
#vacuum_freeze_table_age = 150000000
421423
#xmlbinary = 'base64'

0 commit comments

Comments
 (0)