diff options
| author | Bruce Momjian | 1999-05-25 22:43:53 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1999-05-25 22:43:53 +0000 |
| commit | fcff1cdf4eadbc6dcba4b9a2cd09f38f466ffa31 (patch) | |
| tree | 5b4a877bed2a5229075e0e2a37c6f1431599ada6 /src/include/optimizer | |
| parent | 4eadfe875440759bf062b02857ff196ab95d6fbc (diff) | |
Another pgindent run. Sorry folks.
Diffstat (limited to 'src/include/optimizer')
| -rw-r--r-- | src/include/optimizer/clauses.h | 4 | ||||
| -rw-r--r-- | src/include/optimizer/cost.h | 6 | ||||
| -rw-r--r-- | src/include/optimizer/geqo.h | 4 | ||||
| -rw-r--r-- | src/include/optimizer/geqo_misc.h | 4 | ||||
| -rw-r--r-- | src/include/optimizer/joininfo.h | 4 | ||||
| -rw-r--r-- | src/include/optimizer/keys.h | 4 | ||||
| -rw-r--r-- | src/include/optimizer/pathnode.h | 18 | ||||
| -rw-r--r-- | src/include/optimizer/paths.h | 12 | ||||
| -rw-r--r-- | src/include/optimizer/restrictinfo.h | 4 | ||||
| -rw-r--r-- | src/include/optimizer/tlist.h | 4 | ||||
| -rw-r--r-- | src/include/optimizer/xfunc.h | 12 |
11 files changed, 38 insertions, 38 deletions
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index 5766e8933e0..78605c20c96 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: clauses.h,v 1.17 1999/05/25 16:14:15 momjian Exp $ + * $Id: clauses.h,v 1.18 1999/05/25 22:43:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -38,7 +38,7 @@ extern Expr *make_andclause(List *andclauses); extern bool case_clause(Node *clause); extern List *pull_constant_clauses(List *quals, List **constantQual); -extern void clause_get_relids_vars(Node *clause, Relids * relids, List **vars); +extern void clause_get_relids_vars(Node *clause, Relids *relids, List **vars); extern int NumRelids(Node *clause); extern bool contains_not(Node *clause); extern bool is_joinable(Node *clause); diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index 5146900e4d7..e7f8452f246 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: cost.h,v 1.19 1999/05/25 16:14:16 momjian Exp $ + * $Id: cost.h,v 1.20 1999/05/25 22:43:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,8 +43,8 @@ extern Cost cost_mergejoin(Cost outercost, Cost innercost, extern Cost cost_hashjoin(Cost outercost, Cost innercost, List *outerkeys, List *innerkeys, int outersize, int innersize, int outerwidth, int innerwidth); -extern int compute_rel_size(RelOptInfo * rel); -extern int compute_rel_width(RelOptInfo * rel); +extern int compute_rel_size(RelOptInfo *rel); +extern int compute_rel_width(RelOptInfo *rel); extern int compute_joinrel_size(JoinPath *joinpath); extern int page_size(int tuples, int width); diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h index c2eba475035..f02510e21e9 100644 --- a/src/include/optimizer/geqo.h +++ b/src/include/optimizer/geqo.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo.h,v 1.15 1999/05/25 16:14:16 momjian Exp $ + * $Id: geqo.h,v 1.16 1999/05/25 22:43:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -72,6 +72,6 @@ extern void geqo_params(int string_length); extern void geqo_eval_startup(void); extern Cost geqo_eval(Query *root, Gene *tour, int num_gene); extern RelOptInfo *gimme_tree(Query *root, Gene *tour, int rel_count, - int num_gene, RelOptInfo * old_rel); + int num_gene, RelOptInfo *old_rel); #endif /* GEQO_H */ diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index 1e610ba8d08..9fadc318d44 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_misc.h,v 1.10 1999/05/25 16:14:17 momjian Exp $ + * $Id: geqo_misc.h,v 1.11 1999/05/25 22:43:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,7 @@ 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); -extern void geqo_print_rel(Query *root, RelOptInfo * rel); +extern void geqo_print_rel(Query *root, RelOptInfo *rel); extern void geqo_print_path(Query *root, Path *path, int indent); extern void geqo_print_joinclauses(Query *root, List *clauses); diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h index 2b4e214e24e..3a4451dd356 100644 --- a/src/include/optimizer/joininfo.h +++ b/src/include/optimizer/joininfo.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: joininfo.h,v 1.11 1999/05/25 16:14:19 momjian Exp $ + * $Id: joininfo.h,v 1.12 1999/05/25 22:43:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ #include "nodes/primnodes.h" extern JoinInfo *joininfo_member(List *join_relids, List *joininfo_list); -extern JoinInfo *find_joininfo_node(RelOptInfo * this_rel, List *join_relids); +extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids); extern Var *other_join_clause_var(Var *var, Expr *clause); #endif /* JOININFO_H */ diff --git a/src/include/optimizer/keys.h b/src/include/optimizer/keys.h index cccdb7bfbbb..423b8e42161 100644 --- a/src/include/optimizer/keys.h +++ b/src/include/optimizer/keys.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: keys.h,v 1.14 1999/05/25 16:14:19 momjian Exp $ + * $Id: keys.h,v 1.15 1999/05/25 22:43:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,7 +16,7 @@ #include "nodes/nodes.h" #include "nodes/relation.h" -extern bool match_indexkey_operand(int indexkey, Var *operand, RelOptInfo * rel); +extern bool match_indexkey_operand(int indexkey, Var *operand, RelOptInfo *rel); extern Var *extract_join_key(JoinKey *jk, int outer_or_inner); extern bool pathkeys_match(List *keys1, List *keys2, int *better_key); extern List *collect_index_pathkeys(int *index_keys, List *tlist); diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index 2a864d591a5..d7019fc4461 100644 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pathnode.h,v 1.16 1999/05/25 16:14:20 momjian Exp $ + * $Id: pathnode.h,v 1.17 1999/05/25 22:43:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,20 +21,20 @@ * prototypes for pathnode.c */ extern bool path_is_cheaper(Path *path1, Path *path2); -extern Path *set_cheapest(RelOptInfo * parent_rel, List *pathlist); -extern List *add_pathlist(RelOptInfo * parent_rel, List *unique_paths, +extern Path *set_cheapest(RelOptInfo *parent_rel, List *pathlist); +extern List *add_pathlist(RelOptInfo *parent_rel, List *unique_paths, List *new_paths); -extern Path *create_seqscan_path(RelOptInfo * rel); -extern IndexPath *create_index_path(Query *root, RelOptInfo * rel, RelOptInfo * index, +extern Path *create_seqscan_path(RelOptInfo *rel); +extern IndexPath *create_index_path(Query *root, RelOptInfo *rel, RelOptInfo *index, List *restriction_clauses, bool is_join_scan); -extern NestPath *create_nestloop_path(RelOptInfo * joinrel, RelOptInfo * outer_rel, +extern NestPath *create_nestloop_path(RelOptInfo *joinrel, RelOptInfo *outer_rel, Path *outer_path, Path *inner_path, List *pathkeys); -extern MergePath *create_mergejoin_path(RelOptInfo * joinrel, int outersize, +extern MergePath *create_mergejoin_path(RelOptInfo *joinrel, int outersize, int innersize, int outerwidth, int innerwidth, Path *outer_path, Path *inner_path, List *pathkeys, MergeOrder *order, List *mergeclauses, List *outersortkeys, List *innersortkeys); -extern HashPath *create_hashjoin_path(RelOptInfo * joinrel, int outersize, +extern HashPath *create_hashjoin_path(RelOptInfo *joinrel, int outersize, int innersize, int outerwidth, int innerwidth, Path *outer_path, Path *inner_path, List *pathkeys, Oid operator, List *hashclauses, List *outerkeys, List *innerkeys); @@ -49,6 +49,6 @@ extern RelOptInfo *get_join_rel(Query *root, Relids relid); /* * prototypes for indexnode.h */ -extern List *find_relation_indices(Query *root, RelOptInfo * rel); +extern List *find_relation_indices(Query *root, RelOptInfo *rel); #endif /* PATHNODE_H */ diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index 1a92130e860..203a988327e 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: paths.h,v 1.28 1999/05/25 16:14:21 momjian Exp $ + * $Id: paths.h,v 1.29 1999/05/25 22:43:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,7 @@ extern RelOptInfo *make_one_rel(Query *root, List *rels); * indxpath.h * routines to generate index paths */ -extern List *create_index_paths(Query *root, RelOptInfo * rel, List *indices, +extern List *create_index_paths(Query *root, RelOptInfo *rel, List *indices, List *restrictinfo_list, List *joininfo_list); @@ -41,7 +41,7 @@ extern void update_rels_pathlist_for_joins(Query *root, List *joinrels); /* * orindxpath.h */ -extern List *create_or_index_paths(Query *root, RelOptInfo * rel, List *clauses); +extern List *create_or_index_paths(Query *root, RelOptInfo *rel, List *clauses); /* * hashutils.h @@ -79,11 +79,11 @@ extern MergeInfo *match_order_mergeinfo(PathOrder *ordering, * routines to determine which relations to join */ extern List *make_rels_by_joins(Query *root, List *old_rels); -extern List *make_rels_by_clause_joins(Query *root, RelOptInfo * old_rel, +extern List *make_rels_by_clause_joins(Query *root, RelOptInfo *old_rel, List *joininfo_list, Relids only_relids); -extern List *make_rels_by_clauseless_joins(RelOptInfo * old_rel, +extern List *make_rels_by_clauseless_joins(RelOptInfo *old_rel, List *inner_rels); -extern RelOptInfo *make_join_rel(RelOptInfo * outer_rel, RelOptInfo * inner_rel, JoinInfo * joininfo); +extern RelOptInfo *make_join_rel(RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinInfo *joininfo); extern List *new_join_tlist(List *tlist, int first_resdomno); extern RelOptInfo *get_cheapest_complete_rel(List *join_rel_list); diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h index 9b1346c31d0..0d1e741bc21 100644 --- a/src/include/optimizer/restrictinfo.h +++ b/src/include/optimizer/restrictinfo.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: restrictinfo.h,v 1.3 1999/05/25 16:14:22 momjian Exp $ + * $Id: restrictinfo.h,v 1.4 1999/05/25 22:43:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,7 +16,7 @@ #include "nodes/pg_list.h" #include "nodes/relation.h" -extern bool valid_or_clause(RestrictInfo * restrictinfo); +extern bool valid_or_clause(RestrictInfo *restrictinfo); extern List *get_actual_clauses(List *restrictinfo_list); extern void get_relattvals(List *restrictinfo_list, List **attnos, List **values, List **flags); diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index b4d3d212562..de57eb59ddb 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tlist.h,v 1.17 1999/05/25 16:14:23 momjian Exp $ + * $Id: tlist.h,v 1.18 1999/05/25 22:43:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ extern TargetEntry *tlistentry_member(Var *var, List *targetlist); extern Expr *matching_tlist_var(Var *var, List *targetlist); -extern void add_var_to_tlist(RelOptInfo * rel, Var *var); +extern void add_var_to_tlist(RelOptInfo *rel, Var *var); extern TargetEntry *create_tl_element(Var *var, int resdomno); extern List *get_actual_tlist(List *tlist); extern Resdom *tlist_member(Var *var, List *tlist); diff --git a/src/include/optimizer/xfunc.h b/src/include/optimizer/xfunc.h index 7c5082746c6..41414dba4df 100644 --- a/src/include/optimizer/xfunc.h +++ b/src/include/optimizer/xfunc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: xfunc.h,v 1.17 1999/05/25 16:14:23 momjian Exp $ + * $Id: xfunc.h,v 1.18 1999/05/25 22:43:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,10 +49,10 @@ extern int XfuncMode; /* defined in tcop/postgres.c */ #define is_join(pathnode) (length(get_relids(get_parent(pathnode))) > 1 ? 1 : 0) /* function prototypes from planner/path/xfunc.c */ -extern void xfunc_trypullup(RelOptInfo * rel); +extern void xfunc_trypullup(RelOptInfo *rel); extern int xfunc_shouldpull(Path *childpath, JoinPath *parentpath, - int whichchild, RestrictInfo * maxcinfopt); -extern RestrictInfo *xfunc_pullup(Path *childpath, JoinPath *parentpath, RestrictInfo * cinfo, + int whichchild, RestrictInfo *maxcinfopt); +extern RestrictInfo *xfunc_pullup(Path *childpath, JoinPath *parentpath, RestrictInfo *cinfo, int whichchild, int clausetype); extern Cost xfunc_rank(Expr *clause); extern Cost xfunc_expense(Query *queryInfo, Expr *clause); @@ -69,7 +69,7 @@ extern List *xfunc_primary_join(JoinPath *pathnode); extern Cost xfunc_get_path_cost(Path *pathnode); extern Cost xfunc_total_path_cost(JoinPath *pathnode); extern Cost xfunc_expense_per_tuple(JoinPath *joinnode, int whichchild); -extern void xfunc_fixvars(Expr *clause, RelOptInfo * rel, int varno); +extern void xfunc_fixvars(Expr *clause, RelOptInfo *rel, int varno); extern int xfunc_cinfo_compare(void *arg1, void *arg2); extern int xfunc_clause_compare(void *arg1, void *arg2); extern void xfunc_disjunct_sort(List *clause_list); @@ -78,7 +78,7 @@ extern int xfunc_func_width(RegProcedure funcid, List *args); extern int xfunc_tuple_width(Relation rd); extern int xfunc_num_join_clauses(JoinPath *path); extern List *xfunc_LispRemove(List *foo, List *bar); -extern bool xfunc_copyrel(RelOptInfo * from, RelOptInfo ** to); +extern bool xfunc_copyrel(RelOptInfo *from, RelOptInfo **to); /* * function prototypes for path/predmig.c |
