From 0c6b67507631fd9f563e0329da418060f45ac1f0 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Wed, 9 Oct 2013 08:33:12 -0400 Subject: [PATCH] Centralize effective_cache_size default setting --- src/backend/bootstrap/bootstrap.c | 2 -- src/backend/postmaster/postmaster.c | 2 -- src/backend/tcop/postgres.c | 2 -- src/backend/utils/misc/guc.c | 2 ++ 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 08687f4ff5..d23dc4504a 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -350,8 +350,6 @@ AuxiliaryProcessMain(int argc, char *argv[]) proc_exit(1); } - set_default_effective_cache_size(); - /* Validate we have been given a reasonable-looking DataDir */ Assert(DataDir); ValidatePgVersion(DataDir); diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index bd20e14ea5..c9a8a8fc45 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -785,8 +785,6 @@ PostmasterMain(int argc, char *argv[]) if (!SelectConfigFiles(userDoption, progname)) ExitPostmaster(2); - set_default_effective_cache_size(); - if (output_config_variable != NULL) { /* diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 4b2a7761af..1eaf287eec 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -3592,8 +3592,6 @@ PostgresMain(int argc, char *argv[], proc_exit(1); } - set_default_effective_cache_size(); - /* * You might expect to see a setsid() call here, but it's not needed, * because if we are under a postmaster then BackendInitialize() did it. diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 833f34b1ee..ddbeb34ce7 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -4238,6 +4238,8 @@ SelectConfigFiles(const char *userDoption, const char *progname) */ pg_timezone_abbrev_initialize(); + set_default_effective_cache_size(); + /* * Figure out where pg_hba.conf is, and make sure the path is absolute. */