🌐 AI搜索 & 代理 主页
Skip to content

Commit 44ab6cd

Browse files
bmomjianbmomjian
committed
Revert addition of units to GUC descriptions; doesn't affect
postgresql.conf.
1 parent 77b044f commit 44ab6cd

File tree

1 file changed

+14
-14
lines changed
  • src/backend/utils/misc

1 file changed

+14
-14
lines changed

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

Lines changed: 14 additions & 14 deletions
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.501 2009/04/07 22:22:19 momjian Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.502 2009/04/07 23:27:34 momjian Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -1316,7 +1316,7 @@ static struct config_int ConfigureNamesInt[] =
13161316
{
13171317
/* This is PGC_SIGHUP so all backends have the same value. */
13181318
{"deadlock_timeout", PGC_SIGHUP, LOCK_MANAGEMENT,
1319-
gettext_noop("Sets the time to wait on a lock before checking for deadlock, in milliseconds."),
1319+
gettext_noop("Sets the time to wait on a lock before checking for deadlock."),
13201320
NULL,
13211321
GUC_UNIT_MS
13221322
},
@@ -1406,7 +1406,7 @@ static struct config_int ConfigureNamesInt[] =
14061406

14071407
{
14081408
{"maintenance_work_mem", PGC_USERSET, RESOURCES_MEM,
1409-
gettext_noop("Sets the maximum memory to be used for maintenance operations, in kilobytes."),
1409+
gettext_noop("Sets the maximum memory to be used for maintenance operations."),
14101410
gettext_noop("This includes operations such as VACUUM and CREATE INDEX."),
14111411
GUC_UNIT_KB
14121412
},
@@ -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 duration of any statement, in milliseconds."),
1533+
gettext_noop("Sets the maximum allowed duration of any statement."),
15341534
gettext_noop("A value of 0 turns off the timeout."),
15351535
GUC_UNIT_MS
15361536
},
@@ -1569,7 +1569,7 @@ static struct config_int ConfigureNamesInt[] =
15691569

15701570
{
15711571
{"authentication_timeout", PGC_SIGHUP, CONN_AUTH_SECURITY,
1572-
gettext_noop("Sets the maximum allowed time to complete client authentication, in seconds."),
1572+
gettext_noop("Sets the maximum allowed time to complete client authentication."),
15731573
NULL,
15741574
GUC_UNIT_S
15751575
},
@@ -1599,7 +1599,7 @@ static struct config_int ConfigureNamesInt[] =
15991599

16001600
{
16011601
{"checkpoint_timeout", PGC_SIGHUP, WAL_CHECKPOINTS,
1602-
gettext_noop("Sets the maximum time between automatic WAL checkpoints, in seconds."),
1602+
gettext_noop("Sets the maximum time between automatic WAL checkpoints."),
16031603
NULL,
16041604
GUC_UNIT_S
16051605
},
@@ -1632,7 +1632,7 @@ static struct config_int ConfigureNamesInt[] =
16321632

16331633
{
16341634
{"wal_writer_delay", PGC_SIGHUP, WAL_SETTINGS,
1635-
gettext_noop("WAL writer sleep time between WAL flushes, in milliseconds."),
1635+
gettext_noop("WAL writer sleep time between WAL flushes."),
16361636
NULL,
16371637
GUC_UNIT_MS
16381638
},
@@ -1673,8 +1673,8 @@ static struct config_int ConfigureNamesInt[] =
16731673

16741674
{
16751675
{"log_min_duration_statement", PGC_SUSET, LOGGING_WHEN,
1676-
gettext_noop("Sets the minimum execution time (in milliseconds) above "
1677-
"which statements will be logged."),
1676+
gettext_noop("Sets the minimum execution time above which "
1677+
"statements will be logged."),
16781678
gettext_noop("Zero prints all queries. -1 turns this feature off."),
16791679
GUC_UNIT_MS
16801680
},
@@ -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 in milliseconds above which "
1687+
gettext_noop("Sets the minimum execution time above which "
16881688
"autovacuum actions will be logged."),
16891689
gettext_noop("Zero prints all actions. -1 turns autovacuum logging off."),
16901690
GUC_UNIT_MS
@@ -1695,7 +1695,7 @@ static struct config_int ConfigureNamesInt[] =
16951695

16961696
{
16971697
{"bgwriter_delay", PGC_SIGHUP, RESOURCES,
1698-
gettext_noop("Background writer sleep time between rounds, in milliseconds."),
1698+
gettext_noop("Background writer sleep time between rounds."),
16991699
NULL,
17001700
GUC_UNIT_MS
17011701
},
@@ -1827,7 +1827,7 @@ static struct config_int ConfigureNamesInt[] =
18271827

18281828
{
18291829
{"autovacuum_naptime", PGC_SIGHUP, AUTOVACUUM,
1830-
gettext_noop("Time to sleep between autovacuum runs, in seconds."),
1830+
gettext_noop("Time to sleep between autovacuum runs."),
18311831
NULL,
18321832
GUC_UNIT_S
18331833
},
@@ -1871,7 +1871,7 @@ static struct config_int ConfigureNamesInt[] =
18711871

18721872
{
18731873
{"tcp_keepalives_idle", PGC_USERSET, CLIENT_CONN_OTHER,
1874-
gettext_noop("Seconds between issuing TCP keepalives."),
1874+
gettext_noop("Time 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("Seconds between TCP keepalive retransmits."),
1884+
gettext_noop("Time between TCP keepalive retransmits."),
18851885
gettext_noop("A value of 0 uses the system default."),
18861886
GUC_UNIT_S
18871887
},

0 commit comments

Comments
 (0)