diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-02-03 17:34:04 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-02-03 17:34:04 +0000 |
| commit | 391c3811a2b7f4cd666e1b4f35534046a862abbb (patch) | |
| tree | 16e534067f9cb86d99b598675fbf3929589e6629 /doc/src/sgml/ref/postgres-ref.sgml | |
| parent | 39d715bee6f1eb1e7b90148368a22fe24f008185 (diff) | |
| download | postgresql-391c3811a2b7f4cd666e1b4f35534046a862abbb.tar.gz postgresql-391c3811a2b7f4cd666e1b4f35534046a862abbb.zip | |
Rename SortMem and VacuumMem to work_mem and maintenance_work_mem.
Make btree index creation and initial validation of foreign-key constraints
use maintenance_work_mem rather than work_mem as their memory limit.
Add some code to guc.c to allow these variables to be referenced by their
old names in SHOW and SET commands, for backwards compatibility.
Diffstat (limited to 'doc/src/sgml/ref/postgres-ref.sgml')
| -rw-r--r-- | doc/src/sgml/ref/postgres-ref.sgml | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml index 3ae6003120b..cfb16a78686 100644 --- a/doc/src/sgml/ref/postgres-ref.sgml +++ b/doc/src/sgml/ref/postgres-ref.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.42 2003/11/29 19:51:39 pgsql Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.43 2004/02/03 17:34:02 tgl Exp $ PostgreSQL documentation --> @@ -41,7 +41,7 @@ PostgreSQL documentation <arg>-s</arg> <arg>-t<group choice="plain"><arg>pa</arg><arg>pl</arg><arg>ex</arg></group></arg> </group> - <arg>-S <replaceable>sort-mem</replaceable></arg> + <arg>-S <replaceable>work-mem</replaceable></arg> <arg>-W <replaceable>seconds</replaceable></arg> <arg>--<replaceable>name</replaceable>=<replaceable>value</replaceable></arg> <arg choice="plain"><replaceable>database</replaceable></arg> @@ -64,7 +64,7 @@ PostgreSQL documentation <arg>-s</arg> <arg>-t<group choice="plain"><arg>pa</arg><arg>pl</arg><arg>ex</arg></group></arg> </group> - <arg>-S <replaceable>sort-mem</replaceable></arg> + <arg>-S <replaceable>work-mem</replaceable></arg> <arg>-v <replaceable>protocol</replaceable></arg> <arg>-W <replaceable>seconds</replaceable></arg> <arg>--<replaceable>name</replaceable>=<replaceable>value</replaceable></arg> @@ -197,16 +197,13 @@ PostgreSQL documentation </varlistentry> <varlistentry> - <term><option>-S</option> <replaceable class="parameter">sort-mem</replaceable></term> + <term><option>-S</option> <replaceable class="parameter">work-mem</replaceable></term> <listitem> <para> Specifies the amount of memory to be used by internal sorts and hashes - before resorting to temporary disk files. The value is specified in - kilobytes, and defaults to 1024. Note that for a complex query, - several sorts and/or hashes might be running in parallel, and each one - will be allowed to use as much as - <replaceable class="parameter">sort-mem</replaceable> kilobytes - before it starts to put data into temporary files. + before resorting to temporary disk files. See the description of the + <varname>work_mem</> configuration parameter in <xref + linkend="runtime-config-resource-memory">. </para> </listitem> </varlistentry> |