aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/misc/guc.c22
-rw-r--r--src/backend/utils/misc/postgresql.conf.sample4
2 files changed, 13 insertions, 13 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 45bbfc96ea0..2633bf9e4d3 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.177 2004/01/19 19:04:40 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.178 2004/01/21 23:33:34 tgl Exp $
*
*--------------------------------------------------------------------
*/
@@ -932,22 +932,22 @@ static struct config_int ConfigureNamesInt[] =
DEFAULT_GEQO_POOL_SIZE, 0, MAX_GEQO_POOL_SIZE, NULL, NULL
},
{
- {"geqo_effort", PGC_USERSET, QUERY_TUNING_GEQO,
- gettext_noop("GEQO: effort is used to calculate a default for generations."),
- NULL
- },
- &Geqo_effort,
- 1, 1, INT_MAX, NULL, NULL
- },
- {
{"geqo_generations", PGC_USERSET, QUERY_TUNING_GEQO,
- gettext_noop("GEQO: number of iterations in the algorithm."),
- gettext_noop("The number must be a positive integer. If 0 is "
+ gettext_noop("GEQO: number of iterations of the algorithm."),
+ gettext_noop("The value must be a positive integer. If 0 is "
"specified then effort * log2(poolsize) is used.")
},
&Geqo_generations,
0, 0, INT_MAX, NULL, NULL
},
+ {
+ {"geqo_effort", PGC_USERSET, QUERY_TUNING_GEQO,
+ gettext_noop("GEQO: effort is used to set the default for generations."),
+ NULL
+ },
+ &Geqo_effort,
+ DEFAULT_GEQO_EFFORT, MIN_GEQO_EFFORT, MAX_GEQO_EFFORT, NULL, NULL
+ },
{
{"deadlock_timeout", PGC_SIGHUP, LOCK_MANAGEMENT,
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 98d4d76d3ae..0fdf6b2e99f 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -123,10 +123,10 @@
#geqo = true
#geqo_threshold = 11
-#geqo_effort = 1
-#geqo_generations = 0
#geqo_pool_size = 0 # default based on tables in statement,
# range 128-1024
+#geqo_generations = 0 # use default: effort * log2(pool_size)
+#geqo_effort = 40 # range 1-100
#geqo_selection_bias = 2.0 # range 1.5-2.0
# - Other Planner Options -