1
0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00

Mop-up for previous change to determine default shared_buffers and

max_connections at initdb time.  Get rid of DEF_NBUFFERS and DEF_MAXBACKENDS
macros, which aren't doing anything useful anymore, and put more likely
defaults into postgresql.conf.sample.
This commit is contained in:
Tom Lane
2003-08-26 15:38:25 +00:00
parent 9116f6c91a
commit f63cbccac7
7 changed files with 17 additions and 22 deletions

View File

@@ -21,7 +21,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/port/ipc_test.c,v 1.9 2003/08/04 02:40:02 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/port/ipc_test.c,v 1.10 2003/08/26 15:38:24 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -50,8 +50,8 @@ const bool ExecBackend = false;
bool IsUnderPostmaster = false;
int MaxBackends = DEF_MAXBACKENDS;
int NBuffers = DEF_NBUFFERS;
int MaxBackends = 32;
int NBuffers = 64;
#ifndef assert_enabled
bool assert_enabled = true;

View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.360 2003/08/13 16:16:23 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.361 2003/08/26 15:38:24 tgl Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -1978,7 +1978,7 @@ usage(char *progname)
#ifdef USE_ASSERT_CHECKING
printf(" -A 1|0 enable/disable run-time assert checking\n");
#endif
printf(" -B NBUFFERS number of shared buffers (default %d)\n", DEF_NBUFFERS);
printf(" -B NBUFFERS number of shared buffers\n");
printf(" -c NAME=VALUE set run-time parameter\n");
printf(" -d 0-5 debugging level (0 is off)\n");
printf(" -D DATADIR database directory\n");
@@ -2651,7 +2651,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.360 $ $Date: 2003/08/13 16:16:23 $\n");
puts("$Revision: 1.361 $ $Date: 2003/08/26 15:38:24 $\n");
}
/*

View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.74 2003/08/04 02:40:06 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.75 2003/08/26 15:38:25 tgl Exp $
*
* NOTES
* Globals used all over the place should be declared here and not
@@ -70,4 +70,4 @@ bool enableFsync = true;
bool allowSystemTableMods = false;
int SortMem = 1024;
int VacuumMem = 8192;
int NBuffers = DEF_NBUFFERS;
int NBuffers = 1000;

View File

@@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.150 2003/08/17 22:19:15 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.151 2003/08/26 15:38:25 tgl Exp $
*
*--------------------------------------------------------------------
*/
@@ -944,7 +944,7 @@ static struct config_int ConfigureNamesInt[] =
NULL
},
&MaxBackends,
DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL
100, 1, INT_MAX, NULL, NULL
},
{
@@ -962,7 +962,7 @@ static struct config_int ConfigureNamesInt[] =
NULL
},
&NBuffers,
DEF_NBUFFERS, 16, INT_MAX, NULL, NULL
1000, 16, INT_MAX, NULL, NULL
},
{

View File

@@ -28,7 +28,7 @@
# - Connection Settings -
#tcpip_socket = false
#max_connections = 32
#max_connections = 100
# note: increasing max_connections costs about 500 bytes of shared
# memory per connection slot, in addition to costs from shared_buffers
# and max_locks_per_transaction.
@@ -55,7 +55,7 @@
# - Memory -
#shared_buffers = 64 # min 16, at least max_connections*2, 8KB each
#shared_buffers = 1000 # min 16, at least max_connections*2, 8KB each
#sort_mem = 1024 # min 64, size in KB
#vacuum_mem = 8192 # min 1024, size in KB