diff options
Diffstat (limited to 'src/include/optimizer')
23 files changed, 83 insertions, 104 deletions
diff --git a/src/include/optimizer/_deadcode/xfunc.h b/src/include/optimizer/_deadcode/xfunc.h index 0fcba3f60cd..8d14f90288a 100644 --- a/src/include/optimizer/_deadcode/xfunc.h +++ b/src/include/optimizer/_deadcode/xfunc.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: xfunc.h,v 1.5 2001/01/24 19:43:26 momjian Exp $ + * $Id: xfunc.h,v 1.6 2001/10/25 05:50:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,5 +79,4 @@ extern bool xfunc_copyrel(RelOptInfo *from, RelOptInfo **to); * function prototypes for path/predmig.c */ extern bool xfunc_do_predmig(Path root); - #endif /* XFUNC_H */ diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index 1ed5c25cd79..366e3821169 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.45 2001/07/31 17:56:31 tgl Exp $ + * $Id: clauses.h,v 1.46 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -71,5 +71,4 @@ extern void query_tree_mutator(Query *query, Node *(*mutator) (), #define is_subplan(clause) ((clause) != NULL && \ IsA(clause, Expr) && \ ((Expr *) (clause))->opType == SUBPLAN_EXPR) - #endif /* CLAUSES_H */ diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index 83b039c99de..b163505875e 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.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: cost.h,v 1.40 2001/06/05 05:26:05 tgl Exp $ + * $Id: cost.h,v 1.41 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,26 +53,26 @@ extern bool enable_mergejoin; extern bool enable_hashjoin; extern void cost_seqscan(Path *path, Query *root, - RelOptInfo *baserel); + RelOptInfo *baserel); extern void cost_index(Path *path, Query *root, - RelOptInfo *baserel, IndexOptInfo *index, - List *indexQuals, bool is_injoin); + RelOptInfo *baserel, IndexOptInfo *index, + List *indexQuals, bool is_injoin); extern void cost_tidscan(Path *path, Query *root, - RelOptInfo *baserel, List *tideval); + RelOptInfo *baserel, List *tideval); extern void cost_sort(Path *path, Query *root, - List *pathkeys, double tuples, int width); + List *pathkeys, double tuples, int width); extern void cost_nestloop(Path *path, Query *root, - Path *outer_path, Path *inner_path, - List *restrictlist); + Path *outer_path, Path *inner_path, + List *restrictlist); extern void cost_mergejoin(Path *path, Query *root, - Path *outer_path, Path *inner_path, - List *restrictlist, - List *mergeclauses, - List *outersortkeys, List *innersortkeys); + Path *outer_path, Path *inner_path, + List *restrictlist, + List *mergeclauses, + List *outersortkeys, List *innersortkeys); extern void cost_hashjoin(Path *path, Query *root, - Path *outer_path, Path *inner_path, - List *restrictlist, - List *hashclauses); + Path *outer_path, Path *inner_path, + List *restrictlist, + List *hashclauses); extern Cost cost_qual_eval(List *quals); extern void set_baserel_size_estimates(Query *root, RelOptInfo *rel); extern void set_joinrel_size_estimates(Query *root, RelOptInfo *rel, @@ -92,7 +92,6 @@ extern Selectivity clauselist_selectivity(Query *root, List *clauses, int varRelid); extern Selectivity clause_selectivity(Query *root, - Node *clause, - int varRelid); - + Node *clause, + int varRelid); #endif /* COST_H */ diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h index 34b7065f76c..8b8e7a59534 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.24 2001/03/22 04:00:53 momjian Exp $ + * $Id: geqo.h,v 1.25 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,5 +76,4 @@ extern Cost geqo_eval(Query *root, List *initial_rels, extern RelOptInfo *gimme_tree(Query *root, List *initial_rels, Gene *tour, int num_gene, int rel_count, RelOptInfo *old_rel); - #endif /* GEQO_H */ diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h index 80298618782..15d7ba4c920 100644 --- a/src/include/optimizer/geqo_copy.h +++ b/src/include/optimizer/geqo_copy.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_copy.h,v 1.9 2001/01/24 19:43:26 momjian Exp $ + * $Id: geqo_copy.h,v 1.10 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,5 +25,4 @@ #include "optimizer/geqo_gene.h" extern void geqo_copy(Chromosome *chromo1, Chromosome *chromo2, int string_length); - #endif /* GEQO_COPY_H */ diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h index 3ade00bf4a6..528ba2bce16 100644 --- a/src/include/optimizer/geqo_gene.h +++ b/src/include/optimizer/geqo_gene.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_gene.h,v 1.10 2001/01/24 19:43:26 momjian Exp $ + * $Id: geqo_gene.h,v 1.11 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,5 +41,4 @@ typedef struct Pool int size; int string_length; } Pool; - #endif /* GEQO_GENE_H */ diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index a1a893afd83..24c7b7a351b 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.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_misc.h,v 1.15 2001/01/24 19:43:26 momjian Exp $ + * $Id: geqo_misc.h,v 1.16 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,5 +32,4 @@ 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_path(Query *root, Path *path, int indent); extern void geqo_print_joinclauses(Query *root, List *clauses); - #endif /* GEQO_MISC_H */ diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h index 63a2295979d..85d2879ad6c 100644 --- a/src/include/optimizer/geqo_mutation.h +++ b/src/include/optimizer/geqo_mutation.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_mutation.h,v 1.9 2001/01/24 19:43:26 momjian Exp $ + * $Id: geqo_mutation.h,v 1.10 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,5 +25,4 @@ #include "optimizer/geqo_gene.h" extern void geqo_mutation(Gene *tour, int num_gene); - #endif /* GEQO_MUTATION_H */ diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h index 264bacba8f3..6f0db6a7e29 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.12 2001/03/22 04:00:54 momjian Exp $ + * $Id: geqo_pool.h,v 1.13 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,5 +37,4 @@ extern void free_chromo(Chromosome *chromo); extern void spread_chromo(Chromosome *chromo, Pool *pool); extern void sort_pool(Pool *pool); - #endif /* GEQO_POOL_H */ diff --git a/src/include/optimizer/geqo_random.h b/src/include/optimizer/geqo_random.h index df66fbf9849..c9293c8f62b 100644 --- a/src/include/optimizer/geqo_random.h +++ b/src/include/optimizer/geqo_random.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_random.h,v 1.8 2001/01/24 19:43:26 momjian Exp $ + * $Id: geqo_random.h,v 1.9 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,5 +34,4 @@ #define geqo_randint(upper,lower) \ ( (int) floor( geqo_rand()*(((upper)-(lower))+0.999999) ) + (lower) ) - #endif /* GEQO_RANDOM_H */ diff --git a/src/include/optimizer/geqo_recombination.h b/src/include/optimizer/geqo_recombination.h index 5dd2362403e..3b99c1b432e 100644 --- a/src/include/optimizer/geqo_recombination.h +++ b/src/include/optimizer/geqo_recombination.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_recombination.h,v 1.9 2001/01/24 19:43:26 momjian Exp $ + * $Id: geqo_recombination.h,v 1.10 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -77,5 +77,4 @@ extern void ox1(Gene *mom, Gene *dad, Gene *offspring, int num_gene, City *city_ /* order crossover [OX2] according to Syswerda */ extern void ox2(Gene *mom, Gene *dad, Gene *offspring, int num_gene, City *city_table); - #endif /* GEQO_RECOMBINATION_H */ diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h index 44bee7a56f4..a3d94f7cdfa 100644 --- a/src/include/optimizer/geqo_selection.h +++ b/src/include/optimizer/geqo_selection.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_selection.h,v 1.9 2001/01/24 19:43:26 momjian Exp $ + * $Id: geqo_selection.h,v 1.10 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,5 +26,4 @@ #include "optimizer/geqo_gene.h" extern void geqo_selection(Chromosome *momma, Chromosome *daddy, Pool *pool, double bias); - #endif /* GEQO_SELECTION_H */ diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h index be55d97b031..9573a2ce510 100644 --- a/src/include/optimizer/joininfo.h +++ b/src/include/optimizer/joininfo.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: joininfo.h,v 1.17 2001/01/24 19:43:26 momjian Exp $ + * $Id: joininfo.h,v 1.18 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,5 +17,4 @@ #include "nodes/relation.h" extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids); - #endif /* JOININFO_H */ diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index 8979c0d947c..4de4ffa3675 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.38 2001/06/05 05:26:05 tgl Exp $ + * $Id: pathnode.h,v 1.39 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,36 +33,36 @@ extern IndexPath *create_index_path(Query *root, RelOptInfo *rel, List *pathkeys, ScanDirection indexscandir); extern TidPath *create_tidscan_path(Query *root, RelOptInfo *rel, - List *tideval); + List *tideval); extern AppendPath *create_append_path(RelOptInfo *rel, List *subpaths); extern Path *create_subqueryscan_path(RelOptInfo *rel); extern NestPath *create_nestloop_path(Query *root, - RelOptInfo *joinrel, - JoinType jointype, - Path *outer_path, - Path *inner_path, - List *restrict_clauses, - List *pathkeys); + RelOptInfo *joinrel, + JoinType jointype, + Path *outer_path, + Path *inner_path, + List *restrict_clauses, + List *pathkeys); extern MergePath *create_mergejoin_path(Query *root, - RelOptInfo *joinrel, - JoinType jointype, - Path *outer_path, - Path *inner_path, - List *restrict_clauses, - List *pathkeys, - List *mergeclauses, - List *outersortkeys, - List *innersortkeys); + RelOptInfo *joinrel, + JoinType jointype, + Path *outer_path, + Path *inner_path, + List *restrict_clauses, + List *pathkeys, + List *mergeclauses, + List *outersortkeys, + List *innersortkeys); extern HashPath *create_hashjoin_path(Query *root, - RelOptInfo *joinrel, - JoinType jointype, - Path *outer_path, - Path *inner_path, - List *restrict_clauses, - List *hashclauses); + RelOptInfo *joinrel, + JoinType jointype, + Path *outer_path, + Path *inner_path, + List *restrict_clauses, + List *hashclauses); /* * prototypes for relnode.c @@ -71,9 +71,8 @@ extern RelOptInfo *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, - 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 1dcb2cc2730..0d57d89bbbb 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.56 2001/10/18 16:11:42 tgl Exp $ + * $Id: paths.h,v 1.57 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -41,7 +41,7 @@ extern void debug_print_rel(Query *root, RelOptInfo *rel); */ extern void create_index_paths(Query *root, RelOptInfo *rel); extern Oid indexable_operator(Expr *clause, Oid opclass, - bool indexkey_on_left); + bool indexkey_on_left); extern List *extract_or_indexqual_conditions(RelOptInfo *rel, IndexOptInfo *index, Expr *orsubclause); @@ -88,10 +88,12 @@ extern RelOptInfo *make_jointree_rel(Query *root, Node *jtnode); */ typedef enum { - PATHKEYS_EQUAL, /* pathkeys are identical */ - PATHKEYS_BETTER1, /* pathkey 1 is a superset of pathkey 2 */ - PATHKEYS_BETTER2, /* vice versa */ - PATHKEYS_DIFFERENT /* neither pathkey includes the other */ + PATHKEYS_EQUAL, /* pathkeys are identical */ + PATHKEYS_BETTER1, /* pathkey 1 is a superset of + * pathkey 2 */ + PATHKEYS_BETTER2, /* vice versa */ + PATHKEYS_DIFFERENT /* neither pathkey includes the + * other */ } PathKeysComparison; extern void add_equijoined_keys(Query *root, RestrictInfo *restrictinfo); @@ -116,7 +118,7 @@ extern List *build_join_pathkeys(Query *root, extern List *make_pathkeys_for_sortclauses(List *sortclauses, List *tlist); extern void cache_mergeclause_pathkeys(Query *root, - RestrictInfo *restrictinfo); + RestrictInfo *restrictinfo); extern List *find_mergeclauses_for_pathkeys(Query *root, List *pathkeys, List *restrictinfos); @@ -130,5 +132,4 @@ extern int pathkeys_useful_for_ordering(Query *root, List *pathkeys); extern List *truncate_useless_pathkeys(Query *root, RelOptInfo *rel, List *pathkeys); - #endif /* PATHS_H */ diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index a103f51e3f1..1f60ee18df3 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.23 2001/05/20 20:28:20 tgl Exp $ + * $Id: plancat.h,v 1.24 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ extern void get_relation_info(Oid relationObjectId, - bool *hasindex, long *pages, double *tuples); + bool *hasindex, long *pages, double *tuples); extern List *find_secondary_indexes(Oid relationObjectId); @@ -29,12 +29,11 @@ extern bool has_subclass(Oid relationId); extern bool has_unique_index(RelOptInfo *rel, AttrNumber attno); extern Selectivity restriction_selectivity(Query *root, - Oid operator, - List *args, - int varRelid); + Oid operator, + List *args, + int varRelid); extern Selectivity join_selectivity(Query *root, - Oid operator, - List *args); - + Oid operator, + List *args); #endif /* PLANCAT_H */ diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 974dd9a4572..8831bb45d28 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.51 2001/06/05 05:26:05 tgl Exp $ + * $Id: planmain.h,v 1.52 2001/10/25 05:50:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,9 +30,9 @@ 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(Query *root, List *tlist, - Plan *lefttree, int keycount); + Plan *lefttree, int keycount); extern Sort *make_sort_from_pathkeys(Query *root, List *tlist, - Plan *lefttree, List *pathkeys); + Plan *lefttree, 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); @@ -67,5 +67,4 @@ extern void fix_opids(Node *node); extern bool _use_keyset_query_optimizer; extern void transformKeySetQuery(Query *origNode); - #endif /* PLANMAIN_H */ diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h index 4a118482423..acd6ff53260 100644 --- a/src/include/optimizer/planner.h +++ b/src/include/optimizer/planner.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: planner.h,v 1.20 2001/06/05 05:26:05 tgl Exp $ + * $Id: planner.h,v 1.21 2001/10/25 05:50:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,6 +22,5 @@ extern Plan *planner(Query *parse); extern Plan *subquery_planner(Query *parse, double tuple_fraction); extern Plan *make_sortplan(Query *parse, List *tlist, - Plan *plannode, List *sortcls); - + Plan *plannode, List *sortcls); #endif /* PLANNER_H */ diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index 1888248ed53..e4a55e662c4 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.28 2001/05/20 20:28:20 tgl Exp $ + * $Id: prep.h,v 1.29 2001/10/25 05:50:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,10 +37,9 @@ extern Plan *plan_set_operations(Query *parse); extern List *find_all_inheritors(Oid parentrel); extern List *expand_inherted_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, 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 084d8e61560..186cf288326 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.11 2001/03/22 04:00:56 momjian Exp $ + * $Id: restrictinfo.h,v 1.12 2001/10/25 05:50:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,5 +20,4 @@ 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); - #endif /* RESTRICTINFO_H */ diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h index 9c56a7592ba..a56fed5914e 100644 --- a/src/include/optimizer/subselect.h +++ b/src/include/optimizer/subselect.h @@ -17,5 +17,4 @@ extern int PlannerPlanId; /* to assign unique ID to subquery plans */ extern List *SS_finalize_plan(Plan *plan); extern Node *SS_replace_correlation_vars(Node *expr); extern Node *SS_process_sublinks(Node *expr); - #endif /* SUBSELECT_H */ diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index 5d4e6a02d84..796649d5964 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.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: tlist.h,v 1.28 2001/01/24 19:43:26 momjian Exp $ + * $Id: tlist.h,v 1.29 2001/10/25 05:50:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,5 +32,4 @@ extern TargetEntry *get_sortgroupclause_tle(SortClause *sortClause, List *targetList); extern Node *get_sortgroupclause_expr(SortClause *sortClause, List *targetList); - #endif /* TLIST_H */ diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h index 4cad677c7ce..536fc839e10 100644 --- a/src/include/optimizer/var.h +++ b/src/include/optimizer/var.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: var.h,v 1.14 2001/05/09 23:13:36 tgl Exp $ + * $Id: var.h,v 1.15 2001/10/25 05:50:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,9 +18,8 @@ extern List *pull_varnos(Node *node); extern bool contain_var_reference(Node *node, int varno, int varattno, - int levelsup); + int levelsup); extern bool contain_whole_tuple_var(Node *node, int varno, int levelsup); extern bool contain_var_clause(Node *node); extern List *pull_var_clause(Node *node, bool includeUpperVars); - #endif /* VAR_H */ |