diff options
| author | Bruce Momjian <bruce@momjian.us> | 1999-02-15 05:50:02 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1999-02-15 05:50:02 +0000 |
| commit | 56bb23a8fec1e27a22b8934826f21748a384683f (patch) | |
| tree | 2f6637323d73bdb062ae44b1db95f5ed451e9211 /src/backend | |
| parent | 50034a852d6d61ccfe7b139fd6d1b032e1255c91 (diff) | |
| download | postgresql-56bb23a8fec1e27a22b8934826f21748a384683f.tar.gz postgresql-56bb23a8fec1e27a22b8934826f21748a384683f.zip | |
optimizer rename
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/optimizer/path/allpaths.c | 5 | ||||
| -rw-r--r-- | src/backend/optimizer/path/indxpath.c | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index 4051579be80..a57c939edf0 100644 --- a/src/backend/optimizer/path/allpaths.c +++ b/src/backend/optimizer/path/allpaths.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.38 1999/02/15 05:28:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.39 1999/02/15 05:49:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -248,7 +248,10 @@ make_one_rel_by_joins(Query *root, List *rels, int levels_needed) root->join_rel_list = rels = joined_rels; } +#ifdef NOT_USED Assert(BushyPlanFlag || length(rels) == 1); +#endif + Assert(length(rels) == 1); #ifdef NOT_USED if (BushyPlanFlag) diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index c4350795cf8..ff8040b4627 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.49 1999/02/15 05:28:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.50 1999/02/15 05:50:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,7 +67,7 @@ static List *indexable_joinclauses(RelOptInfo *rel, RelOptInfo *index, List *joininfo_list, List *restrictinfo_list); static List *index_innerjoin(Query *root, RelOptInfo *rel, List *clausegroup_list, RelOptInfo *index); -static List *create_index_paths(Query *root, RelOptInfo *rel, RelOptInfo *index, +static List *create_index_path_group(Query *root, RelOptInfo *rel, RelOptInfo *index, List *clausegroup_list, bool join); static List *add_index_paths(List *indexpaths, List *new_indexpaths); static bool function_index_operand(Expr *funcOpnd, RelOptInfo *rel, RelOptInfo *index); @@ -152,7 +152,7 @@ create_index_paths(Query *root, scanpaths = NIL; if (scanclausegroups != NIL) - scanpaths = create_index_paths(root, + scanpaths = create_index_path_group(root, rel, index, scanclausegroups, @@ -170,7 +170,7 @@ create_index_paths(Query *root, if (joinclausegroups != NIL) { - joinpaths = create_index_paths(root, rel, + joinpaths = create_index_path_group(root, rel, index, joinclausegroups, true); @@ -1330,7 +1330,7 @@ index_innerjoin(Query *root, RelOptInfo *rel, List *clausegroup_list, } /* - * create_index_paths + * create_index_path_group * Creates a list of index path nodes for each group of clauses * (restriction or join) that can be used in conjunction with an index. * @@ -1344,11 +1344,11 @@ index_innerjoin(Query *root, RelOptInfo *rel, List *clausegroup_list, * */ static List * -create_index_paths(Query *root, - RelOptInfo *rel, - RelOptInfo *index, - List *clausegroup_list, - bool join) +create_index_path_group(Query *root, + RelOptInfo *rel, + RelOptInfo *index, + List *clausegroup_list, + bool join) { List *clausegroup = NIL; List *ip_list = NIL; |