diff options
Diffstat (limited to 'src/include/optimizer')
| -rw-r--r-- | src/include/optimizer/clauses.h | 14 | ||||
| -rw-r--r-- | src/include/optimizer/geqo.h | 24 | ||||
| -rw-r--r-- | src/include/optimizer/geqo_pool.h | 4 | ||||
| -rw-r--r-- | src/include/optimizer/pathnode.h | 48 | ||||
| -rw-r--r-- | src/include/optimizer/paths.h | 42 | ||||
| -rw-r--r-- | src/include/optimizer/plancat.h | 4 | ||||
| -rw-r--r-- | src/include/optimizer/planmain.h | 12 | ||||
| -rw-r--r-- | src/include/optimizer/prep.h | 6 | ||||
| -rw-r--r-- | src/include/optimizer/restrictinfo.h | 4 |
9 files changed, 81 insertions, 77 deletions
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index f6aca6b7ef7..a02ef9c77c3 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: clauses.h,v 1.42 2001/01/24 19:43:26 momjian Exp $ + * $Id: clauses.h,v 1.43 2001/03/22 04:00:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,8 +20,8 @@ * Flag bits returned by get_relattval(). * These are used in selectivity-estimation routines, too. */ -#define SEL_CONSTANT 1 /* operator's non-var arg is a constant */ -#define SEL_RIGHT 2 /* operator's non-var arg is on the right */ +#define SEL_CONSTANT 1 /* operator's non-var arg is a constant */ +#define SEL_RIGHT 2 /* operator's non-var arg is on the right */ extern Expr *make_clause(int type, Node *oper, List *args); @@ -71,13 +71,13 @@ extern void CommuteClause(Expr *clause); extern Node *eval_const_expressions(Node *node); extern bool expression_tree_walker(Node *node, bool (*walker) (), - void *context); + void *context); extern Node *expression_tree_mutator(Node *node, Node *(*mutator) (), - void *context); + void *context); extern bool query_tree_walker(Query *query, bool (*walker) (), - void *context, bool visitQueryRTEs); + void *context, bool visitQueryRTEs); extern void query_tree_mutator(Query *query, Node *(*mutator) (), - void *context, bool visitQueryRTEs); + void *context, bool visitQueryRTEs); #define is_subplan(clause) ((clause) != NULL && \ IsA(clause, Expr) && \ diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h index e1229c3e1a9..34b7065f76c 100644 --- a/src/include/optimizer/geqo.h +++ b/src/include/optimizer/geqo.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo.h,v 1.23 2001/01/24 19:43:26 momjian Exp $ + * $Id: geqo.h,v 1.24 2001/03/22 04:00:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,21 +46,25 @@ * Configuration options */ /* If you change these, update backend/utils/misc/postgresql.sample.conf */ -extern int Geqo_pool_size; -#define DEFAULT_GEQO_POOL_SIZE 0 /* = default based on no. of relations. */ +extern int Geqo_pool_size; + +#define DEFAULT_GEQO_POOL_SIZE 0/* = default based on no. of relations. */ #define MIN_GEQO_POOL_SIZE 128 #define MAX_GEQO_POOL_SIZE 1024 -extern int Geqo_effort; /* 1 .. inf, only used to calculate generations default */ -extern int Geqo_generations; /* 1 .. inf, or 0 to use default based on pool size */ +extern int Geqo_effort; /* 1 .. inf, only used to calculate + * generations default */ +extern int Geqo_generations; /* 1 .. inf, or 0 to use default based on + * pool size */ + +extern double Geqo_selection_bias; -extern double Geqo_selection_bias; /* If you change these, update backend/utils/misc/postgresql.sample.conf */ #define DEFAULT_GEQO_SELECTION_BIAS 2.0 #define MIN_GEQO_SELECTION_BIAS 1.5 #define MAX_GEQO_SELECTION_BIAS 2.0 -extern int Geqo_random_seed; /* or negative to use current time */ +extern int Geqo_random_seed; /* or negative to use current time */ /* routines in geqo_main.c */ @@ -68,9 +72,9 @@ extern RelOptInfo *geqo(Query *root, int number_of_rels, List *initial_rels); /* routines in geqo_eval.c */ extern Cost geqo_eval(Query *root, List *initial_rels, - Gene *tour, int num_gene); + Gene *tour, int num_gene); extern RelOptInfo *gimme_tree(Query *root, List *initial_rels, - Gene *tour, int num_gene, - int rel_count, RelOptInfo *old_rel); + Gene *tour, int num_gene, + int rel_count, RelOptInfo *old_rel); #endif /* GEQO_H */ diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h index 5c7e24c9e75..264bacba8f3 100644 --- a/src/include/optimizer/geqo_pool.h +++ b/src/include/optimizer/geqo_pool.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_pool.h,v 1.11 2001/01/24 19:43:26 momjian Exp $ + * $Id: geqo_pool.h,v 1.12 2001/03/22 04:00:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,7 @@ extern Pool *alloc_pool(int pool_size, int string_length); extern void free_pool(Pool *pool); extern void random_init_pool(Query *root, List *initial_rels, - Pool *pool, int strt, int stop); + Pool *pool, int strt, int stop); extern Chromosome *alloc_chromo(int string_length); extern void free_chromo(Chromosome *chromo); diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index 7e000034761..5b71eded86f 100644 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pathnode.h,v 1.34 2001/02/16 00:03:06 tgl Exp $ + * $Id: pathnode.h,v 1.35 2001/03/22 04:00:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,29 +37,29 @@ extern AppendPath *create_append_path(RelOptInfo *rel, List *subpaths); extern Path *create_subqueryscan_path(RelOptInfo *rel); extern NestPath *create_nestloop_path(RelOptInfo *joinrel, - JoinType jointype, - Path *outer_path, - Path *inner_path, - List *restrict_clauses, - List *pathkeys); + JoinType jointype, + Path *outer_path, + Path *inner_path, + List *restrict_clauses, + List *pathkeys); extern MergePath *create_mergejoin_path(RelOptInfo *joinrel, - JoinType jointype, - Path *outer_path, - Path *inner_path, - List *restrict_clauses, - List *pathkeys, - List *mergeclauses, - List *outersortkeys, - List *innersortkeys); + JoinType jointype, + Path *outer_path, + Path *inner_path, + List *restrict_clauses, + List *pathkeys, + List *mergeclauses, + List *outersortkeys, + List *innersortkeys); extern HashPath *create_hashjoin_path(RelOptInfo *joinrel, - JoinType jointype, - Path *outer_path, - Path *inner_path, - List *restrict_clauses, - List *hashclauses, - Selectivity innerdispersion); + JoinType jointype, + Path *outer_path, + Path *inner_path, + List *restrict_clauses, + List *hashclauses, + Selectivity innerdispersion); /* * prototypes for relnode.c @@ -67,9 +67,9 @@ extern HashPath *create_hashjoin_path(RelOptInfo *joinrel, extern RelOptInfo *get_base_rel(Query *root, int relid); extern RelOptInfo *make_base_rel(Query *root, int relid); extern RelOptInfo *get_join_rel(Query *root, - RelOptInfo *outer_rel, - RelOptInfo *inner_rel, - JoinType jointype, - List **restrictlist_ptr); + RelOptInfo *outer_rel, + RelOptInfo *inner_rel, + JoinType jointype, + List **restrictlist_ptr); #endif /* PATHNODE_H */ diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index 5f0acdd4729..ac67f6a6551 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: paths.h,v 1.51 2001/01/24 19:43:26 momjian Exp $ + * $Id: paths.h,v 1.52 2001/03/22 04:00:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,10 +61,10 @@ extern void create_tidscan_paths(Query *root, RelOptInfo *rel); * routines to create join paths */ extern void add_paths_to_joinrel(Query *root, RelOptInfo *joinrel, - RelOptInfo *outerrel, - RelOptInfo *innerrel, - JoinType jointype, - List *restrictlist); + RelOptInfo *outerrel, + RelOptInfo *innerrel, + JoinType jointype, + List *restrictlist); /* * joinrels.c @@ -72,11 +72,11 @@ extern void add_paths_to_joinrel(Query *root, RelOptInfo *joinrel, */ extern List *make_rels_by_joins(Query *root, int level, List **joinrels); extern List *make_rels_by_clause_joins(Query *root, - RelOptInfo *old_rel, - List *other_rels); + RelOptInfo *old_rel, + List *other_rels); extern List *make_rels_by_clauseless_joins(Query *root, - RelOptInfo *old_rel, - List *other_rels); + RelOptInfo *old_rel, + List *other_rels); extern RelOptInfo *make_jointree_rel(Query *root, Node *jtnode); /* @@ -97,7 +97,7 @@ extern List *canonicalize_pathkeys(Query *root, List *pathkeys); extern PathKeysComparison compare_pathkeys(List *keys1, List *keys2); extern bool pathkeys_contained_in(List *keys1, List *keys2); extern PathKeysComparison compare_noncanonical_pathkeys(List *keys1, - List *keys2); + List *keys2); extern bool noncanonical_pathkeys_contained_in(List *keys1, List *keys2); extern Path *get_cheapest_path_for_pathkeys(List *paths, List *pathkeys, CostSelector cost_criterion); @@ -108,22 +108,22 @@ extern List *build_index_pathkeys(Query *root, RelOptInfo *rel, IndexOptInfo *index, ScanDirection scandir); extern List *build_join_pathkeys(Query *root, - RelOptInfo *joinrel, - List *outer_pathkeys); + RelOptInfo *joinrel, + List *outer_pathkeys); extern List *make_pathkeys_for_sortclauses(List *sortclauses, List *tlist); extern List *find_mergeclauses_for_pathkeys(Query *root, - List *pathkeys, - List *restrictinfos); + List *pathkeys, + List *restrictinfos); extern List *make_pathkeys_for_mergeclauses(Query *root, - List *mergeclauses, - RelOptInfo *rel); -extern int pathkeys_useful_for_merging(Query *root, - RelOptInfo *rel, - List *pathkeys); + List *mergeclauses, + RelOptInfo *rel); +extern int pathkeys_useful_for_merging(Query *root, + RelOptInfo *rel, + List *pathkeys); extern int pathkeys_useful_for_ordering(Query *root, List *pathkeys); extern List *truncate_useless_pathkeys(Query *root, - RelOptInfo *rel, - List *pathkeys); + RelOptInfo *rel, + List *pathkeys); #endif /* PATHS_H */ diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index d4854039efb..5d3062d981c 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: plancat.h,v 1.21 2001/01/24 19:43:26 momjian Exp $ + * $Id: plancat.h,v 1.22 2001/03/22 04:00:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ extern void relation_info(Oid relationObjectId, - bool *hasindex, long *pages, double *tuples); + bool *hasindex, long *pages, double *tuples); extern List *find_secondary_indexes(Oid relationObjectId); diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 79112f6fb4e..75b05fa2781 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: planmain.h,v 1.49 2001/01/24 19:43:26 momjian Exp $ + * $Id: planmain.h,v 1.50 2001/03/22 04:00:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,20 +27,20 @@ extern Plan *query_planner(Query *root, List *tlist, double tuple_fraction); */ extern Plan *create_plan(Query *root, Path *best_path); extern SubqueryScan *make_subqueryscan(List *qptlist, List *qpqual, - Index scanrelid, Plan *subplan); + Index scanrelid, Plan *subplan); extern Append *make_append(List *appendplans, bool isTarget, List *tlist); extern Sort *make_sort(List *tlist, Plan *lefttree, int keycount); extern Sort *make_sort_from_pathkeys(List *tlist, Plan *lefttree, - List *pathkeys); + List *pathkeys); extern Agg *make_agg(List *tlist, List *qual, Plan *lefttree); extern Group *make_group(List *tlist, bool tuplePerGroup, int ngrp, AttrNumber *grpColIdx, Plan *lefttree); extern Material *make_material(List *tlist, Plan *lefttree); extern Unique *make_unique(List *tlist, Plan *lefttree, List *distinctList); extern Limit *make_limit(List *tlist, Plan *lefttree, - Node *limitOffset, Node *limitCount); + Node *limitOffset, Node *limitCount); extern SetOp *make_setop(SetOpCmd cmd, List *tlist, Plan *lefttree, - List *distinctList, AttrNumber flagColIdx); + List *distinctList, AttrNumber flagColIdx); extern Result *make_result(List *tlist, Node *resconstantqual, Plan *subplan); /* @@ -50,7 +50,7 @@ extern void build_base_rel_tlists(Query *root, List *tlist); extern Relids distribute_quals_to_rels(Query *root, Node *jtnode); extern List *add_missing_rels_to_query(Query *root, Node *jtnode); extern void process_implied_equality(Query *root, Node *item1, Node *item2, - Oid sortop1, Oid sortop2); + Oid sortop1, Oid sortop2); /* * prototypes for plan/setrefs.c diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index 9caf584975e..b1ca99fed52 100644 --- a/src/include/optimizer/prep.h +++ b/src/include/optimizer/prep.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: prep.h,v 1.26 2001/01/24 19:43:26 momjian Exp $ + * $Id: prep.h,v 1.27 2001/03/22 04:00:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,7 +38,7 @@ extern List *find_all_inheritors(Oid parentrel); extern List *expand_inherted_rtentry(Query *parse, Index rti); extern Node *adjust_inherited_attrs(Node *node, - Index old_rt_index, Oid old_relid, - Index new_rt_index, Oid new_relid); + Index old_rt_index, Oid old_relid, + Index new_rt_index, Oid new_relid); #endif /* PREP_H */ diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h index 672e9206dfb..084d8e61560 100644 --- a/src/include/optimizer/restrictinfo.h +++ b/src/include/optimizer/restrictinfo.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: restrictinfo.h,v 1.10 2001/01/24 19:43:26 momjian Exp $ + * $Id: restrictinfo.h,v 1.11 2001/03/22 04:00:56 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,6 +19,6 @@ extern bool restriction_is_or_clause(RestrictInfo *restrictinfo); extern List *get_actual_clauses(List *restrictinfo_list); extern void get_actual_join_clauses(List *restrictinfo_list, - List **joinquals, List **otherquals); + List **joinquals, List **otherquals); #endif /* RESTRICTINFO_H */ |