diff options
Diffstat (limited to 'src/backend/utils/misc')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 18 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 13 |
2 files changed, 25 insertions, 6 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 2030c7da37..c38d98d391 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.42 2001/06/23 22:23:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.43 2001/06/27 23:31:39 tgl Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. @@ -31,6 +31,8 @@ #include "optimizer/paths.h" #include "optimizer/planmain.h" #include "parser/parse_expr.h" +#include "storage/freespace.h" +#include "storage/lock.h" #include "storage/proc.h" #include "tcop/tcopprot.h" #include "utils/datetime.h" @@ -270,11 +272,16 @@ static struct config_int */ {"max_connections", PGC_POSTMASTER, &MaxBackends, DEF_MAXBACKENDS, 1, MAXBACKENDS, NULL, NULL}, + {"shared_buffers", PGC_POSTMASTER, &NBuffers, DEF_NBUFFERS, 16, INT_MAX, NULL, NULL}, + {"port", PGC_POSTMASTER, &PostPortNumber, DEF_PGPORT, 1, 65535, NULL, NULL}, + {"unix_socket_permissions", PGC_POSTMASTER, &Unix_socket_permissions, + 0777, 0000, 0777, NULL, NULL}, + {"sort_mem", PGC_USERSET, &SortMem, 512, 4*BLCKSZ/1024, INT_MAX, NULL, NULL}, @@ -290,8 +297,13 @@ static struct config_int {"max_expr_depth", PGC_USERSET, &max_expr_depth, DEFAULT_MAX_EXPR_DEPTH, 10, INT_MAX, NULL, NULL}, - {"unix_socket_permissions", PGC_POSTMASTER, &Unix_socket_permissions, - 0777, 0000, 0777, NULL, NULL}, + {"max_fsm_relations", PGC_POSTMASTER, &MaxFSMRelations, + 100, 10, INT_MAX, NULL, NULL}, + {"max_fsm_pages", PGC_POSTMASTER, &MaxFSMPages, + 10000, 1000, INT_MAX, NULL, NULL}, + + {"max_locks_per_xact", PGC_POSTMASTER, &max_locks_per_xact, + 64, 10, INT_MAX, NULL, NULL}, {"checkpoint_segments", PGC_SIGHUP, &CheckPointSegments, 3, 1, INT_MAX, NULL, NULL}, diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index a77666d9f4..a3042bee83 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -45,10 +45,18 @@ # +# Shared Memory Size +# +#shared_buffers = 64 # 2*max_connections, min 16 +#max_fsm_relations = 100 # min 10 +#max_fsm_pages = 10000 # min 1000 +#max_locks_per_xact = 64 # min 10 +#wal_buffers = 8 # min 4 + +# # Performance # #sort_mem = 512 -#shared_buffers = 64 # 2*max_connections, min 16 #fsync = true @@ -78,7 +86,7 @@ # GEQO Optimizer Parameters # #geqo_threshold = 11 -#geqo_pool_size = 0 #default based in tables, range 128-1024 +#geqo_pool_size = 0 #default based on #tables in query, range 128-1024 #geqo_effort = 1 #geqo_generations = 0 #geqo_random_seed = -1 # auto-compute seed @@ -87,7 +95,6 @@ # # Write-ahead log (WAL) # -#wal_buffers = 8 # min 4 #wal_files = 0 # range 0-64 #wal_sync_method = fsync # fsync or fdatasync or open_sync or open_datasync # Note: default wal_sync_method varies across platforms |