aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2001-09-21 03:32:36 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2001-09-21 03:32:36 +0000
commitc969fed7ecd54be6aca27e68a58efb57b2753ba2 (patch)
tree7efb48f750db915cc576238b87b26304cd242848 /src/backend/utils
parentae3129fd03928c1f5614370c79f1d69bd613f54b (diff)
downloadpostgresql-c969fed7ecd54be6aca27e68a58efb57b2753ba2.tar.gz
postgresql-c969fed7ecd54be6aca27e68a58efb57b2753ba2.zip
Give VACUUM its own GUC parameter for memory usage, rather than
piggybacking on SortMem. Add documentation for some recently-added GUC parameters that had so far escaped it.
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/init/globals.c3
-rw-r--r--src/backend/utils/misc/guc.c12
-rw-r--r--src/backend/utils/misc/postgresql.conf.sample6
3 files changed, 13 insertions, 8 deletions
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 935340ea01d..3a5ddee7bbf 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.59 2001/08/25 18:52:42 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.60 2001/09/21 03:32:35 tgl Exp $
*
* NOTES
* Globals used all over the place should be declared here and not
@@ -82,6 +82,7 @@ char FloatFormat[20] = "%f";
bool enableFsync = true;
bool allowSystemTableMods = false;
int SortMem = 512;
+int VacuumMem = 8192;
int NBuffers = DEF_NBUFFERS;
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index ebb7745347e..5a5dcac47a6 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -4,7 +4,7 @@
* Support for grand unified configuration scheme, including SET
* command, configuration file, and command line options.
*
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.49 2001/09/20 14:20:27 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.50 2001/09/21 03:32:35 tgl Exp $
*
* Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -176,12 +176,11 @@ struct config_string
*
* 4. Add a record below.
*
- * 5. Add it to postgresql.conf.sample
+ * 5. Add it to src/backend/utils/misc/postgresql.conf.sample.
*
- * 6. Don't forget to document that option.
- *
- * WHEN MAKING MODIFICATIONS, remember to update postgresql.conf.sample
+ * 6. Add it to src/bin/psql/tab-complete.c, if it's a USERSET option.
*
+ * 7. Don't forget to document the option.
*/
@@ -298,6 +297,9 @@ static struct config_int
{"sort_mem", PGC_USERSET, &SortMem,
512, 4*BLCKSZ/1024, INT_MAX, NULL, NULL},
+ {"vacuum_mem", PGC_USERSET, &VacuumMem,
+ 8192, 1024, INT_MAX, NULL, NULL},
+
{"debug_level", PGC_USERSET, &DebugLvl,
0, 0, 16, NULL, NULL},
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 8faf8304eba..c39e31d7483 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -53,7 +53,8 @@
#
# Performance
#
-#sort_mem = 512
+#sort_mem = 512 # min 32
+#vacuum_mem = 8192 # min 1024
#fsync = true
@@ -173,10 +174,11 @@
#
# Misc
#
+#dynamic_library_path = '$libdir'
#australian_timezones = false
#deadlock_timeout = 1000
#default_transaction_isolation = 'read committed'
#max_expr_depth = 10000 # min 10
#password_encryption = false
#sql_inheritance = true
-
+#transform_null_equals = false