diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2006-07-26 11:35:56 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2006-07-26 11:35:56 +0000 |
| commit | 79bc99a46703dc07636f4c9f09067f87b324c6b4 (patch) | |
| tree | f59e44dc91563cd4be2efbb8a5cde3b7f3c64360 /src/backend | |
| parent | 0c57c832b950192405004021c618315bbe786ddf (diff) | |
| download | postgresql-79bc99a46703dc07636f4c9f09067f87b324c6b4.tar.gz postgresql-79bc99a46703dc07636f4c9f09067f87b324c6b4.zip | |
Convert effective_cache_size to an integer, for better integration with
upcoming units feature.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/optimizer/path/costsize.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index 14350a90f7a..5f5e9ec3721 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -54,7 +54,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/costsize.c,v 1.163 2006/07/22 15:41:55 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/path/costsize.c,v 1.164 2006/07/26 11:35:56 petere Exp $ * *------------------------------------------------------------------------- */ @@ -92,7 +92,7 @@ double cpu_tuple_cost = DEFAULT_CPU_TUPLE_COST; double cpu_index_tuple_cost = DEFAULT_CPU_INDEX_TUPLE_COST; double cpu_operator_cost = DEFAULT_CPU_OPERATOR_COST; -double effective_cache_size = DEFAULT_EFFECTIVE_CACHE_SIZE; +int effective_cache_size = DEFAULT_EFFECTIVE_CACHE_SIZE; Cost disable_cost = 100000000.0; @@ -393,7 +393,7 @@ index_pages_fetched(double tuples_fetched, BlockNumber pages, T = (pages > 1) ? (double) pages : 1.0; /* b is pro-rated share of effective_cache_size */ - b = effective_cache_size * T / (T + (double) other_pages); + b = (double) effective_cache_size * T / (T + (double) other_pages); /* force it positive and integral */ if (b <= 1.0) b = 1.0; diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 400a267e704..cf38490d9e3 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.329 2006/07/25 03:51:21 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.330 2006/07/26 11:35:56 petere Exp $ * *-------------------------------------------------------------------- */ @@ -1579,6 +1579,17 @@ static struct config_int ConfigureNamesInt[] = 0, 0, INT_MAX, NULL, NULL }, + { + {"effective_cache_size", PGC_USERSET, QUERY_TUNING_COST, + gettext_noop("Sets the planner's assumption about size of the disk cache."), + gettext_noop("That is, the portion of the kernel's disk cache that " + "will be used for PostgreSQL data files. This is measured in disk " + "pages, which are normally 8 kB each.") + }, + &effective_cache_size, + DEFAULT_EFFECTIVE_CACHE_SIZE, 1, INT_MAX, NULL, NULL + }, + /* End-of-list marker */ { {NULL, 0, 0, NULL, NULL}, NULL, 0, 0, 0, NULL, NULL @@ -1635,17 +1646,6 @@ static struct config_real ConfigureNamesReal[] = }, { - {"effective_cache_size", PGC_USERSET, QUERY_TUNING_COST, - gettext_noop("Sets the planner's assumption about size of the disk cache."), - gettext_noop("That is, the portion of the kernel's disk cache that " - "will be used for PostgreSQL data files. This is measured in disk " - "pages, which are normally 8 kB each.") - }, - &effective_cache_size, - DEFAULT_EFFECTIVE_CACHE_SIZE, 1, DBL_MAX, NULL, NULL - }, - - { {"geqo_selection_bias", PGC_USERSET, QUERY_TUNING_GEQO, gettext_noop("GEQO: selective pressure within the population."), NULL |