diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 49d400dee9dfd2b5dc0054a1f14967129994af58..84f9c322c4203c2cd8f7206fd56cb075c9849a6f 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.84 2000/06/18 22:44:09 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.85 2000/06/20 04:22:21 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -94,7 +94,8 @@ planner(Query *parse)
* Basically, this routine does the stuff that should only be done once
* per Query object. It then calls union_planner, which may be called
* recursively on the same Query node in order to handle UNIONs and/or
- * inheritance. subquery_planner is called recursively from subselect.c.
+ * inheritance. subquery_planner is called recursively from subselect.c
+ * to handle sub-Query nodes found within the query's expressions.
*
* prepunion.c uses an unholy combination of calling union_planner when
* recursing on the primary Query node, or subquery_planner when recursing
@@ -107,10 +108,6 @@ planner(Query *parse)
Plan *
subquery_planner(Query *parse, double tuple_fraction)
{
- List *l;
- List *rangetable = parse->rtable;
- RangeTblEntry *rangeTblEntry;
-
/*
* A HAVING clause without aggregates is equivalent to a WHERE clause
* (except it can only refer to grouped fields). If there are no aggs
@@ -142,18 +139,6 @@ subquery_planner(Query *parse, double tuple_fraction)
parse->qual = eval_const_expressions(parse->qual);
parse->havingQual = eval_const_expressions(parse->havingQual);
- /*
- * If the query is going to look for subclasses, but no subclasses
- * actually exist, then we can optimise away the union that would
- * otherwise happen and thus save some time.
- */
- foreach(l, rangetable)
- {
- rangeTblEntry = (RangeTblEntry *)lfirst(l);
- if (rangeTblEntry->inh && !has_subclass(rangeTblEntry->relid))
- rangeTblEntry->inh = FALSE;
- }
-
/*
* Canonicalize the qual, and convert it to implicit-AND format.
*
@@ -257,10 +242,11 @@ union_planner(Query *parse,
List *group_pathkeys;
List *sort_pathkeys;
Index rt_index;
+ List *inheritors;
if (parse->unionClause)
{
- result_plan = (Plan *) plan_union_queries(parse);
+ result_plan = plan_union_queries(parse);
/* XXX do we need to do this? bjm 12/19/97 */
tlist = preprocess_targetlist(tlist,
parse->commandType,
@@ -269,9 +255,8 @@ union_planner(Query *parse,
/*
* We leave current_pathkeys NIL indicating we do not know sort
- * order. Actually, for a normal UNION we have done an explicit
- * sort; ought to change interface to plan_union_queries to pass
- * that info back!
+ * order. This is correct for the appended-together subplan
+ * results, even if the subplans themselves produced sorted results.
*/
/*
@@ -283,7 +268,8 @@ union_planner(Query *parse,
sort_pathkeys = make_pathkeys_for_sortclauses(parse->sortClause,
tlist);
}
- else if ((rt_index = first_inherit_rt_entry(rangetable)) != -1)
+ else if (find_inheritable_rt_entry(rangetable,
+ &rt_index, &inheritors))
{
List *sub_tlist;
@@ -296,8 +282,8 @@ union_planner(Query *parse,
/*
* Recursively plan the subqueries needed for inheritance
*/
- result_plan = (Plan *) plan_inherit_queries(parse, sub_tlist,
- rt_index);
+ result_plan = plan_inherit_queries(parse, sub_tlist,
+ rt_index, inheritors);
/*
* Fix up outer target list. NOTE: unlike the case for
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index f9152a2cf9cc115419cab7c95aeeb9ac1d2d07a4..f069cafdf66f716af515b9be7b3505ca9fdd8518 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.50 2000/05/30 00:49:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.51 2000/06/20 04:22:16 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,15 +33,12 @@ typedef struct
Oid new_relid;
} fix_parsetree_attnums_context;
-static List *plan_inherit_query(Relids relids, Index rt_index,
- RangeTblEntry *rt_entry, Query *parse, List *tlist,
- List **union_rtentriesPtr);
-static RangeTblEntry *new_rangetable_entry(Oid new_relid,
- RangeTblEntry *old_entry);
static void fix_parsetree_attnums(Index rt_index, Oid old_relid,
Oid new_relid, Query *parsetree);
static bool fix_parsetree_attnums_walker(Node *node,
fix_parsetree_attnums_context *context);
+static RangeTblEntry *new_rangetable_entry(Oid new_relid,
+ RangeTblEntry *old_entry);
static Append *make_append(List *appendplans, List *unionrtables,
Index rt_index,
List *inheritrtable, List *tlist);
@@ -52,9 +49,13 @@ static Append *make_append(List *appendplans, List *unionrtables,
*
* Plans the queries for a given UNION.
*
- * Returns a list containing a list of plans and a list of rangetables
+ * Returns an Append plan that combines the results of the unioned queries.
+ * Note that Append output is correct for UNION ALL, but caller still needs
+ * to take care of sort/unique processing if it's a plain UNION. We set or
+ * clear the Query's fields so that the right things will happen back in
+ * union_planner. (This control structure is an unholy mess...)
*/
-Append *
+Plan *
plan_union_queries(Query *parse)
{
List *union_plans = NIL,
@@ -242,23 +243,23 @@ plan_union_queries(Query *parse)
parse->havingQual = NULL;
parse->hasAggs = false;
- return make_append(union_plans,
- union_rts,
- 0,
- NULL,
- parse->targetList);
+ return (Plan *) make_append(union_plans,
+ union_rts,
+ 0,
+ NIL,
+ parse->targetList);
}
/*
* plan_inherit_queries
- *
* Plans the queries for an inheritance tree rooted at a parent relation.
*
* Inputs:
- * parse = parent parse tree
+ * root = parent parse tree
* tlist = target list for inheritance subqueries (not same as parent's!)
* rt_index = rangetable index for current inheritance item
+ * inheritors = list of OIDs of the target rel plus all its descendants
*
* Returns an APPEND node that forms the result of performing the given
* query for each member relation of the inheritance group.
@@ -268,54 +269,22 @@ plan_union_queries(Query *parse)
* operations just once above the APPEND node. The given tlist has been
* modified appropriately to remove group/aggregate expressions, but the
* Query node still has the relevant fields set. We remove them in the
- * copies used for subplans (see plan_inherit_query).
+ * copies used for subplans.
*
* NOTE: this can be invoked recursively if more than one inheritance wildcard
* is present. At each level of recursion, the first wildcard remaining in
* the rangetable is expanded.
+ *
+ * NOTE: don't bother optimizing this routine for the case that the target
+ * rel has no children. We won't get here unless find_inheritable_rt_entry
+ * found at least two members in the inheritance group, so an APPEND is
+ * certainly necessary.
*/
-Append *
-plan_inherit_queries(Query *parse, List *tlist, Index rt_index)
-{
- List *rangetable = parse->rtable;
- RangeTblEntry *rt_entry = rt_fetch(rt_index, rangetable);
- List *inheritrtable = NIL;
- List *union_relids;
- List *union_plans;
-
- /* Make a list of the target relid plus all its descendants */
- union_relids = find_all_inheritors(rt_entry->relid);
-
- /*
- * Remove the flag for this relation, since we're about to handle it.
- * XXX destructive change to parent parse tree, but necessary to
- * prevent infinite recursion.
- */
- rt_entry->inh = false;
-
- union_plans = plan_inherit_query(union_relids, rt_index, rt_entry,
- parse, tlist, &inheritrtable);
-
- return make_append(union_plans,
- NULL,
- rt_index,
- inheritrtable,
- ((Plan *) lfirst(union_plans))->targetlist);
-}
-
-/*
- * plan_inherit_query
- * Returns a list of plans for 'relids', plus a list of range table entries
- * in *union_rtentriesPtr.
- */
-static List *
-plan_inherit_query(Relids relids,
- Index rt_index,
- RangeTblEntry *rt_entry,
- Query *root,
- List *tlist,
- List **union_rtentriesPtr)
+Plan *
+plan_inherit_queries(Query *root, List *tlist,
+ Index rt_index, List *inheritors)
{
+ RangeTblEntry *rt_entry = rt_fetch(rt_index, root->rtable);
List *union_plans = NIL;
List *union_rtentries = NIL;
List *save_tlist = root->targetList;
@@ -325,7 +294,8 @@ plan_inherit_query(Relids relids,
/*
* Avoid making copies of the root's tlist, which we aren't going to
* use anyway (we are going to make copies of the passed tlist,
- * instead).
+ * instead). This is purely a space-saving hack. Note we restore
+ * the root's tlist before exiting.
*/
root->targetList = NIL;
@@ -339,19 +309,22 @@ plan_inherit_query(Relids relids,
else
tuple_fraction = -1.0; /* default behavior is OK (I think) */
- foreach(i, relids)
+ foreach(i, inheritors)
{
- int relid = lfirsti(i);
+ Oid relid = lfirsti(i);
/*
* Make a modifiable copy of the original query, and replace the
- * target rangetable entry with a new one identifying this child
- * table.
+ * target rangetable entry in it with a new one identifying this
+ * child table. The new rtentry is marked inh = false --- this
+ * is essential to prevent infinite recursion when the subquery
+ * is rescanned by find_inheritable_rt_entry!
*/
Query *new_root = copyObject(root);
RangeTblEntry *new_rt_entry = new_rangetable_entry(relid,
rt_entry);
+ new_rt_entry->inh = false;
rt_store(rt_index, new_root->rtable, new_rt_entry);
/*
@@ -368,6 +341,8 @@ plan_inherit_query(Relids relids,
new_root->sortClause = NIL;
new_root->groupClause = NIL;
new_root->havingQual = NULL;
+ new_root->limitOffset = NULL; /* LIMIT's probably unsafe too */
+ new_root->limitCount = NULL;
new_root->hasAggs = false; /* shouldn't be any left ... */
/*
@@ -383,15 +358,24 @@ plan_inherit_query(Relids relids,
relid,
new_root);
+ /*
+ * Plan the subquery by recursively calling union_planner().
+ * Add plan and child rtentry to lists for APPEND.
+ */
union_plans = lappend(union_plans,
union_planner(new_root, tuple_fraction));
union_rtentries = lappend(union_rtentries, new_rt_entry);
}
+ /* Restore root's tlist */
root->targetList = save_tlist;
- *union_rtentriesPtr = union_rtentries;
- return union_plans;
+ /* Construct the finished Append plan. */
+ return (Plan *) make_append(union_plans,
+ NIL,
+ rt_index,
+ union_rtentries,
+ ((Plan *) lfirst(union_plans))->targetlist);
}
/*
@@ -420,10 +404,11 @@ find_all_inheritors(Oid parentrel)
currentchildren = find_inheritance_children(currentrel);
/*
- * Add to the queue only those children not already seen. This
- * could probably be simplified to a plain nconc, because our
- * inheritance relationships should always be a strict tree, no?
- * Should never find any matches, ISTM...
+ * Add to the queue only those children not already seen.
+ * This avoids making duplicate entries in case of multiple
+ * inheritance paths from the same parent. (It'll also keep
+ * us from getting into an infinite loop, though theoretically
+ * there can't be any cycles in the inheritance graph anyway.)
*/
currentchildren = set_differencei(currentchildren, examined_relids);
unexamined_relids = LispUnioni(unexamined_relids, currentchildren);
@@ -433,29 +418,71 @@ find_all_inheritors(Oid parentrel)
}
/*
- * first_inherit_rt_entry -
+ * find_inheritable_rt_entry -
* Given a rangetable, find the first rangetable entry that represents
* an inheritance set.
*
- * Returns a rangetable index (1..n).
- * Returns -1 if no matches
+ * If successful, set *rt_index to the index (1..n) of the entry,
+ * set *inheritors to a list of the relation OIDs of the set,
+ * and return TRUE.
+ *
+ * If there is no entry that requires inheritance processing,
+ * return FALSE.
+ *
+ * NOTE: We return the inheritors list so that plan_inherit_queries doesn't
+ * have to compute it again.
+ *
+ * NOTE: We clear the inh flag in any entries that have it set but turn
+ * out not to have any actual inheritance children. This is an efficiency
+ * hack to avoid having to repeat the inheritance checks if the list is
+ * scanned again (as will happen during expansion of any subsequent entry
+ * that does have inheritance children). Although modifying the input
+ * rangetable in-place may seem uncool, there's no reason not to do it,
+ * since any re-examination of the entry would just come to the same
+ * conclusion that the table has no children.
*/
-int
-first_inherit_rt_entry(List *rangetable)
+bool
+find_inheritable_rt_entry(List *rangetable,
+ Index *rt_index,
+ List **inheritors)
{
- int count = 0;
+ Index count = 0;
List *temp;
foreach(temp, rangetable)
{
- RangeTblEntry *rt_entry = lfirst(temp);
+ RangeTblEntry *rt_entry = (RangeTblEntry *) lfirst(temp);
+ List *inhs;
count++;
- if (rt_entry->inh)
- return count;
+ /* Ignore non-inheritable RT entries */
+ if (! rt_entry->inh)
+ continue;
+ /* Fast path for common case of childless table */
+ if (! has_subclass(rt_entry->relid))
+ {
+ rt_entry->inh = false;
+ continue;
+ }
+ /* Scan for all members of inheritance set */
+ inhs = find_all_inheritors(rt_entry->relid);
+ /*
+ * Check that there's at least one descendant, else treat as
+ * no-child case. This could happen despite above has_subclass()
+ * check, if table once had a child but no longer does.
+ */
+ if (lnext(inhs) == NIL)
+ {
+ rt_entry->inh = false;
+ continue;
+ }
+ /* OK, found our boy */
+ *rt_index = count;
+ *inheritors = inhs;
+ return true;
}
- return -1;
+ return false;
}
/*
@@ -483,7 +510,7 @@ new_rangetable_entry(Oid new_relid, RangeTblEntry *old_entry)
* 'new_relid'.
*
* The parsetree is MODIFIED IN PLACE. This is OK only because
- * plan_inherit_query made a copy of the tree for us to hack upon.
+ * plan_inherit_queries made a copy of the tree for us to hack upon.
*/
static void
fix_parsetree_attnums(Index rt_index,
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 64b47072f71a07d2c4d802cd872672551a6e437f..5c94c87487b5d02edbd25785d012831ef4f83d6a 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.57 2000/06/17 21:48:51 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.58 2000/06/20 04:22:14 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -261,6 +261,11 @@ join_selectivity(Oid functionObjectId,
*
* Returns an integer list containing the OIDs of all relations which
* inherit *directly* from the relation with OID 'inhparent'.
+ *
+ * XXX might be a good idea to create an index on pg_inherits' inhparent
+ * field, so that we can use an indexscan instead of sequential scan here.
+ * However, in typical databases pg_inherits won't have enough entries to
+ * justify an indexscan...
*/
List *
find_inheritance_children(Oid inhparent)
@@ -269,12 +274,19 @@ find_inheritance_children(Oid inhparent)
{0, Anum_pg_inherits_inhparent, F_OIDEQ}
};
- HeapTuple inheritsTuple;
+ List *list = NIL;
Relation relation;
HeapScanDesc scan;
- List *list = NIL;
+ HeapTuple inheritsTuple;
Oid inhrelid;
+ /*
+ * Can skip the scan if pg_class shows the relation has never had
+ * a subclass.
+ */
+ if (! has_subclass(inhparent))
+ return NIL;
+
fmgr_info(F_OIDEQ, &key[0].sk_func);
key[0].sk_nargs = key[0].sk_func.fn_nargs;
key[0].sk_argument = ObjectIdGetDatum(inhparent);
@@ -292,14 +304,16 @@ find_inheritance_children(Oid inhparent)
}
/*
- * has_subclass -
+ * has_subclass
+ *
* In the current implementation, has_subclass returns whether a
* particular class *might* have a subclass. It will not return the
* correct result if a class had a subclass which was later dropped.
- * This is because relhassubclass in pg_class is not updated,
- * possibly because of efficiency and/or concurrency concerns.
- * Currently has_subclass is only used as an efficiency hack, so this
- * is ok.
+ * This is because relhassubclass in pg_class is not updated when a
+ * subclass is dropped, primarily because of concurrency concerns.
+ *
+ * Currently has_subclass is only used as an efficiency hack to skip
+ * unnecessary inheritance searches, so this is OK.
*/
bool
has_subclass(Oid relationId)
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h
index f641f4a0fadb88bb785ce399b48f4c4963ccfd18..4ffddcf5668e6fb74caf4d14dab0cb073f0d2558 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: prep.h,v 1.22 2000/06/08 22:37:51 momjian Exp $
+ * $Id: prep.h,v 1.23 2000/06/20 04:22:13 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,8 +33,10 @@ extern List *preprocess_targetlist(List *tlist, int command_type,
* prototypes for prepunion.c
*/
extern List *find_all_inheritors(Oid parentrel);
-extern int first_inherit_rt_entry(List *rangetable);
-extern Append *plan_union_queries(Query *parse);
-extern Append *plan_inherit_queries(Query *parse, List *tlist, Index rt_index);
+extern bool find_inheritable_rt_entry(List *rangetable,
+ Index *rt_index, List **inheritors);
+extern Plan *plan_inherit_queries(Query *root, List *tlist,
+ Index rt_index, List *inheritors);
+extern Plan *plan_union_queries(Query *parse);
#endif /* PREP_H */