Rename vacuum_cost_naptime to vacuum_cost_delay, with agreement from Jan.

diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 9f569712b08b4bef0330523c90321744dc7ef67e..c97e38786197c7d6616b4c00b930c9185f3bd48e 100644 (file)
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.272 2004/08/05 23:32:10 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.273 2004/08/06 04:15:07 momjian Exp $
 -->
 
 <Chapter Id="runtime">
@@ -1074,7 +1074,7 @@ SET ENABLE_SEQSCAN TO OFF;
       cost reaches a limit (specified by
       <varname>vacuum_cost_limit</varname>), the process performing
       the operation will sleep for a while (specified by
-      <varname>vacuum_cost_naptime</varname>). Then it will reset the
+      <varname>vacuum_cost_delay</varname>). Then it will reset the
       counter and continue execution.
      </para>
 
@@ -1092,7 +1092,7 @@ SET ENABLE_SEQSCAN TO OFF;
 
      <para>
       This feature is disabled by default. To enable it, set the
-      <varname>vacuum_cost_naptime</varname> variable to a nonzero
+      <varname>vacuum_cost_delay</varname> variable to a nonzero
       value.
      </para>
 
@@ -1143,8 +1143,8 @@ SET ENABLE_SEQSCAN TO OFF;
        </listitem>
       </varlistentry>
 
-      <varlistentry id="guc-vacuum-cost-naptime" xreflabel="vacuum_cost_naptime">
-       <term><varname>vacuum_cost_naptime</varname> (<type>integer</type>)</term>
+      <varlistentry id="guc-vacuum-cost-delay" xreflabel="vacuum_cost_delay">
+       <term><varname>vacuum_cost_delay</varname> (<type>integer</type>)</term>
        <listitem>
         <para>
          The length of time, in milliseconds, that the process will nap
@@ -1153,7 +1153,7 @@ SET ENABLE_SEQSCAN TO OFF;
          delay feature.  Positive values enable cost-based vacuuming.
          Note however that on many systems, the effective resolution
          of sleep delays is 10 milliseconds; setting
-         <varname>vacuum_cost_naptime</varname> to a value that is
+         <varname>vacuum_cost_delay</varname> to a value that is
          not a multiple of 10 may have the same results as setting it
          to the next higher multiple of 10.
         </para>
@@ -1168,10 +1168,10 @@ SET ENABLE_SEQSCAN TO OFF;
        delays do not occur during such operations.  Therefore it is
        possible that the cost accumulates far higher than the specified
        limit.  To avoid uselessly long delays in such cases, the actual
-       naptime is calculated as <varname>vacuum_cost_naptime</varname> *
+       delay is calculated as <varname>vacuum_cost_delay</varname> *
        <varname>accumulated_balance</varname> /
        <varname>vacuum_cost_limit</varname> with a maximum of
