diff options
Diffstat (limited to 'src/include/optimizer')
-rw-r--r-- | src/include/optimizer/clauses.h | 20 | ||||
-rw-r--r-- | src/include/optimizer/cost.h | 38 | ||||
-rw-r--r-- | src/include/optimizer/geqo_misc.h | 3 | ||||
-rw-r--r-- | src/include/optimizer/joininfo.h | 10 | ||||
-rw-r--r-- | src/include/optimizer/pathnode.h | 16 | ||||
-rw-r--r-- | src/include/optimizer/paths.h | 12 | ||||
-rw-r--r-- | src/include/optimizer/plancat.h | 8 | ||||
-rw-r--r-- | src/include/optimizer/planmain.h | 32 | ||||
-rw-r--r-- | src/include/optimizer/prep.h | 4 | ||||
-rw-r--r-- | src/include/optimizer/restrictinfo.h | 12 | ||||
-rw-r--r-- | src/include/optimizer/tlist.h | 4 |
11 files changed, 79 insertions, 80 deletions
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index 04add3c6f63..0384fafe972 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: clauses.h,v 1.65 2003/06/25 21:30:33 momjian Exp $ + * $Id: clauses.h,v 1.66 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ extern Expr *make_opclause(Oid opno, Oid opresulttype, bool opretset, - Expr *leftop, Expr *rightop); + Expr *leftop, Expr *rightop); extern Node *get_leftop(Expr *clause); extern Node *get_rightop(Expr *clause); @@ -60,7 +60,7 @@ extern bool has_distinct_on_clause(Query *query); extern void clause_get_relids_vars(Node *clause, Relids *relids, List **vars); extern int NumRelids(Node *clause); -extern void CommuteClause(OpExpr *clause); +extern void CommuteClause(OpExpr * clause); extern Node *eval_const_expressions(Node *node); @@ -70,18 +70,18 @@ extern Node *expression_tree_mutator(Node *node, Node *(*mutator) (), void *context); /* flags bits for query_tree_walker and query_tree_mutator */ -#define QTW_IGNORE_RT_SUBQUERIES 0x01 /* subqueries in rtable */ -#define QTW_IGNORE_JOINALIASES 0x02 /* JOIN alias var lists */ -#define QTW_DONT_COPY_QUERY 0x04 /* do not copy top Query */ +#define QTW_IGNORE_RT_SUBQUERIES 0x01 /* subqueries in rtable */ +#define QTW_IGNORE_JOINALIASES 0x02 /* JOIN alias var lists */ +#define QTW_DONT_COPY_QUERY 0x04 /* do not copy top Query */ extern bool query_tree_walker(Query *query, bool (*walker) (), - void *context, int flags); + void *context, int flags); extern Query *query_tree_mutator(Query *query, Node *(*mutator) (), - void *context, int flags); + void *context, int flags); extern bool query_or_expression_tree_walker(Node *node, bool (*walker) (), - void *context, int flags); + void *context, int flags); extern Node *query_or_expression_tree_mutator(Node *node, Node *(*mutator) (), - void *context, int flags); + void *context, int flags); #endif /* CLAUSES_H */ diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index ad2122f46e7..1f701019875 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: cost.h,v 1.54 2003/07/14 22:35:54 tgl Exp $ + * $Id: cost.h,v 1.55 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,20 +62,20 @@ extern void cost_functionscan(Path *path, Query *root, extern void cost_sort(Path *path, Query *root, List *pathkeys, Cost input_cost, double tuples, int width); extern void cost_material(Path *path, - Cost input_cost, double tuples, int width); + Cost input_cost, double tuples, int width); extern void cost_agg(Path *path, Query *root, - AggStrategy aggstrategy, int numAggs, - int numGroupCols, double numGroups, - Cost input_startup_cost, Cost input_total_cost, - double input_tuples); + AggStrategy aggstrategy, int numAggs, + int numGroupCols, double numGroups, + Cost input_startup_cost, Cost input_total_cost, + double input_tuples); extern void cost_group(Path *path, Query *root, - int numGroupCols, double numGroups, - Cost input_startup_cost, Cost input_total_cost, - double input_tuples); + int numGroupCols, double numGroups, + Cost input_startup_cost, Cost input_total_cost, + double input_tuples); extern void cost_nestloop(NestPath *path, Query *root); extern void cost_mergejoin(MergePath *path, Query *root); extern void cost_hashjoin(HashPath *path, Query *root); -extern void cost_qual_eval(QualCost *cost, List *quals); +extern void cost_qual_eval(QualCost * cost, List *quals); extern void set_baserel_size_estimates(Query *root, RelOptInfo *rel); extern void set_joinrel_size_estimates(Query *root, RelOptInfo *rel, RelOptInfo *outer_rel, @@ -89,16 +89,16 @@ extern void set_function_size_estimates(Query *root, RelOptInfo *rel); * routines to compute clause selectivities */ extern Selectivity restrictlist_selectivity(Query *root, - List *restrictinfo_list, - int varRelid, - JoinType jointype); + List *restrictinfo_list, + int varRelid, + JoinType jointype); extern Selectivity clauselist_selectivity(Query *root, - List *clauses, - int varRelid, - JoinType jointype); + List *clauses, + int varRelid, + JoinType jointype); extern Selectivity clause_selectivity(Query *root, - Node *clause, - int varRelid, - JoinType jointype); + Node *clause, + int varRelid, + JoinType jointype); #endif /* COST_H */ diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index 5c276c0fb21..0db5f432340 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_misc.h,v 1.22 2002/11/06 00:00:45 tgl Exp $ + * $Id: geqo_misc.h,v 1.23 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,6 @@ extern void print_pool(FILE *fp, Pool *pool, int start, int stop); extern void print_gen(FILE *fp, Pool *pool, int generation); extern void print_edge_table(FILE *fp, Edge *edge_table, int num_gene); - #endif /* GEQO_DEBUG */ #endif /* GEQO_MISC_H */ diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h index 6fd806bbaf1..ae26e34d2aa 100644 --- a/src/include/optimizer/joininfo.h +++ b/src/include/optimizer/joininfo.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: joininfo.h,v 1.23 2003/01/24 03:58:43 tgl Exp $ + * $Id: joininfo.h,v 1.24 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,10 +21,10 @@ extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, Relids join_relids); extern JoinInfo *make_joininfo_node(RelOptInfo *this_rel, Relids join_relids); extern void add_join_clause_to_rels(Query *root, - RestrictInfo *restrictinfo, - Relids join_relids); + RestrictInfo *restrictinfo, + Relids join_relids); extern void remove_join_clause_from_rels(Query *root, - RestrictInfo *restrictinfo, - Relids join_relids); + RestrictInfo *restrictinfo, + Relids join_relids); #endif /* JOININFO_H */ diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index 6d112a5cf07..c7b3004eac1 100644 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pathnode.h,v 1.50 2003/02/15 20:12:41 tgl Exp $ + * $Id: pathnode.h,v 1.51 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,10 +37,10 @@ extern TidPath *create_tidscan_path(Query *root, RelOptInfo *rel, List *tideval); extern AppendPath *create_append_path(RelOptInfo *rel, List *subpaths); extern ResultPath *create_result_path(RelOptInfo *rel, Path *subpath, - List *constantqual); + List *constantqual); extern MaterialPath *create_material_path(RelOptInfo *rel, Path *subpath); extern UniquePath *create_unique_path(Query *root, RelOptInfo *rel, - Path *subpath); + Path *subpath); extern Path *create_subqueryscan_path(RelOptInfo *rel, List *pathkeys); extern Path *create_functionscan_path(Query *root, RelOptInfo *rel); @@ -78,10 +78,10 @@ extern void build_base_rel(Query *root, int relid); extern RelOptInfo *build_other_rel(Query *root, int relid); extern RelOptInfo *find_base_rel(Query *root, int relid); extern RelOptInfo *build_join_rel(Query *root, - Relids joinrelids, - RelOptInfo *outer_rel, - RelOptInfo *inner_rel, - JoinType jointype, - List **restrictlist_ptr); + Relids joinrelids, + 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 b36e17f91d7..b9be78c390a 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: paths.h,v 1.67 2003/05/26 00:11:28 tgl Exp $ + * $Id: paths.h,v 1.68 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,12 +37,12 @@ extern void debug_print_rel(Query *root, RelOptInfo *rel); */ extern void create_index_paths(Query *root, RelOptInfo *rel); extern Path *best_inner_indexscan(Query *root, RelOptInfo *rel, - Relids outer_relids, JoinType jointype); + Relids outer_relids, JoinType jointype); extern List *extract_or_indexqual_conditions(RelOptInfo *rel, IndexOptInfo *index, Expr *orsubclause); extern List *expand_indexqual_conditions(IndexOptInfo *index, - List *clausegroups); + List *clausegroups); /* * orindxpath.c @@ -73,8 +73,8 @@ extern void add_paths_to_joinrel(Query *root, RelOptInfo *joinrel, extern List *make_rels_by_joins(Query *root, int level, List **joinrels); extern RelOptInfo *make_jointree_rel(Query *root, Node *jtnode); extern RelOptInfo *make_join_rel(Query *root, - RelOptInfo *rel1, RelOptInfo *rel2, - JoinType jointype); + RelOptInfo *rel1, RelOptInfo *rel2, + JoinType jointype); /* * pathkeys.c @@ -106,7 +106,7 @@ extern List *build_index_pathkeys(Query *root, RelOptInfo *rel, IndexOptInfo *index, ScanDirection scandir); extern List *build_subquery_pathkeys(Query *root, RelOptInfo *rel, - Query *subquery); + Query *subquery); extern List *build_join_pathkeys(Query *root, RelOptInfo *joinrel, List *outer_pathkeys); diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index 8f7cfbe6ceb..004ba12d6e4 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: plancat.h,v 1.30 2003/06/29 23:05:05 tgl Exp $ + * $Id: plancat.h,v 1.31 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,8 +33,8 @@ extern Selectivity restriction_selectivity(Query *root, int varRelid); extern Selectivity join_selectivity(Query *root, - Oid operator, - List *args, - JoinType jointype); + Oid operator, + List *args, + JoinType jointype); #endif /* PLANCAT_H */ diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 99c9470493d..8f8022dc127 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: planmain.h,v 1.72 2003/06/29 23:05:05 tgl Exp $ + * $Id: planmain.h,v 1.73 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ * prototypes for plan/planmain.c */ extern void query_planner(Query *root, List *tlist, double tuple_fraction, - Path **cheapest_path, Path **sorted_path); + Path **cheapest_path, Path **sorted_path); /* * prototypes for plan/createplan.c @@ -31,18 +31,18 @@ extern SubqueryScan *make_subqueryscan(List *qptlist, List *qpqual, Index scanrelid, Plan *subplan); extern Append *make_append(List *appendplans, bool isTarget, List *tlist); extern Sort *make_sort_from_sortclauses(Query *root, List *tlist, - Plan *lefttree, List *sortcls); + Plan *lefttree, List *sortcls); extern Sort *make_sort_from_groupcols(Query *root, List *groupcls, - AttrNumber *grpColIdx, Plan *lefttree); + AttrNumber *grpColIdx, Plan *lefttree); extern Agg *make_agg(Query *root, List *tlist, List *qual, - AggStrategy aggstrategy, - int numGroupCols, AttrNumber *grpColIdx, - long numGroups, int numAggs, - Plan *lefttree); + AggStrategy aggstrategy, + int numGroupCols, AttrNumber *grpColIdx, + long numGroups, int numAggs, + Plan *lefttree); extern Group *make_group(Query *root, List *tlist, - int numGroupCols, AttrNumber *grpColIdx, - double numGroups, - Plan *lefttree); + int numGroupCols, AttrNumber *grpColIdx, + double numGroups, + Plan *lefttree); extern Material *make_material(List *tlist, Plan *lefttree); extern Plan *materialize_finished_plan(Plan *subplan); extern Unique *make_unique(List *tlist, Plan *lefttree, List *distinctList); @@ -59,16 +59,16 @@ extern void add_base_rels_to_query(Query *root, Node *jtnode); extern void build_base_rel_tlists(Query *root, List *final_tlist); extern Relids distribute_quals_to_rels(Query *root, Node *jtnode); extern void process_implied_equality(Query *root, - Node *item1, Node *item2, - Oid sortop1, Oid sortop2, - Relids item1_relids, Relids item2_relids, - bool delete_it); + Node *item1, Node *item2, + Oid sortop1, Oid sortop2, + Relids item1_relids, Relids item2_relids, + bool delete_it); /* * prototypes for plan/setrefs.c */ extern void set_plan_references(Plan *plan, List *rtable); extern void fix_opfuncids(Node *node); -extern void set_opfuncid(OpExpr *opexpr); +extern void set_opfuncid(OpExpr * opexpr); #endif /* PLANMAIN_H */ diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index 52d045c51a4..f25a3c79e33 100644 --- a/src/include/optimizer/prep.h +++ b/src/include/optimizer/prep.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: prep.h,v 1.39 2003/04/24 23:43:09 tgl Exp $ + * $Id: prep.h,v 1.40 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,7 +53,7 @@ extern Plan *plan_set_operations(Query *parse); extern List *find_all_inheritors(Oid parentrel); extern List *expand_inherited_rtentry(Query *parse, Index rti, - bool dup_parent); + bool dup_parent); extern Node *adjust_inherited_attrs(Node *node, Index old_rt_index, Oid old_relid, diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h index 19c3435c3e5..c4a04bf9485 100644 --- a/src/include/optimizer/restrictinfo.h +++ b/src/include/optimizer/restrictinfo.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: restrictinfo.h,v 1.17 2003/06/15 22:51:45 tgl Exp $ + * $Id: restrictinfo.h,v 1.18 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,11 +21,11 @@ extern List *get_actual_clauses(List *restrictinfo_list); extern void get_actual_join_clauses(List *restrictinfo_list, List **joinquals, List **otherquals); extern List *remove_redundant_join_clauses(Query *root, - List *restrictinfo_list, - JoinType jointype); + List *restrictinfo_list, + JoinType jointype); extern List *select_nonredundant_join_clauses(Query *root, - List *restrictinfo_list, - List *reference_list, - JoinType jointype); + List *restrictinfo_list, + List *reference_list, + JoinType jointype); #endif /* RESTRICTINFO_H */ diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index d22c78f8d8e..cdca747f7b9 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tlist.h,v 1.36 2003/06/29 23:05:05 tgl Exp $ + * $Id: tlist.h,v 1.37 2003/08/04 00:43:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,6 +30,6 @@ extern TargetEntry *get_sortgroupclause_tle(SortClause *sortClause, extern Node *get_sortgroupclause_expr(SortClause *sortClause, List *targetList); extern List *get_sortgrouplist_exprs(List *sortClauses, - List *targetList); + List *targetList); #endif /* TLIST_H */ |