diff options
Diffstat (limited to 'src/backend/utils/misc')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 16 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 3 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 471d895ea72..9b726dcfe32 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -5,7 +5,7 @@ * command, configuration file, and command line options. * See src/backend/utils/misc/README for more information. * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.110 2003/01/10 22:03:29 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.111 2003/01/25 23:10:27 tgl Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * Written by Peter Eisentraut <[email protected]>. @@ -37,7 +37,7 @@ #include "optimizer/cost.h" #include "optimizer/geqo.h" #include "optimizer/paths.h" -#include "optimizer/planmain.h" +#include "optimizer/prep.h" #include "parser/parse_expr.h" #include "storage/fd.h" #include "storage/freespace.h" @@ -539,8 +539,16 @@ static struct config_int 10, 1, 1000, NULL, NULL }, { - {"geqo_threshold", PGC_USERSET}, &geqo_rels, - DEFAULT_GEQO_RELS, 2, INT_MAX, NULL, NULL + {"from_collapse_limit", PGC_USERSET}, &from_collapse_limit, + 8, 1, INT_MAX, NULL, NULL + }, + { + {"join_collapse_limit", PGC_USERSET}, &join_collapse_limit, + 8, 1, INT_MAX, NULL, NULL + }, + { + {"geqo_threshold", PGC_USERSET}, &geqo_threshold, + 11, 2, INT_MAX, NULL, NULL }, { {"geqo_pool_size", PGC_USERSET}, &Geqo_pool_size, diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 41750b9e229..515eec9acae 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -94,6 +94,9 @@ #cpu_index_tuple_cost = 0.001 # (same) #cpu_operator_cost = 0.0025 # (same) +#from_collapse_limit = 8 +#join_collapse_limit = 8 # 1 disables collapsing of explicit JOINs + #default_statistics_target = 10 # range 1-1000 # |