-       <varname>vacuum_cost_naptime</varname> * 4.
+       <varname>vacuum_cost_delay</varname> * 4.
       </para>
      </note>
 

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 23d7996cf5372e10bf87aec765bb0d718f7baa15..aa2708fcab1a2356bfd7ae72d64ac10d2f8e532a 100644 (file)
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.285 2004/07/31 00:45:31 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.286 2004/08/06 04:15:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -377,7 +377,7 @@ vacuum(VacuumStmt *vacstmt)
        {
                ListCell   *cur;
 
-               VacuumCostActive = (VacuumCostNaptime > 0);
+               VacuumCostActive = (VacuumCostDelay > 0);
                VacuumCostBalance = 0;
 
                /*
@@ -3373,9 +3373,9 @@ vacuum_delay_point(void)
        {
                int             msec;
 
-               msec = VacuumCostNaptime * VacuumCostBalance / VacuumCostLimit;
-               if (msec > VacuumCostNaptime * 4)
-                       msec = VacuumCostNaptime * 4;
+               msec = VacuumCostDelay * VacuumCostBalance / VacuumCostLimit;
+               if (msec > VacuumCostDelay * 4)
+                       msec = VacuumCostDelay * 4;
 
                pg_usleep(msec * 1000L);
 

diff --git a/src/backend/po/af.po b/src/backend/po/af.po
index f2a52f6634a81b36fd57a228f22583cbb33ceb84..deaf6a56393645a015bad9f5413bb4db6a91d77d 100644 (file)
--- a/src/backend/po/af.po
+++ b/src/backend/po/af.po
@@ -9167,7 +9167,7 @@ msgid "Vacuum cost amount available before napping."
 msgstr ""
 
 #: utils/misc/guc.c:1097
-msgid "Vacuum cost naptime in milliseconds."
+msgid "Vacuum cost delay in milliseconds."
 msgstr ""
 
 #: utils/misc/guc.c:1106

diff --git a/src/backend/po/sv.po b/src/backend/po/sv.po
index 0379247990034b067645b6065dc39c6fa7cc2e2a..c22990587385039e0bc10088ca0a5c4abf452827 100644 (file)
--- a/src/backend/po/sv.po
+++ b/src/backend/po/sv.po
@@ -9155,7 +9155,7 @@ msgid "Vacuum cost amount available before napping."
 msgstr ""
 
 #: utils/misc/guc.c:1062
-msgid "Vacuum cost naptime in milliseconds."
+msgid "Vacuum cost delay in milliseconds."
 msgstr ""
 
 #: utils/misc/guc.c:1071

diff --git a/src/backend/po/zh_TW.po b/src/backend/po/zh_TW.po
index 290fa4bdd53d85589eb035987d11106b9c4dfd50..8adf7d3c38465430548485f1ac8e703b92b0f60c 100644 (file)
--- a/src/backend/po/zh_TW.po
+++ b/src/backend/po/zh_TW.po
@@ -9875,7 +9875,7 @@ msgid "Vacuum cost amount available before napping."
 msgstr ""
 
 #: utils/misc/guc.c:1036
-msgid "Vacuum cost naptime in milliseconds."
+msgid "Vacuum cost delay in milliseconds."
 msgstr ""
 
 #: utils/misc/guc.c:1045

diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 4f0f8b67c24cbf0270ff8059dc4197dfdf4b71c8..75a3e031be67ef63a2a4625e159f9cc5d3c70be8 100644 (file)
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/init/globals.c,v 1.91 2004/06/18 06:13:54 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/init/globals.c,v 1.92 2004/08/06 04:15:09 momjian Exp $
  *
  * NOTES
  *       Globals used all over the place should be declared here and not
@@ -96,7 +96,7 @@ int                   VacuumCostPageHit = 1;                  /* GUC parameters for vacuum */
 int                    VacuumCostPageMiss = 10;
 int                    VacuumCostPageDirty = 20;
 int                    VacuumCostLimit = 200;
-int                    VacuumCostNaptime = 0;
+int                    VacuumCostDelay = 0;
 
 int                    VacuumCostBalance = 0;                  /* working state for vacuum */
 bool           VacuumCostActive = false;

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index a827653bec400ab6b9cb153b158a14df2e1698de..782caead105836cb018d193ea750788355f91c4c 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.226 2004/08/05 23:32:12 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.227 2004/08/06 04:15:09 momjian Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -1041,11 +1041,11 @@ static struct config_int ConfigureNamesInt[] =
        },
 
        {
-               {"vacuum_cost_naptime", PGC_USERSET, RESOURCES,
-                       gettext_noop("Vacuum cost naptime in milliseconds."),
+               {"vacuum_cost_delay", PGC_USERSET, RESOURCES,
+                       gettext_noop("Vacuum cost delay in milliseconds."),
                        NULL
                },
-               &VacuumCostNaptime,
+               &VacuumCostDelay,
                0, 0, 1000, NULL, NULL
        },
 

diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 633bb5a32296dd9d2cd39c62100cb65f864dbd28..926b67bd50475f5a34993cef03be32d07e0e55b8 100644 (file)
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -74,7 +74,7 @@
 #vacuum_cost_page_miss = 10    # 0-10000 credits
 #vacuum_cost_page_dirty = 20   # 0-10000 credits
 #vacuum_cost_limit = 200       # 0-10000 credits
-#vacuum_cost_naptime = 50      # 0-1000 milliseconds
+#vacuum_cost_delay = 50                # 0-1000 milliseconds
 
 # - Background writer -
 #bgwriter_delay = 200          # 10-5000 milliseconds

diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 3f7c0946d745496bbf7a1bc9852d9a9476cd2901..245b0bb168b66ed8ada3ff6528406cab3a8f8318 100644 (file)
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -13,7 +13,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.164 2004/08/01 17:32:20 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.165 2004/08/06 04:15:09 momjian Exp $
  *
  * NOTES
  *       some of the information in this file should be moved to other files.
@@ -208,7 +208,7 @@ extern int  VacuumCostPageHit;
 extern int     VacuumCostPageMiss;
 extern int     VacuumCostPageDirty;
 extern int     VacuumCostLimit;
-extern int     VacuumCostNaptime;
+extern int     VacuumCostDelay;
 
 extern int     VacuumCostBalance;
 extern bool    VacuumCostActive;