diff options
Diffstat (limited to 'src/backend/optimizer/path')
| -rw-r--r-- | src/backend/optimizer/path/allpaths.c | 8 | ||||
| -rw-r--r-- | src/backend/optimizer/path/costsize.c | 4 | ||||
| -rw-r--r-- | src/backend/optimizer/path/joinpath.c | 3 | ||||
| -rw-r--r-- | src/backend/optimizer/path/predmig.c | 52 | ||||
| -rw-r--r-- | src/backend/optimizer/path/prune.c | 8 | ||||
| -rw-r--r-- | src/backend/optimizer/path/xfunc.c | 42 |
6 files changed, 59 insertions, 58 deletions
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index b5bc531bf4e..17ebbec5471 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.29 1999/02/12 06:43:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.30 1999/02/12 17:24:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -302,7 +302,7 @@ static void print_path(Query *root, Path *path, int indent) { char *ptype = NULL; - NestPath *jp; + JoinPath *jp; bool join = false; int i; @@ -338,7 +338,7 @@ print_path(Query *root, Path *path, int indent) { int size = path->parent->size; - jp = (NestPath *) path; + jp = (JoinPath *) path; printf("%s size=%d cost=%f\n", ptype, size, path->path_cost); switch (nodeTag(path)) { @@ -347,7 +347,7 @@ print_path(Query *root, Path *path, int indent) for (i = 0; i < indent + 1; i++) printf("\t"); printf(" clauses=("); - print_joinclauses(root, ((NestPath *) path)->pathinfo); + print_joinclauses(root, ((JoinPath *) path)->pathinfo); printf(")\n"); if (nodeTag(path) == T_MergePath) diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index a3a04b072bf..8328ce8b2d1 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.30 1999/02/12 06:43:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.31 1999/02/12 17:24:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -435,7 +435,7 @@ compute_attribute_width(TargetEntry *tlistentry) * Returns a fixnum. */ int -compute_joinrel_size(NestPath *joinpath) +compute_joinrel_size(JoinPath *joinpath) { Cost temp = 1.0; int temp1 = 0; diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c index 64ad7554b5a..e2e492922ca 100644 --- a/src/backend/optimizer/path/joinpath.c +++ b/src/backend/optimizer/path/joinpath.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.21 1999/02/12 06:43:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.22 1999/02/12 17:24:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -372,6 +372,7 @@ match_unsorted_outer(RelOptInfo *joinrel, innerrel->pathlist, INNER); + /* Should we use the mergeinner, or sort the cheapest inner? */ path_is_cheaper_than_sort = (bool) (mergeinnerpath && (mergeinnerpath->path_cost < (cheapest_inner->path_cost + diff --git a/src/backend/optimizer/path/predmig.c b/src/backend/optimizer/path/predmig.c index 7b5ba49a452..807331ef1e1 100644 --- a/src/backend/optimizer/path/predmig.c +++ b/src/backend/optimizer/path/predmig.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/predmig.c,v 1.16 1999/02/12 06:43:31 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/predmig.c,v 1.17 1999/02/12 17:24:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,13 +53,13 @@ * (not a join) iff it has * a non-NULL cinfo field */ -static void xfunc_predmig(NestPath pathnode, Stream streamroot, +static void xfunc_predmig(JoinPath pathnode, Stream streamroot, Stream laststream, bool *progressp); static bool xfunc_series_llel(Stream stream); static bool xfunc_llel_chains(Stream root, Stream bottom); static Stream xfunc_complete_stream(Stream stream); static bool xfunc_prdmig_pullup(Stream origstream, Stream pullme, - NestPath joinpath); + JoinPath joinpath); static void xfunc_form_groups(Stream root, Stream bottom); static void xfunc_free_stream(Stream root); static Stream xfunc_add_clauses(Stream current); @@ -91,8 +91,8 @@ xfunc_do_predmig(Path root) do { progress = false; - Assert(IsA(root, NestPath)); - xfunc_predmig((NestPath) root, (Stream) NULL, (Stream) NULL, + Assert(IsA(root, JoinPath)); + xfunc_predmig((JoinPath) root, (Stream) NULL, (Stream) NULL, &progress); if (changed && progress) elog(DEBUG, "Needed to do a second round of predmig!\n"); @@ -111,7 +111,7 @@ xfunc_do_predmig(Path root) ** Destructively modifies the join tree (via predicate pullup). */ static void -xfunc_predmig(NestPath pathnode,/* root of the join tree */ +xfunc_predmig(JoinPath pathnode,/* root of the join tree */ Stream streamroot, Stream laststream,/* for recursive calls -- these are the * root of the stream under construction, @@ -161,11 +161,11 @@ xfunc_predmig(NestPath pathnode,/* root of the join tree */ else { /* visit left child */ - xfunc_predmig((NestPath) get_outerjoinpath(pathnode), + xfunc_predmig((JoinPath) get_outerjoinpath(pathnode), streamroot, newstream, progressp); /* visit right child */ - xfunc_predmig((NestPath) get_innerjoinpath(pathnode), + xfunc_predmig((JoinPath) get_innerjoinpath(pathnode), streamroot, newstream, progressp); } @@ -257,7 +257,7 @@ xfunc_llel_chains(Stream root, Stream bottom) */ Assert(xfunc_num_relids(pathstream) > xfunc_num_relids(tmpstream)); progress = xfunc_prdmig_pullup(origstream, tmpstream, - (NestPath) get_pathptr(pathstream)); + (JoinPath) get_pathptr(pathstream)); } if (get_downstream(tmpstream)) pathstream = (Stream) xfunc_get_downjoin((Stream) get_downstream(tmpstream)); @@ -304,14 +304,14 @@ xfunc_complete_stream(Stream stream) /* ** xfunc_prdmig_pullup - ** pullup a clause in a path above joinpath. Since the NestPath tree + ** pullup a clause in a path above joinpath. Since the JoinPath tree ** doesn't have upward pointers, it's difficult to deal with. Thus we ** require the original stream, which maintains pointers to all the path ** nodes. We use the original stream to find out what joins are ** above the clause. */ static bool -xfunc_prdmig_pullup(Stream origstream, Stream pullme, NestPath joinpath) +xfunc_prdmig_pullup(Stream origstream, Stream pullme, JoinPath joinpath) { RestrictInfo restrictinfo = get_cinfo(pullme); bool progress = false; @@ -333,7 +333,7 @@ xfunc_prdmig_pullup(Stream origstream, Stream pullme, NestPath joinpath) /* pull up this node as far as it should go */ for (upjoin = (Stream) xfunc_get_upjoin(orignode); upjoin != (Stream) NULL - && (NestPath) get_pathptr((Stream) xfunc_get_downjoin(upjoin)) + && (JoinPath) get_pathptr((Stream) xfunc_get_downjoin(upjoin)) != joinpath; upjoin = (Stream) xfunc_get_upjoin(upjoin)) { @@ -342,12 +342,12 @@ xfunc_prdmig_pullup(Stream origstream, Stream pullme, NestPath joinpath) #endif /* move clause up in path */ if (get_pathptr((Stream) get_downstream(upjoin)) - == (pathPtr) get_outerjoinpath((NestPath) get_pathptr(upjoin))) + == (pathPtr) get_outerjoinpath((JoinPath) get_pathptr(upjoin))) whichchild = OUTER; else whichchild = INNER; restrictinfo = xfunc_pullup((Path) get_pathptr((Stream) get_downstream(upjoin)), - (NestPath) get_pathptr(upjoin), + (JoinPath) get_pathptr(upjoin), restrictinfo, whichchild, get_clausetype(orignode)); @@ -366,10 +366,10 @@ xfunc_prdmig_pullup(Stream origstream, Stream pullme, NestPath joinpath) temp = (Stream) get_downstream(temp)) set_pathptr (temp, (pathPtr) - get_outerjoinpath((NestPath) get_pathptr(upjoin))); + get_outerjoinpath((JoinPath) get_pathptr(upjoin))); set_pathptr (temp, - (pathPtr) get_outerjoinpath((NestPath) get_pathptr(upjoin))); + (pathPtr) get_outerjoinpath((JoinPath) get_pathptr(upjoin))); } else { @@ -377,10 +377,10 @@ xfunc_prdmig_pullup(Stream origstream, Stream pullme, NestPath joinpath) temp = (Stream) get_downstream(temp)) set_pathptr (temp, (pathPtr) - get_innerjoinpath((NestPath) get_pathptr(upjoin))); + get_innerjoinpath((JoinPath) get_pathptr(upjoin))); set_pathptr (temp, (pathPtr) - get_innerjoinpath((NestPath) get_pathptr(upjoin))); + get_innerjoinpath((JoinPath) get_pathptr(upjoin))); } progress = true; } @@ -425,14 +425,14 @@ xfunc_form_groups(Query *queryInfo, Stream root, Stream bottom) if (!is_clause(temp)) { if (get_pathptr((Stream) get_downstream(temp)) - == (pathPtr) get_outerjoinpath((NestPath) get_pathptr(temp))) + == (pathPtr) get_outerjoinpath((JoinPath) get_pathptr(temp))) whichchild = OUTER; else whichchild = INNER; set_groupcost(temp, - xfunc_join_expense((NestPath) get_pathptr(temp), + xfunc_join_expense((JoinPath) get_pathptr(temp), whichchild)); - if (primjoin = xfunc_primary_join((NestPath) get_pathptr(temp))) + if (primjoin = xfunc_primary_join((JoinPath) get_pathptr(temp))) { set_groupsel(temp, compute_clause_selec(queryInfo, @@ -529,10 +529,10 @@ xfunc_add_clauses(Stream current) } /* and add in the join clauses */ - if (IsA(get_pathptr(current), NestPath)) + if (IsA(get_pathptr(current), JoinPath)) { - primjoin = xfunc_primary_join((NestPath) get_pathptr(current)); - foreach(temp, get_pathrestrictinfo((NestPath) get_pathptr(current))) + primjoin = xfunc_primary_join((JoinPath) get_pathptr(current)); + foreach(temp, get_pathrestrictinfo((JoinPath) get_pathptr(current))) { if (!equal(get_clause((RestrictInfo) lfirst(temp)), primjoin)) topnode = xfunc_streaminsert((RestrictInfo) lfirst(temp), topnode, @@ -615,11 +615,11 @@ xfunc_streaminsert(RestrictInfo restrictinfo, static int xfunc_num_relids(Stream node) { - if (!node || !IsA(get_pathptr(node), NestPath)) + if (!node || !IsA(get_pathptr(node), JoinPath)) return 0; else return (length - (get_relids(get_parent((NestPath) get_pathptr(node))))); + (get_relids(get_parent((JoinPath) get_pathptr(node))))); } /* diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c index acaf397c519..af3b01bed0c 100644 --- a/src/backend/optimizer/path/prune.c +++ b/src/backend/optimizer/path/prune.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.29 1999/02/12 06:43:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.30 1999/02/12 17:24:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -92,17 +92,17 @@ rels_set_cheapest(List *rel_list) { List *x = NIL; RelOptInfo *rel = (RelOptInfo *) NULL; - NestPath *cheapest; + JoinPath *cheapest; foreach(x, rel_list) { rel = (RelOptInfo *) lfirst(x); - cheapest = (NestPath *) set_cheapest(rel, rel->pathlist); + cheapest = (JoinPath *) set_cheapest(rel, rel->pathlist); if (IsA_JoinPath(cheapest)) rel->size = compute_joinrel_size(cheapest); else - elog(ERROR, "non NestPath called"); + elog(ERROR, "non JoinPath called"); } } diff --git a/src/backend/optimizer/path/xfunc.c b/src/backend/optimizer/path/xfunc.c index c8efb254c0a..048fce5ad2e 100644 --- a/src/backend/optimizer/path/xfunc.c +++ b/src/backend/optimizer/path/xfunc.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/xfunc.c,v 1.26 1999/02/12 06:43:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/xfunc.c,v 1.27 1999/02/12 17:24:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,7 +61,7 @@ xfunc_trypullup(RelOptInfo rel) LispValue y; /* list ptr */ RestrictInfo maxcinfo; /* The RestrictInfo to pull up, as * calculated by xfunc_shouldpull() */ - NestPath curpath; /* current path in list */ + JoinPath curpath; /* current path in list */ int progress; /* has progress been made this time * through? */ int clausetype; @@ -71,7 +71,7 @@ xfunc_trypullup(RelOptInfo rel) progress = false; /* no progress yet in this iteration */ foreach(y, get_pathlist(rel)) { - curpath = (NestPath) lfirst(y); + curpath = (JoinPath) lfirst(y); /* * * for each operand, attempt to pullup predicates until @@ -142,7 +142,7 @@ xfunc_trypullup(RelOptInfo rel) int xfunc_shouldpull(Query *queryInfo, Path childpath, - NestPath parentpath, + JoinPath parentpath, int whichchild, RestrictInfo * maxcinfopt) /* Out: pointer to clause * to pullup */ @@ -184,8 +184,8 @@ xfunc_shouldpull(Query *queryInfo, * see if any join clause has even higher rank than the highest * * local predicate */ - if (is_join(childpath) && xfunc_num_join_clauses((NestPath) childpath) > 1) - for (tmplist = get_pathrestrictinfo((NestPath) childpath); + if (is_join(childpath) && xfunc_num_join_clauses((JoinPath) childpath) > 1) + for (tmplist = get_pathrestrictinfo((JoinPath) childpath); tmplist != LispNil; tmplist = lnext(tmplist)) { @@ -263,7 +263,7 @@ xfunc_shouldpull(Query *queryInfo, RestrictInfo xfunc_pullup(Query *queryInfo, Path childpath, - NestPath parentpath, + JoinPath parentpath, RestrictInfo cinfo, /* clause to pull up */ int whichchild, /* whether child is INNER or OUTER of join */ int clausetype) /* whether clause to pull is join or local */ @@ -285,9 +285,9 @@ xfunc_pullup(Query *queryInfo, else { set_pathrestrictinfo - ((NestPath) newkid, + ((JoinPath) newkid, xfunc_LispRemove((LispValue) cinfo, - (List) get_pathrestrictinfo((NestPath) newkid))); + (List) get_pathrestrictinfo((JoinPath) newkid))); } /* @@ -390,7 +390,7 @@ LispValue clause; ** Find global expense of a join clause */ Cost -xfunc_join_expense(Query *queryInfo, NestPath path, int whichchild) +xfunc_join_expense(Query *queryInfo, JoinPath path, int whichchild) { LispValue primjoinclause = xfunc_primary_join(path); @@ -854,7 +854,7 @@ xfunc_find_references(LispValue clause) ** min rank pathclause */ LispValue -xfunc_primary_join(NestPath pathnode) +xfunc_primary_join(JoinPath pathnode) { LispValue joinclauselist = get_pathrestrictinfo(pathnode); RestrictInfo mincinfo; @@ -947,13 +947,13 @@ xfunc_get_path_cost(Query *queryInfo, Path pathnode) * * Now add in any node-specific expensive function costs. * Again, * we must ensure that the clauses are sorted by rank. */ - if (IsA(pathnode, NestPath)) + if (IsA(pathnode, JoinPath)) { if (XfuncMode != XFUNC_OFF) - set_pathrestrictinfo((NestPath) pathnode, lisp_qsort - (get_pathrestrictinfo((NestPath) pathnode), + set_pathrestrictinfo((JoinPath) pathnode, lisp_qsort + (get_pathrestrictinfo((JoinPath) pathnode), xfunc_cinfo_compare)); - for (tmplist = get_pathrestrictinfo((NestPath) pathnode), selec = 1.0; + for (tmplist = get_pathrestrictinfo((JoinPath) pathnode), selec = 1.0; tmplist != LispNil; tmplist = lnext(tmplist)) { @@ -1006,14 +1006,14 @@ xfunc_get_path_cost(Query *queryInfo, Path pathnode) ** Recalculate the cost of a path node. This includes the basic cost of the ** node, as well as the cost of its expensive functions. ** We need to do this to the parent after pulling a clause from a child into a - ** parent. Thus we should only be calling this function on NestPaths. + ** parent. Thus we should only be calling this function on JoinPaths. */ Cost -xfunc_total_path_cost(NestPath pathnode) +xfunc_total_path_cost(JoinPath pathnode) { Cost cost = xfunc_get_path_cost((Path) pathnode); - Assert(IsA(pathnode, NestPath)); + Assert(IsA(pathnode, JoinPath)); if (IsA(pathnode, MergePath)) { MergePath mrgnode = (MergePath) pathnode; @@ -1089,7 +1089,7 @@ xfunc_total_path_cost(NestPath pathnode) */ Cost -xfunc_expense_per_tuple(NestPath joinnode, int whichchild) +xfunc_expense_per_tuple(JoinPath joinnode, int whichchild) { RelOptInfo outerrel = get_parent((Path) get_outerjoinpath(joinnode)); RelOptInfo innerrel = get_parent((Path) get_innerjoinpath(joinnode)); @@ -1118,7 +1118,7 @@ xfunc_expense_per_tuple(NestPath joinnode, int whichchild) else /* nestloop */ { - Assert(IsA(joinnode, NestPath)); + Assert(IsA(joinnode, JoinPath)); return _CPU_PAGE_WEIGHT_; } } @@ -1375,7 +1375,7 @@ xfunc_tuple_width(Relation rd) ** Find the number of join clauses associated with this join path */ int -xfunc_num_join_clauses(NestPath path) +xfunc_num_join_clauses(JoinPath path) { int num = length(get_pathrestrictinfo(path)); |