From: Amit Langote <Langote_Amit_f8@lab.ntt.co.jp>
To: Alvaro Herrera <alvherre@2ndquadrant.com>
Cc: David Rowley <david.rowley@2ndquadrant.com>
Cc: Amit Langote <amitlangote09@gmail.com>
Cc: Imai, Yoshikazu <imai.yoshikazu@jp.fujitsu.com>
Cc: Pg Hackers <pgsql-hackers@postgresql.org>
Subject: Re: speeding up planning with partitions
Date: Mon, 21 Jan 2019 18:01:39 +0900
Message-ID: <9e1cf3fb-e7eb-6bda-126f-df11823293de@lab.ntt.co.jp> (raw)
In-Reply-To: <b6e39c7a-7dc6-5e98-94aa-22b30688e50e@lab.ntt.co.jp>
References: <201901161932.c6oxfxckbnyo@alvherre.pgsql>
<b6e39c7a-7dc6-5e98-94aa-22b30688e50e@lab.ntt.co.jp>
On 2019/01/17 11:17, Amit Langote wrote:
> I have rebased the patches. Other than rebasing, I've squashed the patch
> to add inh_root_parent field to RelOptInfo which contained no other code
> changes to use that field into the patch that contains changes to start
> using it. Updated the commit message of lazy-partition-initialization
> patch to be accurate (it contained old details that have changed since I
> first wrote that commit message).
Rebased again due to 8d8dcead1295.
Thanks,
Amit
Attachments:download all (4 files, .tar.gz)v16-0001-Overhaul-inheritance-update-delete-planning.patch (text/plain, 75.6K) download
From 3b0dfe4a3c1912ecb5ed9cc042b51ad1ccb09f59 Mon Sep 17 00:00:00 2001
From: amit <amitlangote09@gmail.com>
Date: Wed, 17 Oct 2018 11:18:12 +0900
Subject: [PATCH v16 1/4] Overhaul inheritance update/delete planning
With the current method, inheritance_planner, which handles the
planning for update/delete commands targeting inheritance trees,
repeatedly calls query_planner for each child table.
That's inefficient for two reasons:
1. partprune.c cannot be used to perform partition pruning, because
it can only be invoked from query_planner. With the current
approach, query_planner only sees the individual partitions in
the query tree it receives, not the parent partitioned table.
This leaves each partition to be pruned using constraint
exclusion. (constraint exclusion cannon prune hash partitions
which means UPDATE/DELETE don't support hash partition pruning.)
2. Repeated invocation of query_planner results in allocating large
amounts of memory, especially if there are many child tables.
Also, it involves repeatedly performing the same processing,
such as jointree processing.
This commit addresses both of the issues by modifying query_planner
to handle the inheritance target case directly. Instead of having
the caller create separate PlannerInfo's for individual child
target relations and pass them to query_planner (actually, via
grouping_planner), this teaches query_planner itself to create
the child PlannerInfo's by the original parent PlannerInfo.
It creates them *after* it has generated enough state in the latter,
such as RelOptInfos for various relations, EquivalenceClasses
after processing the join tree, and *before* generating the scan and
join paths. Scan paths are generated normally, except that Paths of
target children are not "appended". Join paths are generated
separately for each child target relation, that is, by replacing the
parent relation references in the original join tree with the child
relation references. Joinrels (RelOptInfos thereof) corresponding
to various child target relation are saved in the parent PlannerInfo
for further processing.
inheritance_planner now calls query_planner just once at the beginning
with the original unmodified query, which takes care of generating
top-level join rels for the child queries as described above. For each
child join rel, it then calls grouping_planner using previously created
child PlannerInfo to finish up the paths such that they produce
query's top-level target list expanded according to a given child
relation's descriptor. grouping_planner()'s interface is modified so
that we can pass it what's called a 'planned_rel', a RelOptInfo that
already contains the necessary paths needed to produce its output.
This removes some existing code in inheritance_planner that dealt
with any subquery RTEs in the query. The rationale of that code
was that the subquery RTEs may change during each iteration of
planning (that is, for different children), so different iterations
better use different copies of those RTEs. That was handled by
making fresh copies of those RTEs for each iteration of planning
which were appended to the range table, accompanied by modifying all
expressions and auxiliary structures that referenced the original
subquery RTEs to instead reference the copies (that is, change the
varnos). This copying meant we would end up adding S * N new entries
to the original range table by the time we got to the last unpruned
child, where S is the number of subquery RTEs in the original query
and N the number of unpruned children. Since with the new code
we perform planning just once, I think we don't need this special
handling. Actually, there is a regression test output change due
to no longer having copies of subquery RTEs (see the diff of
partition_join.out file.)
Also we no longer need the hack in relation_excluded_by_constraints()
involving setting PlannerInfo.inhTargetKind to enable constraint
exclusion for target child relation, which is no longer needed.
Constraint exclusion now runs during query_planner step described
above.
Regression test output change in partition_join.out is due to the fact
that we no longer create duplicates of subquery RTEs in child range
tables.
---
doc/src/sgml/ddl.sgml | 17 +-
src/backend/nodes/outfuncs.c | 2 +-
src/backend/optimizer/path/allpaths.c | 613 +++++++++++++++++++++++++--
src/backend/optimizer/path/equivclass.c | 57 ++-
src/backend/optimizer/path/joinrels.c | 2 +-
src/backend/optimizer/plan/createplan.c | 10 -
src/backend/optimizer/plan/planmain.c | 48 ++-
src/backend/optimizer/plan/planner.c | 444 ++++++-------------
src/backend/optimizer/prep/prepjointree.c | 1 -
src/backend/optimizer/util/appendinfo.c | 33 +-
src/backend/optimizer/util/inherit.c | 109 +++++
src/backend/optimizer/util/plancat.c | 73 +---
src/include/nodes/relation.h | 37 +-
src/include/optimizer/inherit.h | 1 +
src/include/optimizer/paths.h | 3 +-
src/test/regress/expected/partition_join.out | 4 +-
16 files changed, 988 insertions(+), 466 deletions(-)
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgmlindex 85e4358988..1bb5ca6b08 100644--- a/doc/src/sgml/ddl.sgml+++ b/doc/src/sgml/ddl.sgml@@ -4439,24 +4439,11 @@ EXPLAIN SELECT count(*) FROM measurement WHERE logdate >= DATE '2008-01-01';
<note>
<para>
- Currently, pruning of partitions during the planning of an- <command>UPDATE</command> or <command>DELETE</command> command is- implemented using the constraint exclusion method (however, it is- controlled by the <literal>enable_partition_pruning</literal> rather than- <literal>constraint_exclusion</literal>) — see the following section- for details and caveats that apply.- </para>-- <para>
Execution-time partition pruning currently only occurs for the
<literal>Append</literal> and <literal>MergeAppend</literal> node types.
It is not yet implemented for the <literal>ModifyTable</literal> node
- type.- </para>-- <para>- Both of these behaviors are likely to be changed in a future release- of <productname>PostgreSQL</productname>.+ type, but that is likely to be changed in a future release of+ <productname>PostgreSQL</productname>.
</para>
</note>
</sect2>
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.cindex 0fde876c77..158da68925 100644--- a/src/backend/nodes/outfuncs.c+++ b/src/backend/nodes/outfuncs.c@@ -2210,7 +2210,6 @@ _outPlannerInfo(StringInfo str, const PlannerInfo *node)
WRITE_FLOAT_FIELD(tuple_fraction, "%.4f");
WRITE_FLOAT_FIELD(limit_tuples, "%.0f");
WRITE_UINT_FIELD(qual_security_level);
- WRITE_ENUM_FIELD(inhTargetKind, InheritanceKind);
WRITE_BOOL_FIELD(hasJoinRTEs);
WRITE_BOOL_FIELD(hasLateralRTEs);
WRITE_BOOL_FIELD(hasDeletedRTEs);
@@ -2221,6 +2220,7 @@ _outPlannerInfo(StringInfo str, const PlannerInfo *node)
WRITE_BITMAPSET_FIELD(curOuterRels);
WRITE_NODE_FIELD(curOuterParams);
WRITE_BOOL_FIELD(partColsUpdated);
+ WRITE_BOOL_FIELD(inherited_update);
}
static void
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.cindex e1ecfd6052..61df22953a 100644--- a/src/backend/optimizer/path/allpaths.c+++ b/src/backend/optimizer/path/allpaths.c@@ -38,6 +38,7 @@
#include "optimizer/pathnode.h"
#include "optimizer/paths.h"
#include "optimizer/plancat.h"
+#include "optimizer/planmain.h"
#include "optimizer/planner.h"
#include "optimizer/restrictinfo.h"
#include "optimizer/tlist.h"
@@ -92,8 +93,12 @@ static void set_foreign_size(PlannerInfo *root, RelOptInfo *rel,
RangeTblEntry *rte);
static void set_foreign_pathlist(PlannerInfo *root, RelOptInfo *rel,
RangeTblEntry *rte);
+static void set_inherit_target_rel_sizes(PlannerInfo *root, RelOptInfo *rel,+ Index rti, RangeTblEntry *rte);
static void set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
Index rti, RangeTblEntry *rte);
+static void set_inherit_target_rel_pathlists(PlannerInfo *root,+ RelOptInfo *rel, Index rti, RangeTblEntry *rte);
static void set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
Index rti, RangeTblEntry *rte);
static void generate_mergeappend_paths(PlannerInfo *root, RelOptInfo *rel,
@@ -120,6 +125,8 @@ static void set_namedtuplestore_pathlist(PlannerInfo *root, RelOptInfo *rel,
static void set_worktable_pathlist(PlannerInfo *root, RelOptInfo *rel,
RangeTblEntry *rte);
static RelOptInfo *make_rel_from_joinlist(PlannerInfo *root, List *joinlist);
+static void inheritance_make_rel_from_joinlist(PlannerInfo *root,+ List *joinlist);
static bool subquery_is_pushdown_safe(Query *subquery, Query *topquery,
pushdown_safety_info *safetyInfo);
static bool recurse_pushdown_safe(Node *setOp, Query *topquery,
@@ -150,27 +157,6 @@ make_one_rel(PlannerInfo *root, List *joinlist)
Index rti;
double total_pages;
- /*- * Construct the all_baserels Relids set.- */- root->all_baserels = NULL;- for (rti = 1; rti < root->simple_rel_array_size; rti++)- {- RelOptInfo *brel = root->simple_rel_array[rti];-- /* there may be empty slots corresponding to non-baserel RTEs */- if (brel == NULL)- continue;-- Assert(brel->relid == rti); /* sanity check on array */-- /* ignore RTEs that are "other rels" */- if (brel->reloptkind != RELOPT_BASEREL)- continue;-- root->all_baserels = bms_add_member(root->all_baserels, brel->relid);- }-
/* Mark base rels as to whether we care about fast-start plans */
set_base_rel_consider_startup(root);
@@ -218,13 +204,34 @@ make_one_rel(PlannerInfo *root, List *joinlist)
/*
* Generate access paths for the entire join tree.
+ *+ * For UPDATE/DELETE on an inheritance parent, join paths should be+ * generated for each child result rel separately.
*/
- rel = make_rel_from_joinlist(root, joinlist);+ if (root->parse->resultRelation &&+ root->simple_rte_array[root->parse->resultRelation]->inh)+ {+ inheritance_make_rel_from_joinlist(root, joinlist);- /*- * The result should join all and only the query's base rels.- */- Assert(bms_equal(rel->relids, root->all_baserels));+ /*+ * Return the RelOptInfo of original target relation, although this+ * doesn't really contain the final path. inheritance_planner+ * from where we got here will generate the final path, but it will+ * do so by iterative over child subroots, not through this+ * RelOptInfo.+ */+ rel = find_base_rel(root, root->parse->resultRelation);+ }+ else+ {+ rel = make_rel_from_joinlist(root, joinlist);++ /*+ * The result should join all and only the query's base rels.+ */+ Assert(bms_equal(rel->relids, root->all_baserels));++ }
return rel;
}
@@ -308,9 +315,10 @@ set_base_rel_sizes(PlannerInfo *root)
* If parallelism is allowable for this query in general, see whether
* it's allowable for this rel in particular. We have to do this
* before set_rel_size(), because (a) if this rel is an inheritance
- * parent, set_append_rel_size() will use and perhaps change the rel's- * consider_parallel flag, and (b) for some RTE types, set_rel_size()- * goes ahead and makes paths immediately.+ * parent, set_append_rel_size() or set_inherit_target_rel_sizes()+ * will use and perhaps change the rel's consider_parallel flag, and+ * (b) for some RTE types, set_rel_size() goes ahead and makes paths+ * immediately.
*/
if (root->glob->parallelModeOK)
set_rel_consider_parallel(root, rel, rte);
@@ -374,8 +382,15 @@ set_rel_size(PlannerInfo *root, RelOptInfo *rel,
}
else if (rte->inh)
{
- /* It's an "append relation", process accordingly */- set_append_rel_size(root, rel, rti, rte);+ /*+ * If it's a target relation, set the sizes of children instead.+ * Otherwise, we'll append the outputs of children, so process it as+ * an "append relation".+ */+ if (rti == root->parse->resultRelation)+ set_inherit_target_rel_sizes(root, rel, rti, rte);+ else+ set_append_rel_size(root, rel, rti, rte);
}
else
{
@@ -459,14 +474,26 @@ static void
set_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
Index rti, RangeTblEntry *rte)
{
+ bool inherited_update = false;+
if (IS_DUMMY_REL(rel))
{
/* We already proved the relation empty, so nothing more to do */
}
else if (rte->inh)
{
- /* It's an "append relation", process accordingly */- set_append_rel_pathlist(root, rel, rti, rte);+ /*+ * If it's a target relation, set the pathlists of children instead.+ * Otherwise, we'll append the outputs of children, so process it as+ * an "append relation".+ */+ if (root->inherited_update && root->parse->resultRelation == rti)+ {+ inherited_update = true;+ set_inherit_target_rel_pathlists(root, rel, rti, rte);+ }+ else+ set_append_rel_pathlist(root, rel, rti, rte);
}
else
{
@@ -541,8 +568,12 @@ set_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
if (set_rel_pathlist_hook)
(*set_rel_pathlist_hook) (root, rel, rti, rte);
- /* Now find the cheapest of the paths for this rel */- set_cheapest(rel);+ /*+ * Now find the cheapest of the paths for this rel, unless it's an+ * inheritance parent and this is an update/delete operation.+ */+ if (!inherited_update)+ set_cheapest(rel);
#ifdef OPTIMIZER_DEBUG
debug_print_rel(root, rel);
@@ -904,6 +935,382 @@ set_foreign_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
}
/*
+ * set_inherit_target_rel_sizes+ * Set size estimates for the child target relations+ *+ * The passed-in rel represents the target relation of the query that is+ * known to have inheritance children. This is very much like+ * set_append_rel_size, except it doesn't set the size estimates for the+ * passed-in rel itself, because we don't need to "append" the children+ * in this case.+ */+static void+set_inherit_target_rel_sizes(PlannerInfo *root, RelOptInfo *rel,+ Index rti, RangeTblEntry *rte)+{+ int parentRTindex = rti;+ bool has_live_children;+ ListCell *l;+ Relids live_children = NULL;+ bool did_pruning = false;++ /* Guard against stack overflow due to overly deep inheritance tree. */+ check_stack_depth();++ Assert(IS_SIMPLE_REL(rel));++ /*+ * If the partitioned relation has any baserestrictinfo quals then we+ * attempt to use these quals to prune away partitions that cannot+ * possibly contain any tuples matching these quals. In this case we'll+ * store the relids of all partitions which could possibly contain a+ * matching tuple, and skip anything else in the loop below.+ */+ if (enable_partition_pruning &&+ rte->relkind == RELKIND_PARTITIONED_TABLE &&+ rel->baserestrictinfo != NIL)+ {+ live_children = prune_append_rel_partitions(rel);+ did_pruning = true;+ }++ foreach(l, root->append_rel_list)+ {+ AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(l);+ int childRTindex;+ RangeTblEntry *childRTE;+ RelOptInfo *childrel;+ List *childquals;+ Index cq_min_security;+ bool have_const_false_cq;+ PlannerInfo *subroot;+ ListCell *lc;+ List *translated_exprs,+ *child_target_exprs;++ /* append_rel_list contains all append rels; ignore others */+ if (appinfo->parent_relid != parentRTindex)+ continue;++ childRTindex = appinfo->child_relid;+ childRTE = root->simple_rte_array[childRTindex];++ /*+ * The child rel's RelOptInfo was already created during+ * add_base_rels_to_query.+ */+ childrel = find_base_rel(root, childRTindex);+ Assert(childrel->reloptkind == RELOPT_OTHER_MEMBER_REL);++ /*+ * We have to copy the parent's quals to the child, with appropriate+ * substitution of variables. However, only the baserestrictinfo+ * quals are needed before we can check for constraint exclusion; so+ * do that first and then check to see if we can disregard this child.+ *+ * The child rel's targetlist might contain non-Var expressions, which+ * means that substitution into the quals could produce opportunities+ * for const-simplification, and perhaps even pseudoconstant quals.+ * Therefore, transform each RestrictInfo separately to see if it+ * reduces to a constant or pseudoconstant. (We must process them+ * separately to keep track of the security level of each qual.)+ */+ childquals = NIL;+ cq_min_security = UINT_MAX;+ have_const_false_cq = false;+ foreach(lc, rel->baserestrictinfo)+ {+ RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);+ Node *childqual;+ ListCell *lc2;++ Assert(IsA(rinfo, RestrictInfo));+ childqual = adjust_appendrel_attrs(root,+ (Node *) rinfo->clause,+ 1, &appinfo);+ childqual = eval_const_expressions(root, childqual);+ /* check for flat-out constant */+ if (childqual && IsA(childqual, Const))+ {+ if (((Const *) childqual)->constisnull ||+ !DatumGetBool(((Const *) childqual)->constvalue))+ {+ /* Restriction reduces to constant FALSE or NULL */+ have_const_false_cq = true;+ break;+ }+ /* Restriction reduces to constant TRUE, so drop it */+ continue;+ }+ /* might have gotten an AND clause, if so flatten it */+ foreach(lc2, make_ands_implicit((Expr *) childqual))+ {+ Node *onecq = (Node *) lfirst(lc2);+ bool pseudoconstant;++ /* check for pseudoconstant (no Vars or volatile functions) */+ pseudoconstant =+ !contain_vars_of_level(onecq, 0) &&+ !contain_volatile_functions(onecq);+ if (pseudoconstant)+ {+ /* tell createplan.c to check for gating quals */+ root->hasPseudoConstantQuals = true;+ }+ /* reconstitute RestrictInfo with appropriate properties */+ childquals = lappend(childquals,+ make_restrictinfo((Expr *) onecq,+ rinfo->is_pushed_down,+ rinfo->outerjoin_delayed,+ pseudoconstant,+ rinfo->security_level,+ NULL, NULL, NULL));+ /* track minimum security level among child quals */+ cq_min_security = Min(cq_min_security, rinfo->security_level);+ }+ }++ /*+ * In addition to the quals inherited from the parent, we might have+ * securityQuals associated with this particular child node.+ * (Currently this can only happen in appendrels originating from+ * UNION ALL; inheritance child tables don't have their own+ * securityQuals, see expand_inherited_rtentry().) Pull any such+ * securityQuals up into the baserestrictinfo for the child. This is+ * similar to process_security_barrier_quals() for the parent rel,+ * except that we can't make any general deductions from such quals,+ * since they don't hold for the whole appendrel.+ */+ if (childRTE->securityQuals)+ {+ Index security_level = 0;++ foreach(lc, childRTE->securityQuals)+ {+ List *qualset = (List *) lfirst(lc);+ ListCell *lc2;++ foreach(lc2, qualset)+ {+ Expr *qual = (Expr *) lfirst(lc2);++ /* not likely that we'd see constants here, so no check */+ childquals = lappend(childquals,+ make_restrictinfo(qual,+ true, false, false,+ security_level,+ NULL, NULL, NULL));+ cq_min_security = Min(cq_min_security, security_level);+ }+ security_level++;+ }+ Assert(security_level <= root->qual_security_level);+ }++ /*+ * OK, we've got all the baserestrictinfo quals for this child.+ */+ childrel->baserestrictinfo = childquals;+ childrel->baserestrict_min_security = cq_min_security;++ if (have_const_false_cq)+ {+ /*+ * Some restriction clause reduced to constant FALSE or NULL after+ * substitution, so this child need not be scanned.+ */+ set_dummy_rel_pathlist(childrel);+ continue;+ }++ if (did_pruning && !bms_is_member(appinfo->child_relid, live_children))+ {+ /* This partition was pruned; skip it. */+ set_dummy_rel_pathlist(childrel);+ continue;+ }++ if (relation_excluded_by_constraints(root, childrel, childRTE))+ {+ /* This child is excluded; skip it. */+ set_dummy_rel_pathlist(childrel);+ continue;+ }++ /*+ * Add missing Vars to child's reltarget.+ *+ * add_inherit_target_child_root() would've added only those that are+ * needed to be present in the top-level tlist (or ones that+ * preprocess_targetlist thinks are needed to be in the tlist.) We+ * may need other attributes such as those contained in WHERE clauses,+ * which are already computed for the parent during+ * deconstruct_jointree processing of the original query (child's+ * query never goes through deconstruct_jointree.)+ */+ translated_exprs = (List *)+ adjust_appendrel_attrs(root,+ (Node *) rel->reltarget->exprs,+ 1, &appinfo);+ child_target_exprs = childrel->reltarget->exprs;+ foreach(lc, translated_exprs)+ {+ Expr *expr = lfirst(lc);++ if (!list_member(child_target_exprs, expr))+ child_target_exprs = lappend(child_target_exprs, expr);+ }++ subroot = root->inh_target_child_roots[childRTindex];++ /*+ * Also, We have to find any ECs containing parent's expressions and+ * *replace* them with their copies containing child expressions.+ */+ if (rel->has_eclass_joins || has_useful_pathkeys(root, rel))+ {+ /*+ * First make copies for ECs for the child's root, because some+ * might be modified to replace parent EC expressions by child+ * expressions in add_child_rel_equivalences.+ */+ subroot->eq_classes = NIL;+ foreach(lc, root->eq_classes)+ {+ EquivalenceClass *ec = lfirst(lc);+ EquivalenceClass *new_ec = makeNode(EquivalenceClass);++ /*+ * First memcpy which creates shallow copies of all+ * the members and then make copies of members that could+ * change.+ *+ * XXX comment in _copyPathKey says it's OK to recycle EC+ * pointers, but as long as we do the whole planning for a+ * given child using a given root, copying ECs like this+ * shouldn't be a problem. Maybe, the following code could+ * be in _copyEquivalenceClass()?+ */+ memcpy(new_ec, ec, sizeof(EquivalenceClass));+ new_ec->ec_opfamilies = list_copy(ec->ec_opfamilies);+ new_ec->ec_members = list_copy(ec->ec_members);+ new_ec->ec_sources = list_copy(ec->ec_sources);+ new_ec->ec_derives = list_copy(ec->ec_derives);+ new_ec->ec_relids = bms_copy(ec->ec_relids);++ subroot->eq_classes = lappend(subroot->eq_classes, new_ec);+ }++ add_child_rel_equivalences(subroot, appinfo, rel, childrel, true);+ }+ childrel->has_eclass_joins = rel->has_eclass_joins;++ /* Translate join quals. */+ childrel->joininfo = (List *)+ adjust_appendrel_attrs(subroot,+ (Node *) rel->joininfo,+ 1, &appinfo);++ /*+ * If parallelism is allowable for this query in general, see whether+ * it's allowable for this childrel in particular. For consistency,+ * do this before calling set_rel_size() for the child.+ */+ if (root->glob->parallelModeOK)+ set_rel_consider_parallel(subroot, childrel, childRTE);++ /*+ * Compute the child's size using possibly modified subroot.+ */+ set_rel_size(subroot, childrel, childRTindex, childRTE);++ /* If the child itself is partitioned it may turn into a dummy rel. */+ if (IS_DUMMY_REL(childrel))+ continue;++ /* We have at least one live child. */+ has_live_children = true;++ Assert(childrel->rows > 0);+ }++ if (has_live_children)+ {+ /*+ * Set a non-zero value here to cope with the caller's requirement+ * that non-dummy relations are actually not empty. We don't try to+ * be accurate here, because we're not going to create a path that+ * combines the children outputs.+ */+ rel->rows = 1;+ }+ else+ {+ /*+ * All children were excluded by constraints, so mark the relation+ * ass dummy. We must do this in this phase so that the rel's+ * dummy-ness is visible when we generate paths for other rels.+ */+ set_dummy_rel_pathlist(rel);+ }+}++/*+ * set_inherit_target_rel_pathlists+ * Build access paths for the child target relations+ *+ * Similar to set_append_rel_pathlist, except that we build paths of the+ * children, but don't build an Append path.+ */+static void+set_inherit_target_rel_pathlists(PlannerInfo *root, RelOptInfo *rel,+ Index rti, RangeTblEntry *rte)+{+ int parentRTindex = rti;+ ListCell *l;++ /* Nothing to do if all the children were excluded. */+ if (IS_DUMMY_REL(rel))+ return;++ /* Generate access paths for each of the children of passed-in rel */+ foreach(l, root->append_rel_list)+ {+ AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(l);+ int childRTindex;+ RangeTblEntry *childRTE;+ RelOptInfo *childrel;+ PlannerInfo *subroot;++ /* append_rel_list contains all append rels; ignore others */+ if (appinfo->parent_relid != parentRTindex)+ continue;++ /* Re-locate the child RTE and RelOptInfo */+ childRTindex = appinfo->child_relid;+ childRTE = root->simple_rte_array[childRTindex];+ childrel = root->simple_rel_array[childRTindex];+ subroot = root->inh_target_child_roots[childRTindex];+ /* Transfer the value from main root to subroot. */+ subroot->total_table_pages = root->total_table_pages;++ /*+ * If set_append_rel_size() decided the parent appendrel was+ * parallel-unsafe at some point after visiting this child rel, we+ * need to propagate the unsafety marking down to the child, so that+ * we don't generate useless partial paths for it.+ */+ if (!rel->consider_parallel)+ childrel->consider_parallel = false;++ /*+ * Compute the child's access paths.+ */+ set_rel_pathlist(subroot, childrel, childRTindex, childRTE);+ }+}++/*
* set_append_rel_size
* Set size estimates for a simple "append relation"
*
@@ -1184,7 +1591,7 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
* paths that produce those sort orderings).
*/
if (rel->has_eclass_joins || has_useful_pathkeys(root, rel))
- add_child_rel_equivalences(root, appinfo, rel, childrel);+ add_child_rel_equivalences(root, appinfo, rel, childrel, false);
childrel->has_eclass_joins = rel->has_eclass_joins;
/*
@@ -2625,6 +3032,140 @@ generate_gather_paths(PlannerInfo *root, RelOptInfo *rel, bool override_rows)
}
/*
+ * inheritance_make_rel_from_joinlist+ * Perform join planning for all non-dummy leaf inheritance children+ * in their role as an UPDATE/DELETE query's target relation+ *+ * If a child relation is a partitioned table, its children are processed in+ * turn by recursively calling this function.+ */+static void+inheritance_make_rel_from_joinlist(PlannerInfo *root, List *joinlist)+{+ Index resultRelation = root->parse->resultRelation;+ ListCell *lc;+#ifdef USE_ASSERT_CHECKING+ Relids all_baserels;+#endif++ /* For UPDATE/DELETE queries, the top parent can only ever be a table. */+ Assert(root->parse->commandType == CMD_UPDATE ||+ root->parse->commandType == CMD_DELETE);+ Assert(planner_rt_fetch(resultRelation, root)->rtekind == RTE_RELATION);++ /* Nothing to do. */+ if (IS_DUMMY_REL(find_base_rel(root, resultRelation)))+ return;++ foreach(lc, root->append_rel_list)+ {+ AppendRelInfo *appinfo = lfirst(lc);+ PlannerInfo *subroot;+ RelOptInfo *childrel;+ RelOptInfo *childjoinrel;+ List *translated_joinlist;++ if (appinfo->parent_relid != resultRelation)+ continue;++ childrel = find_base_rel(root, appinfo->child_relid);++ /* Ignore excluded/pruned children. */+ if (IS_DUMMY_REL(childrel))+ continue;++ /* Add this child. */+ root->inh_target_child_rels = lappend_int(root->inh_target_child_rels,+ appinfo->child_relid);++ /* Perform join planning with child subroot. */+ subroot = root->inh_target_child_roots[appinfo->child_relid];+ Assert(subroot->parse->resultRelation > 0);++ /*+ * Modify joinlist such that relations joined to the top parent rel+ * appear to be joined to the child rel instead. Do the same for+ * any SpecialJoinInfo structs.+ */+ translated_joinlist = (List *)+ adjust_appendrel_attrs(subroot,+ (Node *) joinlist,+ 1, &appinfo);+ subroot->join_info_list = (List *)+ adjust_appendrel_attrs(subroot,+ (Node *) root->join_info_list,+ 1, &appinfo);++ /*+ * Sub-partitioned tables have to be processed recursively using the+ * translated subroot as the parent, because AppendRelInfos link+ * sub-partitions to their immediate parents, not the root partitioned+ * table.+ */+ if (childrel->part_scheme != NULL)+ {+ inheritance_make_rel_from_joinlist(subroot, translated_joinlist);++ /*+ * Add this child relation as a placeholder in the parent root's+ * inh_target_child_joinrels so that inheritance_planner see same+ * number of entries as inh_target_child_rels.+ */+ root->inh_target_child_joinrels =+ lappend(root->inh_target_child_joinrels, childrel);++ /* Also propagate this child's own children into parent's list. */+ if (subroot->inh_target_child_rels != NIL)+ {+ root->inh_target_child_rels =+ list_concat(root->inh_target_child_rels,+ subroot->inh_target_child_rels);+ root->inh_target_child_joinrels =+ list_concat(root->inh_target_child_joinrels,+ subroot->inh_target_child_joinrels);+ }+ continue;+ }++ /*+ * Since we added the child rel directly into the join tree, we must+ * modify it to be a "base" rel instead of an "other" rel, which the+ * join planning code expects the relations being joined to be.+ */+ childrel->reloptkind = RELOPT_BASEREL;++ Assert(subroot->join_rel_list == NIL);+ Assert(subroot->join_rel_hash == NULL);++ /* Perform join planning and save the resulting RelOptInfo. */+ childjoinrel = make_rel_from_joinlist(subroot, translated_joinlist);++ /*+ * Remember this child target rel. inheritance_planner will perform+ * the remaining steps of planning for each child relation separately.+ * Specifically, it will call grouping_planner on every+ * RelOptInfo contained in the inh_target_child_rels list, each of+ * which represents the source of tuples to be modified for a given+ * target child rel.+ */+ root->inh_target_child_joinrels =+ lappend(root->inh_target_child_joinrels, childjoinrel);+#ifdef USE_ASSERT_CHECKING+ /*+ * The following implements essentially the same Assert as in+ * make_one_rel, our caller.+ */+ all_baserels = bms_copy(root->all_baserels);+ all_baserels = bms_del_member(all_baserels,+ root->parse->resultRelation);+ all_baserels = bms_add_member(all_baserels,+ subroot->parse->resultRelation);+ Assert(bms_equal(childjoinrel->relids, all_baserels));+#endif+ }+}++/*
* make_rel_from_joinlist
* Build access paths using a "joinlist" to guide the join path search.
*
diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.cindex 6e134ae1d2..10136ef940 100644--- a/src/backend/optimizer/path/equivclass.c+++ b/src/backend/optimizer/path/equivclass.c@@ -2104,12 +2104,16 @@ match_eclasses_to_foreign_key_col(PlannerInfo *root,
*
* parent_rel and child_rel could be derived from appinfo, but since the
* caller has already computed them, we might as well just pass them in.
+ *+ * If 'replace' is true then the child EC members *replace* the corresponding+ * parent members.
*/
void
add_child_rel_equivalences(PlannerInfo *root,
AppendRelInfo *appinfo,
RelOptInfo *parent_rel,
- RelOptInfo *child_rel)+ RelOptInfo *child_rel,+ bool replace)
{
ListCell *lc1;
@@ -2117,14 +2121,23 @@ add_child_rel_equivalences(PlannerInfo *root,
{
EquivalenceClass *cur_ec = (EquivalenceClass *) lfirst(lc1);
ListCell *lc2;
+ ListCell *prev;+ ListCell *next;
/*
* If this EC contains a volatile expression, then generating child
* EMs would be downright dangerous, so skip it. We rely on a
- * volatile EC having only one EM.+ * volatile EC having only one EM. If the caller asked to *replace*+ * the original parent expression with the child one, then it's+ * okay to proceed, because we wouldn't be adding another expression+ * as being equivalent in that case.
*/
if (cur_ec->ec_has_volatile)
- continue;+ {+ Assert(list_length(cur_ec->ec_members) == 1);+ if (!replace)+ continue;+ }
/*
* No point in searching if parent rel not mentioned in eclass; but we
@@ -2134,12 +2147,18 @@ add_child_rel_equivalences(PlannerInfo *root,
!bms_is_subset(parent_rel->relids, cur_ec->ec_relids))
continue;
- foreach(lc2, cur_ec->ec_members)+ prev = NULL;+ for (lc2 = list_head(cur_ec->ec_members); lc2 != NULL; lc2 = next)
{
EquivalenceMember *cur_em = (EquivalenceMember *) lfirst(lc2);
+ next = lnext(lc2);+
if (cur_em->em_is_const)
+ {+ prev = lc2;
continue; /* ignore consts here */
+ }
/* Does it reference parent_rel? */
if (bms_overlap(cur_em->em_relids, parent_rel->relids))
@@ -2177,10 +2196,38 @@ add_child_rel_equivalences(PlannerInfo *root,
child_rel->relids);
}
+ /*+ * Caller may have asked us to replace the parent expression+ * with the child expression, so delete the parent expression+ * first.+ */+ if (replace)+ cur_ec->ec_members = list_delete_cell(cur_ec->ec_members,+ lc2, prev);++ /*+ * If we're replacing, then the new member isn't really a+ * a child, so em_is_child should be set to false.+ */
(void) add_eq_member(cur_ec, child_expr,
new_relids, new_nullable_relids,
- true, cur_em->em_datatype);+ !replace, cur_em->em_datatype);
}
+ else+ prev = lc2;+ }++ if (replace)+ {+ /*+ * Now fix up EC's relids set. It's OK to modify EC like this,+ * because caller must have made a copy of the original EC.+ * For example, see adjust_inherited_target_child_root.+ */+ cur_ec->ec_relids = bms_difference(cur_ec->ec_relids,+ parent_rel->relids);+ cur_ec->ec_relids = bms_add_members(cur_ec->ec_relids,+ child_rel->relids);
}
}
}
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.cindex 8bfe9c3ff7..663130461a 100644--- a/src/backend/optimizer/path/joinrels.c+++ b/src/backend/optimizer/path/joinrels.c@@ -1463,7 +1463,7 @@ update_child_rel_info(PlannerInfo *root,
/* Make child entries in the EquivalenceClass as well */
if (rel->has_eclass_joins || has_useful_pathkeys(root, rel))
- add_child_rel_equivalences(root, appinfo, rel, childrel);+ add_child_rel_equivalences(root, appinfo, rel, childrel, false);
childrel->has_eclass_joins = rel->has_eclass_joins;
}
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.cindex 97d0c28132..1e1c7efef9 100644--- a/src/backend/optimizer/plan/createplan.c+++ b/src/backend/optimizer/plan/createplan.c@@ -2019,12 +2019,7 @@ create_groupingsets_plan(PlannerInfo *root, GroupingSetsPath *best_path)
/*
* During setrefs.c, we'll need the grouping_map to fix up the cols lists
* in GroupingFunc nodes. Save it for setrefs.c to use.
- *- * This doesn't work if we're in an inheritance subtree (see notes in- * create_modifytable_plan). Fortunately we can't be because there would- * never be grouping in an UPDATE/DELETE; but let's Assert that.
*/
- Assert(root->inhTargetKind == INHKIND_NONE);
Assert(root->grouping_map == NULL);
root->grouping_map = grouping_map;
@@ -2181,12 +2176,7 @@ create_minmaxagg_plan(PlannerInfo *root, MinMaxAggPath *best_path)
* with InitPlan output params. (We can't just do that locally in the
* MinMaxAgg node, because path nodes above here may have Agg references
* as well.) Save the mmaggregates list to tell setrefs.c to do that.
- *- * This doesn't work if we're in an inheritance subtree (see notes in- * create_modifytable_plan). Fortunately we can't be because there would- * never be aggregates in an UPDATE/DELETE; but let's Assert that.
*/
- Assert(root->inhTargetKind == INHKIND_NONE);
Assert(root->minmax_aggs == NIL);
root->minmax_aggs = best_path->mmaggregates;
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.cindex fc97a1bb50..78557aeecb 100644--- a/src/backend/optimizer/plan/planmain.c+++ b/src/backend/optimizer/plan/planmain.c@@ -28,7 +28,7 @@
#include "optimizer/paths.h"
#include "optimizer/placeholder.h"
#include "optimizer/planmain.h"
-+#include "optimizer/prep.h"
/*
* query_planner
@@ -59,6 +59,7 @@ query_planner(PlannerInfo *root, List *tlist,
Query *parse = root->parse;
List *joinlist;
RelOptInfo *final_rel;
+ Index rti;
/*
* If the query has an empty join tree, then it's something easy like
@@ -232,13 +233,52 @@ query_planner(PlannerInfo *root, List *tlist,
extract_restriction_or_clauses(root);
/*
+ * Construct the all_baserels Relids set.+ */+ root->all_baserels = NULL;+ for (rti = 1; rti < root->simple_rel_array_size; rti++)+ {+ RelOptInfo *brel = root->simple_rel_array[rti];++ /* there may be empty slots corresponding to non-baserel RTEs */+ if (brel == NULL)+ continue;++ Assert(brel->relid == rti); /* sanity check on array */++ /* ignore RTEs that are "other rels" */+ if (brel->reloptkind != RELOPT_BASEREL)+ continue;++ root->all_baserels = bms_add_member(root->all_baserels, brel->relid);+ }++ /*+ * Add child subroots needed to use during planning for individual child+ * targets+ */+ if (root->inherited_update)+ {+ root->inh_target_child_roots = (PlannerInfo **)+ palloc0(root->simple_rel_array_size *+ sizeof(PlannerInfo *));+ add_inherited_target_child_roots(root);+ }++ /*
* Ready to do the primary planning.
*/
final_rel = make_one_rel(root, joinlist);
- /* Check that we got at least one usable path */- if (!final_rel || !final_rel->cheapest_total_path ||- final_rel->cheapest_total_path->param_info != NULL)+ /*+ * Check that we got at least one usable path. In the case of an+ * inherited update/delete operation, no path has been created for+ * the query's actual target relation yet.+ */+ if (!root->inherited_update &&+ (!final_rel ||+ !final_rel->cheapest_total_path ||+ final_rel->cheapest_total_path->param_info != NULL))
elog(ERROR, "failed to construct the join relation");
return final_rel;
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.cindex 5ba612922f..703babfdf0 100644--- a/src/backend/optimizer/plan/planner.c+++ b/src/backend/optimizer/plan/planner.c@@ -39,6 +39,7 @@
#ifdef OPTIMIZER_DEBUG
#include "nodes/print.h"
#endif
+#include "nodes/relation.h"
#include "optimizer/appendinfo.h"
#include "optimizer/clauses.h"
#include "optimizer/cost.h"
@@ -131,7 +132,7 @@ static Node *preprocess_expression(PlannerInfo *root, Node *expr, int kind);
static void preprocess_qual_conditions(PlannerInfo *root, Node *jtnode);
static void inheritance_planner(PlannerInfo *root);
static void grouping_planner(PlannerInfo *root, bool inheritance_update,
- double tuple_fraction);+ RelOptInfo *planned_rel, double tuple_fraction);
static grouping_sets_data *preprocess_grouping_sets(PlannerInfo *root);
static List *remap_to_groupclause_idx(List *groupClause, List *gsets,
int *tleref_to_colnum_map);
@@ -635,7 +636,6 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
root->grouping_map = NULL;
root->minmax_aggs = NIL;
root->qual_security_level = 0;
- root->inhTargetKind = INHKIND_NONE;
root->hasRecursion = hasRecursion;
if (hasRecursion)
root->wt_param_id = assign_special_exec_param(root);
@@ -725,6 +725,13 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
expand_inherited_tables(root);
/*
+ * Now that we have figured out "actual" inheritance situation of the+ * relations, set whether the query is an inherited UPDATE/DELETE.+ */+ root->inherited_update = (parse->resultRelation &&+ rt_fetch(parse->resultRelation, parse->rtable)->inh);++ /*
* Set hasHavingQual to remember if HAVING clause is present. Needed
* because preprocess_expression will reduce a constant-true condition to
* an empty qual list ... but "HAVING TRUE" is not a semantic no-op.
@@ -975,7 +982,7 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
rt_fetch(parse->resultRelation, parse->rtable)->inh)
inheritance_planner(root);
else
- grouping_planner(root, false, tuple_fraction);+ grouping_planner(root, false, NULL, tuple_fraction);
/*
* Capture the set of outer-level param IDs we have access to, for use in
@@ -1151,13 +1158,41 @@ preprocess_phv_expression(PlannerInfo *root, Expr *expr)
* inheritance set.
*
* We have to handle this case differently from cases where a source relation
- * is an inheritance set. Source inheritance is expanded at the bottom of the- * plan tree (see allpaths.c), but target inheritance has to be expanded at- * the top. The reason is that for UPDATE, each target relation needs a- * different targetlist matching its own column set. Fortunately,+ * is an inheritance set, where outputs of all the children are combined and+ * combined output consumed using the source relation's (parent's) column set.+ * For UPDATE, each target relation, where the query's output will go, needs+ * a different targetlist matching its own column set. So, we will need to+ * translate the query such that it produces the desired output required by+ * each of the child target relations and plan each separately. Fortunately,
* the UPDATE/DELETE target can never be the nullable side of an outer join,
* so it's OK to generate the plan this way.
*
+ * Planning steps that need to be performed separately for each child and+ * any preliminary processing needed for that are handled by the following+ * sub-routines of query_planner:+ *+ * add_inherit_target_roots - this creates copies of PlannerInfo for each+ * child after query_planner has finished processing the join tree and+ * creating EquivalenceClasses, so that working state of planning need+ * not be created afresh for each child, especially the various arrays+ *+ * set_inherit_target_rel_sizes - this sets size estimates for child+ * relations, replace the parent EC members by corresponding child ones+ * in their respective subroots+ *+ * set_inherit_target_rel_pathlists - this creates Paths for scanning+ * individual child relations+ *+ * inherit_make_rel_from_joinlist - this translates the jointree, replacing+ * the target relation in the original jointree (the root parent) by+ * individual child target relations and performs join planning on the+ * resulting join tree, saving the RelOptInfos of resulting join relations+ * into the top-level PlannerInfo+ *+ * Finally, here we apply grouping_planner to each child join relation+ * produced by set_inherit_target_rel_pathlists to so that its path produces+ * the desired targetlist.+ *
* Returns nothing; the useful output is in the Paths we attach to
* the (UPPERREL_FINAL, NULL) upperrel stored in *root.
*
@@ -1169,14 +1204,8 @@ inheritance_planner(PlannerInfo *root)
{
Query *parse = root->parse;
int top_parentRTindex = parse->resultRelation;
- Bitmapset *subqueryRTindexes;- Bitmapset *modifiableARIindexes;
int nominalRelation = -1;
Index rootRelation = 0;
- List *final_rtable = NIL;- int save_rel_array_size = 0;- RelOptInfo **save_rel_array = NULL;- AppendRelInfo **save_append_rel_array = NULL;
List *subpaths = NIL;
List *subroots = NIL;
List *resultRelations = NIL;
@@ -1184,70 +1213,47 @@ inheritance_planner(PlannerInfo *root)
List *returningLists = NIL;
List *rowMarks;
RelOptInfo *final_rel;
- ListCell *lc;- Index rti;+ ListCell *lc1,+ *lc2;
RangeTblEntry *parent_rte;
- PlannerInfo *parent_root;- Query *parent_parse;- Bitmapset *parent_relids = bms_make_singleton(top_parentRTindex);- PlannerInfo **parent_roots = NULL;+ List *tlist;+ standard_qp_extra qp_extra;+ RelOptInfo *planned_rel;+ /* Inheritance is never used for insert. */
Assert(parse->commandType != CMD_INSERT);
/*
- * We generate a modified instance of the original Query for each target- * relation, plan that, and put all the plans into a list that will be- * controlled by a single ModifyTable node. All the instances share the- * same rangetable, but each instance must have its own set of subquery- * RTEs within the finished rangetable because (1) they are likely to get- * scribbled on during planning, and (2) it's not inconceivable that- * subqueries could get planned differently in different cases. We need- * not create duplicate copies of other RTE kinds, in particular not the- * target relations, because they don't have either of those issues. Not- * having to duplicate the target relations is important because doing so- * (1) would result in a rangetable of length O(N^2) for N targets, with- * at least O(N^3) work expended here; and (2) would greatly complicate- * management of the rowMarks list.+ * Let query_planner generate the access paths for the query for each+ * target child relation.
*
- * To begin with, generate a bitmapset of the relids of the subquery RTEs.+ * First, save the unexpanded version of the query's targetlist.+ * create_inherit_target_child_root will use it as base when expanding+ * it for a given child relation as the query's target relation instead+ * of the parent.
*/
- subqueryRTindexes = NULL;- rti = 1;- foreach(lc, parse->rtable)- {- RangeTblEntry *rte = lfirst_node(RangeTblEntry, lc);-- if (rte->rtekind == RTE_SUBQUERY)- subqueryRTindexes = bms_add_member(subqueryRTindexes, rti);- rti++;- }+ root->unexpanded_tlist = list_copy(root->parse->targetList);+ tlist = preprocess_targetlist(root);+ root->processed_tlist = tlist;+ qp_extra.tlist = tlist;+ qp_extra.activeWindows = NIL;+ qp_extra.groupClause = NIL;+ planned_rel = query_planner(root, tlist, standard_qp_callback, &qp_extra);
/*
- * Next, we want to identify which AppendRelInfo items contain references- * to any of the aforesaid subquery RTEs. These items will need to be- * copied and modified to adjust their subquery references; whereas the- * other ones need not be touched. It's worth being tense over this- * because we can usually avoid processing most of the AppendRelInfo- * items, thereby saving O(N^2) space and time when the target is a large- * inheritance tree. We can identify AppendRelInfo items by their- * child_relid, since that should be unique within the list.+ * If it turned out during query planning that all the children are dummy+ * (pruned or excluded by constraints), no need to do the steps below.+ * Let grouping_planner finish up the final path.
*/
- modifiableARIindexes = NULL;- if (subqueryRTindexes != NULL)+ if (IS_DUMMY_REL(planned_rel))
{
- foreach(lc, root->append_rel_list)- {- AppendRelInfo *appinfo = lfirst_node(AppendRelInfo, lc);-- if (bms_is_member(appinfo->parent_relid, subqueryRTindexes) ||- bms_is_member(appinfo->child_relid, subqueryRTindexes) ||- bms_overlap(pull_varnos((Node *) appinfo->translated_vars),- subqueryRTindexes))- modifiableARIindexes = bms_add_member(modifiableARIindexes,- appinfo->child_relid);- }+ grouping_planner(root, false, planned_rel, 0.0);+ return;
}
+ Assert(planned_rel->relid == top_parentRTindex);+ Assert(planned_rel->reloptkind == RELOPT_BASEREL);+
/*
* If the parent RTE is a partitioned table, we should use that as the
* nominal target relation, because the RTEs added for partitioned tables
@@ -1255,7 +1261,7 @@ inheritance_planner(PlannerInfo *root)
* not appear anywhere else in the plan, so the confusion explained below
* for non-partitioning inheritance cases is not possible.
*/
- parent_rte = rt_fetch(top_parentRTindex, root->parse->rtable);+ parent_rte = planner_rt_fetch(top_parentRTindex, root);
if (parent_rte->relkind == RELKIND_PARTITIONED_TABLE)
{
nominalRelation = top_parentRTindex;
@@ -1263,95 +1269,39 @@ inheritance_planner(PlannerInfo *root)
}
/*
- * The PlannerInfo for each child is obtained by translating the relevant- * members of the PlannerInfo for its immediate parent, which we find- * using the parent_relid in its AppendRelInfo. We save the PlannerInfo- * for each parent in an array indexed by relid for fast retrieval. Since- * the maximum number of parents is limited by the number of RTEs in the- * query, we use that number to allocate the array. An extra entry is- * needed since relids start from 1.+ * Get on with finalizing the path for each child target relation by+ * calling grouping_planner on its joinrel.
*/
- parent_roots = (PlannerInfo **) palloc0((list_length(parse->rtable) + 1) *- sizeof(PlannerInfo *));- parent_roots[top_parentRTindex] = root;-- /*- * And now we can get on with generating a plan for each child table.- */- foreach(lc, root->append_rel_list)+ forboth(lc1, root->inh_target_child_rels,+ lc2, root->inh_target_child_joinrels)
{
- AppendRelInfo *appinfo = lfirst_node(AppendRelInfo, lc);- PlannerInfo *subroot;+ Index childRTindex = lfirst_int(lc1);+ RelOptInfo *childjoinrel = lfirst(lc2);+ PlannerInfo *subroot = root->inh_target_child_roots[childRTindex];+ AppendRelInfo *appinfo = root->append_rel_array[childRTindex];
RangeTblEntry *child_rte;
RelOptInfo *sub_final_rel;
Path *subpath;
- /* append_rel_list contains all append rels; ignore others */- if (!bms_is_member(appinfo->parent_relid, parent_relids))- continue;-- /*- * expand_inherited_rtentry() always processes a parent before any of- * that parent's children, so the parent_root for this relation should- * already be available.- */- parent_root = parent_roots[appinfo->parent_relid];- Assert(parent_root != NULL);- parent_parse = parent_root->parse;-- /*- * We need a working copy of the PlannerInfo so that we can control- * propagation of information back to the main copy.- */- subroot = makeNode(PlannerInfo);- memcpy(subroot, parent_root, sizeof(PlannerInfo));-- /*- * Generate modified query with this rel as target. We first apply- * adjust_appendrel_attrs, which copies the Query and changes- * references to the parent RTE to refer to the current child RTE,- * then fool around with subquery RTEs.- */- subroot->parse = (Query *)- adjust_appendrel_attrs(parent_root,- (Node *) parent_parse,- 1, &appinfo);+ Assert(subroot != NULL);+ Assert(subroot->parse->resultRelation == childRTindex);
/*
* If there are securityQuals attached to the parent, move them to the
* child rel (they've already been transformed properly for that).
*/
- parent_rte = rt_fetch(appinfo->parent_relid, subroot->parse->rtable);- child_rte = rt_fetch(appinfo->child_relid, subroot->parse->rtable);+ parent_rte = planner_rt_fetch(appinfo->parent_relid, subroot);+ child_rte = planner_rt_fetch(appinfo->child_relid, subroot);
child_rte->securityQuals = parent_rte->securityQuals;
parent_rte->securityQuals = NIL;
/*
- * Mark whether we're planning a query to a partitioned table or an- * inheritance parent.+ * Ignore a partitioned child. Instead, the paths of its children will+ * be added to subpaths.
*/
- subroot->inhTargetKind =- (rootRelation != 0) ? INHKIND_PARTITIONED : INHKIND_INHERITED;-- /*- * If this child is further partitioned, remember it as a parent.- * Since a partitioned table does not have any data, we don't need to- * create a plan for it, and we can stop processing it here. We do,- * however, need to remember its modified PlannerInfo for use when- * processing its children, since we'll update their varnos based on- * the delta from immediate parent to child, not from top to child.- *- * Note: a very non-obvious point is that we have not yet added- * duplicate subquery RTEs to the subroot's rtable. We mustn't,- * because then its children would have two sets of duplicates,- * confusing matters.- */- if (child_rte->inh)+ if (childjoinrel->part_scheme)
{
- Assert(child_rte->relkind == RELKIND_PARTITIONED_TABLE);- parent_relids = bms_add_member(parent_relids, appinfo->child_relid);- parent_roots[appinfo->child_relid] = subroot;-+ Assert(child_rte->inh);
continue;
}
@@ -1379,111 +1329,8 @@ inheritance_planner(PlannerInfo *root)
if (nominalRelation < 0)
nominalRelation = appinfo->child_relid;
- /*- * The rowMarks list might contain references to subquery RTEs, so- * make a copy that we can apply ChangeVarNodes to. (Fortunately, the- * executor doesn't need to see the modified copies --- we can just- * pass it the original rowMarks list.)- */- subroot->rowMarks = copyObject(parent_root->rowMarks);-- /*- * The append_rel_list likewise might contain references to subquery- * RTEs (if any subqueries were flattenable UNION ALLs). So prepare- * to apply ChangeVarNodes to that, too. As explained above, we only- * want to copy items that actually contain such references; the rest- * can just get linked into the subroot's append_rel_list.- *- * If we know there are no such references, we can just use the outer- * append_rel_list unmodified.- */- if (modifiableARIindexes != NULL)- {- ListCell *lc2;-- subroot->append_rel_list = NIL;- foreach(lc2, parent_root->append_rel_list)- {- AppendRelInfo *appinfo2 = lfirst_node(AppendRelInfo, lc2);-- if (bms_is_member(appinfo2->child_relid, modifiableARIindexes))- appinfo2 = copyObject(appinfo2);-- subroot->append_rel_list = lappend(subroot->append_rel_list,- appinfo2);- }- }-- /*- * Add placeholders to the child Query's rangetable list to fill the- * RT indexes already reserved for subqueries in previous children.- * These won't be referenced, so there's no need to make them very- * valid-looking.- */- while (list_length(subroot->parse->rtable) < list_length(final_rtable))- subroot->parse->rtable = lappend(subroot->parse->rtable,- makeNode(RangeTblEntry));-- /*- * If this isn't the first child Query, generate duplicates of all- * subquery RTEs, and adjust Var numbering to reference the- * duplicates. To simplify the loop logic, we scan the original rtable- * not the copy just made by adjust_appendrel_attrs; that should be OK- * since subquery RTEs couldn't contain any references to the target- * rel.- */- if (final_rtable != NIL && subqueryRTindexes != NULL)- {- ListCell *lr;-- rti = 1;- foreach(lr, parent_parse->rtable)- {- RangeTblEntry *rte = lfirst_node(RangeTblEntry, lr);-- if (bms_is_member(rti, subqueryRTindexes))- {- Index newrti;-- /*- * The RTE can't contain any references to its own RT- * index, except in its securityQuals, so we can save a- * few cycles by applying ChangeVarNodes to the rest of- * the rangetable before we append the RTE to it.- */- newrti = list_length(subroot->parse->rtable) + 1;- ChangeVarNodes((Node *) subroot->parse, rti, newrti, 0);- ChangeVarNodes((Node *) subroot->rowMarks, rti, newrti, 0);- /* Skip processing unchanging parts of append_rel_list */- if (modifiableARIindexes != NULL)- {- ListCell *lc2;-- foreach(lc2, subroot->append_rel_list)- {- AppendRelInfo *appinfo2 = lfirst_node(AppendRelInfo, lc2);-- if (bms_is_member(appinfo2->child_relid,- modifiableARIindexes))- ChangeVarNodes((Node *) appinfo2, rti, newrti, 0);- }- }- rte = copyObject(rte);- ChangeVarNodes((Node *) rte->securityQuals, rti, newrti, 0);- subroot->parse->rtable = lappend(subroot->parse->rtable,- rte);- }- rti++;- }- }-- /* There shouldn't be any OJ info to translate, as yet */- Assert(subroot->join_info_list == NIL);- /* and we haven't created PlaceHolderInfos, either */- Assert(subroot->placeholder_list == NIL);-- /* Generate Path(s) for accessing this result relation */- grouping_planner(subroot, true, 0.0 /* retrieve all tuples */ );+ /* Apply the top-level targetlist to childjoinrel's path. */+ grouping_planner(subroot, true, childjoinrel, 0.0);
/*
* Select cheapest path in case there's more than one. We always run
@@ -1495,45 +1342,10 @@ inheritance_planner(PlannerInfo *root)
subpath = sub_final_rel->cheapest_total_path;
/*
- * If this child rel was excluded by constraint exclusion, exclude it- * from the result plan.+ * child rel cannot be empty, or inheritance_make_rel_from_joinlist+ * wouldn't have put it in the list to begin with.
*/
- if (IS_DUMMY_PATH(subpath))- continue;-- /*- * If this is the first non-excluded child, its post-planning rtable- * becomes the initial contents of final_rtable; otherwise, append- * just its modified subquery RTEs to final_rtable.- */- if (final_rtable == NIL)- final_rtable = subroot->parse->rtable;- else- final_rtable = list_concat(final_rtable,- list_copy_tail(subroot->parse->rtable,- list_length(final_rtable)));-- /*- * We need to collect all the RelOptInfos from all child plans into- * the main PlannerInfo, since setrefs.c will need them. We use the- * last child's simple_rel_array (previous ones are too short), so we- * have to propagate forward the RelOptInfos that were already built- * in previous children.- */- Assert(subroot->simple_rel_array_size >= save_rel_array_size);- for (rti = 1; rti < save_rel_array_size; rti++)- {- RelOptInfo *brel = save_rel_array[rti];-- if (brel)- subroot->simple_rel_array[rti] = brel;- }- save_rel_array_size = subroot->simple_rel_array_size;- save_rel_array = subroot->simple_rel_array;- save_append_rel_array = subroot->append_rel_array;-- /* Make sure any initplans from this rel get into the outer list */- root->init_plans = subroot->init_plans;+ Assert(!IS_DUMMY_PATH(subpath));
/* Build list of sub-paths */
subpaths = lappend(subpaths, subpath);
@@ -1565,36 +1377,6 @@ inheritance_planner(PlannerInfo *root)
*/
/*
- * If we managed to exclude every child rel, return a dummy plan; it- * doesn't even need a ModifyTable node.- */- if (subpaths == NIL)- {- set_dummy_rel_pathlist(final_rel);- return;- }-- /*- * Put back the final adjusted rtable into the master copy of the Query.- * (We mustn't do this if we found no non-excluded children.)- */- parse->rtable = final_rtable;- root->simple_rel_array_size = save_rel_array_size;- root->simple_rel_array = save_rel_array;- root->append_rel_array = save_append_rel_array;-- /* Must reconstruct master's simple_rte_array, too */- root->simple_rte_array = (RangeTblEntry **)- palloc0((list_length(final_rtable) + 1) * sizeof(RangeTblEntry *));- rti = 1;- foreach(lc, final_rtable)- {- RangeTblEntry *rte = lfirst_node(RangeTblEntry, lc);-- root->simple_rte_array[rti++] = rte;- }-- /*
* If there was a FOR [KEY] UPDATE/SHARE clause, the LockRows node will
* have dealt with fetching non-locked marked rows, else we need to have
* ModifyTable do that.
@@ -1634,6 +1416,12 @@ inheritance_planner(PlannerInfo *root)
* (inheritance_planner will create a single ModifyTable node covering all the
* target tables.)
*
+ * If non-NULL, planned_rel is a RelOptInfo containing paths for the query's+ * top-level joinrel, which the caller produced by itself. In that case, this+ * function only needs to adjust the targetlist of its cheapest_total_path.+ * The only caller that may pass such a RelOptInfo currently is+ * inheritance_planner.+ *
* tuple_fraction is the fraction of tuples we expect will be retrieved.
* tuple_fraction is interpreted as follows:
* 0: expect all tuples to be retrieved (normal case)
@@ -1652,6 +1440,7 @@ inheritance_planner(PlannerInfo *root)
*/
static void
grouping_planner(PlannerInfo *root, bool inheritance_update,
+ RelOptInfo *planned_rel,
double tuple_fraction)
{
Query *parse = root->parse;
@@ -1664,7 +1453,7 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
List *final_targets;
List *final_targets_contain_srfs;
bool final_target_parallel_safe;
- RelOptInfo *current_rel;+ RelOptInfo *current_rel = planned_rel;
RelOptInfo *final_rel;
ListCell *lc;
@@ -1704,6 +1493,7 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
* special work for recursive unions is the responsibility of
* plan_set_operations.
*/
+ Assert(current_rel == NULL);
current_rel = plan_set_operations(root);
/*
@@ -1793,17 +1583,26 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
parse->groupClause = preprocess_groupclause(root, NIL);
}
- /* Preprocess targetlist */- tlist = preprocess_targetlist(root);-
/*
- * We are now done hacking up the query's targetlist. Most of the- * remaining planning work will be done with the PathTarget- * representation of tlists, but save aside the full representation so- * that we can transfer its decoration (resnames etc) to the topmost- * tlist of the finished Plan.+ * Preprocess targetlist, if needed. If the caller has already done+ * query planning, root->processed_tlist already contains the desired+ * targetlist.
*/
- root->processed_tlist = tlist;+ if (planned_rel == NULL)+ {+ tlist = preprocess_targetlist(root);++ /*+ * We are now done hacking up the query's targetlist. Most of the+ * remaining planning work will be done with the PathTarget+ * representation of tlists, but save aside the full representation+ * so that we can transfer its decoration (resnames etc) to the+ * topmost tlist of the finished Plan.+ */+ root->processed_tlist = tlist;+ }+ else+ tlist = root->processed_tlist;
/*
* Collect statistics about aggregates for estimating costs, and mark
@@ -1883,8 +1682,9 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
* We also generate (in standard_qp_callback) pathkey representations
* of the query's sort clause, distinct clause, etc.
*/
- current_rel = query_planner(root, tlist,- standard_qp_callback, &qp_extra);+ if (current_rel == NULL)+ current_rel = query_planner(root, tlist,+ standard_qp_callback, &qp_extra);
/*
* Convert the query's result tlist into PathTarget format.
diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.cindex 77dbf4eba3..87adfa02b1 100644--- a/src/backend/optimizer/prep/prepjointree.c+++ b/src/backend/optimizer/prep/prepjointree.c@@ -917,7 +917,6 @@ pull_up_simple_subquery(PlannerInfo *root, Node *jtnode, RangeTblEntry *rte,
subroot->grouping_map = NULL;
subroot->minmax_aggs = NIL;
subroot->qual_security_level = 0;
- subroot->inhTargetKind = INHKIND_NONE;
subroot->hasRecursion = false;
subroot->wt_param_id = -1;
subroot->non_recursive_path = NULL;
diff --git a/src/backend/optimizer/util/appendinfo.c b/src/backend/optimizer/util/appendinfo.cindex ca6622ece9..34a3ebbbe4 100644--- a/src/backend/optimizer/util/appendinfo.c+++ b/src/backend/optimizer/util/appendinfo.c@@ -394,8 +394,39 @@ adjust_appendrel_attrs_mutator(Node *node,
context->appinfos);
return (Node *) phv;
}
++ /*+ * This is needed, because inheritance_make_rel_from_joinlist needs to+ * translate root->join_info_list executing make_rel_from_joinlist for a+ * given child.+ */+ if (IsA(node, SpecialJoinInfo))+ {+ SpecialJoinInfo *oldinfo = (SpecialJoinInfo *) node;+ SpecialJoinInfo *newinfo = makeNode(SpecialJoinInfo);++ memcpy(newinfo, oldinfo, sizeof(SpecialJoinInfo));+ newinfo->min_lefthand = adjust_child_relids(oldinfo->min_lefthand,+ context->nappinfos,+ context->appinfos);+ newinfo->min_righthand = adjust_child_relids(oldinfo->min_righthand,+ context->nappinfos,+ context->appinfos);+ newinfo->syn_lefthand = adjust_child_relids(oldinfo->syn_lefthand,+ context->nappinfos,+ context->appinfos);+ newinfo->syn_righthand = adjust_child_relids(oldinfo->syn_righthand,+ context->nappinfos,+ context->appinfos);+ newinfo->semi_rhs_exprs =+ (List *) expression_tree_mutator((Node *)+ oldinfo->semi_rhs_exprs,+ adjust_appendrel_attrs_mutator,+ (void *) context);+ return (Node *) newinfo;+ }+
/* Shouldn't need to handle planner auxiliary nodes here */
- Assert(!IsA(node, SpecialJoinInfo));
Assert(!IsA(node, AppendRelInfo));
Assert(!IsA(node, PlaceHolderInfo));
Assert(!IsA(node, MinMaxAggInfo));
diff --git a/src/backend/optimizer/util/inherit.c b/src/backend/optimizer/util/inherit.cindex db474acbc5..0d2b42f72e 100644--- a/src/backend/optimizer/util/inherit.c+++ b/src/backend/optimizer/util/inherit.c@@ -21,11 +21,14 @@
#include "miscadmin.h"
#include "optimizer/appendinfo.h"
#include "optimizer/inherit.h"
+#include "optimizer/planmain.h"
#include "optimizer/planner.h"
#include "optimizer/prep.h"
#include "utils/rel.h"
+static PlannerInfo *create_inherited_target_child_root(PlannerInfo *root,+ AppendRelInfo *appinfo);
static void expand_inherited_rtentry(PlannerInfo *root, RangeTblEntry *rte,
Index rti);
static void expand_partitioned_rtentry(PlannerInfo *root,
@@ -492,3 +495,109 @@ translate_col_privs(const Bitmapset *parent_privs,
return child_privs;
}
++/*+ * add_inherited_target_child_roots+ * For each child of of the query's result relation, this translates the+ * original query to match the child and creates a PlannerInfo containing+ * the translated query+ *+ * Child PlannerInfo reuses most of the parent PlannerInfo's fields unchanged,+ * except unexpanded_tlist, processed_tlist, and all_baserels, all of which+ * are based on the child relation.+ */+void+add_inherited_target_child_roots(PlannerInfo *root)+{+ Index resultRelation = root->parse->resultRelation;+ ListCell *lc;++ Assert(root->inh_target_child_roots != NULL);++ foreach(lc, root->append_rel_list)+ {+ AppendRelInfo *appinfo = lfirst(lc);+ RangeTblEntry *childRTE;+ PlannerInfo *subroot;++ if (appinfo->parent_relid != resultRelation)+ continue;++ /*+ * Create a PlannerInfo for processing this child target relation+ * with.+ */+ subroot = create_inherited_target_child_root(root, appinfo);+ root->inh_target_child_roots[appinfo->child_relid] = subroot;++ /*+ * If the child is a partitioned table, recurse to do this for its+ * partitions.+ */+ childRTE = root->simple_rte_array[appinfo->child_relid];+ if (childRTE->inh)+ add_inherited_target_child_roots(subroot);+ }+}++/*+ * create_inherited_target_child_root+ * Workhorse of add_inherited_target_child_roots+ */+static PlannerInfo *+create_inherited_target_child_root(PlannerInfo *root, AppendRelInfo *appinfo)+{+ PlannerInfo *subroot;+ List *tlist;++ Assert(root->parse->commandType == CMD_UPDATE ||+ root->parse->commandType == CMD_DELETE);++ /*+ * Translate the original query to replace Vars of the parent table+ * by the corresponding Vars of the child table and to make child the main+ * target relation of the query.+ */+ subroot = makeNode(PlannerInfo);+ memcpy(subroot, root, sizeof(PlannerInfo));++ /*+ * Restore the original, unexpanded targetlist, that is, the one before+ * preprocess_targetlist was run on the original query. We'll run+ * preprocess_targetlist after translating the query and the targetlist,+ * so that it is expanded according to child's tuple descriptor.+ */+ root->parse->targetList = root->unexpanded_tlist;+ subroot->parse = (Query *) adjust_appendrel_attrs(root,+ (Node *) root->parse,+ 1, &appinfo);++ /* Save the just translated targetlist as unexpanded_tlist in the child's+ * subroot, so that this child's own children can use it. Must use copy+ * because subroot->parse->targetList will be modified soon.+ */+ subroot->unexpanded_tlist = list_copy(subroot->parse->targetList);++ /*+ * Apply planner's expansion of targetlist, such as adding various junk+ * column, filling placeholder entries for dropped columns, etc., all of+ * which occurs with the child's TupleDesc.+ */+ tlist = preprocess_targetlist(subroot);+ subroot->processed_tlist = tlist;++ /* Add any newly added Vars to the child RelOptInfo. */+ build_base_rel_tlists(subroot, tlist);++ /*+ * Adjust all_baserels to replace the original target relation with the+ * child target relation. Copy it before modifying though.+ */+ subroot->all_baserels = bms_copy(root->all_baserels);+ subroot->all_baserels = bms_del_member(subroot->all_baserels,+ root->parse->resultRelation);+ subroot->all_baserels = bms_add_member(subroot->all_baserels,+ subroot->parse->resultRelation);++ return subroot;+}diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.cindex 48ffc5f254..6009de309e 100644--- a/src/backend/optimizer/util/plancat.c+++ b/src/backend/optimizer/util/plancat.c@@ -1264,36 +1264,6 @@ get_relation_constraints(PlannerInfo *root,
}
}
- /*- * Append partition predicates, if any.- *- * For selects, partition pruning uses the parent table's partition bound- * descriptor, instead of constraint exclusion which is driven by the- * individual partition's partition constraint.- */- if (enable_partition_pruning && root->parse->commandType != CMD_SELECT)- {- List *pcqual = RelationGetPartitionQual(relation);-- if (pcqual)- {- /*- * Run the partition quals through const-simplification similar to- * check constraints. We skip canonicalize_qual, though, because- * partition quals should be in canonical form already; also,- * since the qual is in implicit-AND format, we'd have to- * explicitly convert it to explicit-AND format and back again.- */- pcqual = (List *) eval_const_expressions(root, (Node *) pcqual);-- /* Fix Vars to have the desired varno */- if (varno != 1)- ChangeVarNodes((Node *) pcqual, 1, varno, 0);-- result = list_concat(result, pcqual);- }- }-
heap_close(relation, NoLock);
return result;
@@ -1417,40 +1387,15 @@ relation_excluded_by_constraints(PlannerInfo *root,
/*
* Skip further tests, depending on constraint_exclusion.
*/
- switch (constraint_exclusion)- {- case CONSTRAINT_EXCLUSION_OFF:-- /*- * Don't prune if feature turned off -- except if the relation is- * a partition. While partprune.c-style partition pruning is not- * yet in use for all cases (update/delete is not handled), it- * would be a UI horror to use different user-visible controls- * depending on such a volatile implementation detail. Therefore,- * for partitioned tables we use enable_partition_pruning to- * control this behavior.- */- if (root->inhTargetKind == INHKIND_PARTITIONED)- break;- return false;-- case CONSTRAINT_EXCLUSION_PARTITION:-- /*- * When constraint_exclusion is set to 'partition' we only handle- * OTHER_MEMBER_RELs, or BASERELs in cases where the result target- * is an inheritance parent or a partitioned table.- */- if ((rel->reloptkind != RELOPT_OTHER_MEMBER_REL) &&- !(rel->reloptkind == RELOPT_BASEREL &&- root->inhTargetKind != INHKIND_NONE &&- rel->relid == root->parse->resultRelation))- return false;- break;-- case CONSTRAINT_EXCLUSION_ON:- break; /* always try to exclude */- }+ if (constraint_exclusion == CONSTRAINT_EXCLUSION_OFF)+ return false;+ /*+ * When constraint_exclusion is set to 'partition' we only handle+ * OTHER_MEMBER_RELs.+ */+ else if (constraint_exclusion == CONSTRAINT_EXCLUSION_PARTITION &&+ rel->reloptkind != RELOPT_OTHER_MEMBER_REL)+ return false;
/*
* Check for self-contradictory restriction clauses. We dare not make
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.hindex 3430061361..beb2e323a8 100644--- a/src/include/nodes/relation.h+++ b/src/include/nodes/relation.h@@ -319,9 +319,6 @@ typedef struct PlannerInfo
Index qual_security_level; /* minimum security_level for quals */
/* Note: qual_security_level is zero if there are no securityQuals */
- InheritanceKind inhTargetKind; /* indicates if the target relation is an- * inheritance child or partition or a- * partitioned table */
bool hasJoinRTEs; /* true if any RTEs are RTE_JOIN kind */
bool hasLateralRTEs; /* true if any RTEs are marked LATERAL */
bool hasDeletedRTEs; /* true if any RTE was deleted from jointree */
@@ -343,6 +340,40 @@ typedef struct PlannerInfo
/* Does this query modify any partition key columns? */
bool partColsUpdated;
++ /*+ * The following fields are set during query planning portion of an+ * inherited UPDATE/DEELETE operation.+ */+ bool inherited_update; /* UPDATE/DELETE on inheritance parent? */++ /*+ * This stores the original version of the query's targetlist that's+ * not modified by the planner.+ */+ List *unexpanded_tlist;++ /*+ * Array containing simple_rel_array_size elements, indexed by rangetable+ * index (entry 0 is wasted like simple_rel_array). Only elements+ * corresponding to individual inheritance child target relations are+ * non-NULL. Content of each PlannerInfo is same as the parent+ * PlannerInfo, except for the parse tree which is a translated copy of+ * the parent's parse tree.+ */+ struct PlannerInfo **inh_target_child_roots;++ /* List of RT indexes of child RT indexes. */+ List *inh_target_child_rels;++ /*+ * RelOptInfos corresponding to each child target rel. For leaf children,+ * it's the RelOptInfo representing the output of make_rel_from_joinlist()+ * called with the parent rel in the original join tree replaced by a+ * given leaf child. For non-leaf children, it's the baserel RelOptInfo+ * itself, left as a placeholder.+ */+ List *inh_target_child_joinrels;
} PlannerInfo;
diff --git a/src/include/optimizer/inherit.h b/src/include/optimizer/inherit.hindex b2687abd4e..1dbc2ca5bf 100644--- a/src/include/optimizer/inherit.h+++ b/src/include/optimizer/inherit.h@@ -18,5 +18,6 @@
extern void expand_inherited_tables(PlannerInfo *root);
+extern void add_inherited_target_child_roots(PlannerInfo *root);
#endif /* INHERIT_H */
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.hindex 666217c189..f524ab6beb 100644--- a/src/include/optimizer/paths.h+++ b/src/include/optimizer/paths.h@@ -161,7 +161,8 @@ extern EquivalenceClass *match_eclasses_to_foreign_key_col(PlannerInfo *root,
extern void add_child_rel_equivalences(PlannerInfo *root,
AppendRelInfo *appinfo,
RelOptInfo *parent_rel,
- RelOptInfo *child_rel);+ RelOptInfo *child_rel,+ bool replace);
extern List *generate_implied_equalities_for_column(PlannerInfo *root,
RelOptInfo *rel,
ec_matches_callback_type callback,
diff --git a/src/test/regress/expected/partition_join.out b/src/test/regress/expected/partition_join.outindex c55de5d476..c9f02c1fb0 100644--- a/src/test/regress/expected/partition_join.out+++ b/src/test/regress/expected/partition_join.out@@ -1780,7 +1780,7 @@ WHERE EXISTS (
Filter: (c IS NULL)
-> Nested Loop
-> Seq Scan on int4_tbl
- -> Subquery Scan on ss_1+ -> Subquery Scan on ss
-> Limit
-> Seq Scan on int8_tbl int8_tbl_1
-> Nested Loop Semi Join
@@ -1788,7 +1788,7 @@ WHERE EXISTS (
Filter: (c IS NULL)
-> Nested Loop
-> Seq Scan on int4_tbl
- -> Subquery Scan on ss_2+ -> Subquery Scan on ss
-> Limit
-> Seq Scan on int8_tbl int8_tbl_2
(28 rows)
--
2.11.0
v16-0002-Lazy-creation-of-RTEs-for-inheritance-children.patch (text/plain, 97.0K) download
From 71a7fae100bac86f0e392ed5cdb16a12761324fc Mon Sep 17 00:00:00 2001
From: amit <amitlangote09@gmail.com>
Date: Fri, 26 Oct 2018 16:45:59 +0900
Subject: [PATCH v16 2/4] Lazy creation of RTEs for inheritance children
Currently, expand_inherited_tables called from subquery_planner opens
all inheritance child tables and adds them to the query's range
table and PlannerInfo in the form of AppendRelInfo's initially and
later RelOptInfo's. For partitioning, that's pretty wasteful, because
it's possible to determine only the partitions that will need to be
scanned using partition pruning, which doesn't require opening the
partitions themselves. However, the point at which
expand_inherited_tables is called currently is too early to perform
partition pruning.
This commit rearranges things within the planner so that
expand_inherited_tables can be called from query_planner after the
latter has finished setting up the information needed to perform
partition pruning. However that means the PlannerInfo arrays that
store RangeTblEntry's, RelOptInfo's, and AppendRelInfo's need to
be expanded if inheritance expansion leads to adding more relations
to planning. There are also consequences around targetlist
expansion. For example, preprocess_targetlist cannot add the junk
columns entries needed for row mark handling until all of the
inheritance children have been determined, because different children
may need different types of junk columns to be added. So, the
approach of late inheritance expansion required some interface tweaks
for preprocess_targetlist().
For partitioning, although we don't create a RangeTblEntry and
RelOptInfo for pruned partitions at make_one_rel time, partitionwise
join code relies on the fact that even though partitions may have
been pruned, they'd still own a RelOptInfo to handle the outer join
case where the pruned partition appears on the nullable side of join.
Partitionwise join code deals with that by allocating dummy
RelOptInfos for pruned partitions that are based mostly on their
parent's properties.
There are some regression test diffs:
1. Caused by the fact that we no longer allocate a duplicate RT
entry for a partitioned table in its role as child, as seen in
the partition_aggregate.out test output.
2. Those in postgres_fdw.out are caused by the fact that junk columns
required for row marking are added to reltarget->exprs later than
user columns, because the row marking junk columns aren't added
until the inheritance is expanded which as of this commit is
later than it used to be as noted above.
---
contrib/postgres_fdw/expected/postgres_fdw.out | 32 +-
src/backend/nodes/outfuncs.c | 1 +
src/backend/optimizer/path/allpaths.c | 343 +--------
src/backend/optimizer/path/joinrels.c | 61 ++
src/backend/optimizer/plan/initsplan.c | 58 --
src/backend/optimizer/plan/planmain.c | 10 +
src/backend/optimizer/plan/planner.c | 74 +-
src/backend/optimizer/plan/setrefs.c | 6 +
src/backend/optimizer/prep/preptlist.c | 15 +-
src/backend/optimizer/prep/prepunion.c | 3 +
src/backend/optimizer/util/appendinfo.c | 45 +-
src/backend/optimizer/util/inherit.c | 819 +++++++++++++++-------
src/backend/optimizer/util/plancat.c | 47 +-
src/backend/optimizer/util/relnode.c | 107 +--
src/backend/partitioning/partprune.c | 43 +-
src/include/nodes/relation.h | 18 +
src/include/optimizer/appendinfo.h | 7 +-
src/include/optimizer/pathnode.h | 1 +
src/include/optimizer/plancat.h | 4 +-
src/include/optimizer/prep.h | 3 +-
src/include/partitioning/partprune.h | 2 +-
src/test/regress/expected/partition_aggregate.out | 4 +-
22 files changed, 932 insertions(+), 771 deletions(-)
diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.outindex bb92d9d37a..33a33606ef 100644--- a/contrib/postgres_fdw/expected/postgres_fdw.out+++ b/contrib/postgres_fdw/expected/postgres_fdw.out@@ -7072,15 +7072,15 @@ select * from bar where f1 in (select f1 from foo) for update;
Output: bar2.f1, bar2.f2, bar2.ctid, bar2.*, bar2.tableoid
Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct2 FOR UPDATE
-> Hash
- Output: foo.ctid, foo.*, foo.tableoid, foo.f1+ Output: foo.f1, foo.ctid, foo.*, foo.tableoid
-> HashAggregate
- Output: foo.ctid, foo.*, foo.tableoid, foo.f1+ Output: foo.f1, foo.ctid, foo.*, foo.tableoid
Group Key: foo.f1
-> Append
-> Seq Scan on public.foo
- Output: foo.ctid, foo.*, foo.tableoid, foo.f1+ Output: foo.f1, foo.ctid, foo.*, foo.tableoid
-> Foreign Scan on public.foo2
- Output: foo2.ctid, foo2.*, foo2.tableoid, foo2.f1+ Output: foo2.f1, foo2.ctid, foo2.*, foo2.tableoid
Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct1
(23 rows)
@@ -7110,15 +7110,15 @@ select * from bar where f1 in (select f1 from foo) for share;
Output: bar2.f1, bar2.f2, bar2.ctid, bar2.*, bar2.tableoid
Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct2 FOR SHARE
-> Hash
- Output: foo.ctid, foo.*, foo.tableoid, foo.f1+ Output: foo.f1, foo.ctid, foo.*, foo.tableoid
-> HashAggregate
- Output: foo.ctid, foo.*, foo.tableoid, foo.f1+ Output: foo.f1, foo.ctid, foo.*, foo.tableoid
Group Key: foo.f1
-> Append
-> Seq Scan on public.foo
- Output: foo.ctid, foo.*, foo.tableoid, foo.f1+ Output: foo.f1, foo.ctid, foo.*, foo.tableoid
-> Foreign Scan on public.foo2
- Output: foo2.ctid, foo2.*, foo2.tableoid, foo2.f1+ Output: foo2.f1, foo2.ctid, foo2.*, foo2.tableoid
Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct1
(23 rows)
@@ -7147,15 +7147,15 @@ update bar set f2 = f2 + 100 where f1 in (select f1 from foo);
-> Seq Scan on public.bar
Output: bar.f1, bar.f2, bar.ctid
-> Hash
- Output: foo.ctid, foo.*, foo.tableoid, foo.f1+ Output: foo.f1, foo.ctid, foo.*, foo.tableoid
-> HashAggregate
- Output: foo.ctid, foo.*, foo.tableoid, foo.f1+ Output: foo.f1, foo.ctid, foo.*, foo.tableoid
Group Key: foo.f1
-> Append
-> Seq Scan on public.foo
- Output: foo.ctid, foo.*, foo.tableoid, foo.f1+ Output: foo.f1, foo.ctid, foo.*, foo.tableoid
-> Foreign Scan on public.foo2
- Output: foo2.ctid, foo2.*, foo2.tableoid, foo2.f1+ Output: foo2.f1, foo2.ctid, foo2.*, foo2.tableoid
Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct1
-> Hash Join
Output: bar2.f1, (bar2.f2 + 100), bar2.f3, bar2.ctid, foo.ctid, foo.*, foo.tableoid
@@ -7165,15 +7165,15 @@ update bar set f2 = f2 + 100 where f1 in (select f1 from foo);
Output: bar2.f1, bar2.f2, bar2.f3, bar2.ctid
Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct2 FOR UPDATE
-> Hash
- Output: foo.ctid, foo.*, foo.tableoid, foo.f1+ Output: foo.f1, foo.ctid, foo.*, foo.tableoid
-> HashAggregate
- Output: foo.ctid, foo.*, foo.tableoid, foo.f1+ Output: foo.f1, foo.ctid, foo.*, foo.tableoid
Group Key: foo.f1
-> Append
-> Seq Scan on public.foo
- Output: foo.ctid, foo.*, foo.tableoid, foo.f1+ Output: foo.f1, foo.ctid, foo.*, foo.tableoid
-> Foreign Scan on public.foo2
- Output: foo2.ctid, foo2.*, foo2.tableoid, foo2.f1+ Output: foo2.f1, foo2.ctid, foo2.*, foo2.tableoid
Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct1
(39 rows)
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.cindex 158da68925..67697b8884 100644--- a/src/backend/nodes/outfuncs.c+++ b/src/backend/nodes/outfuncs.c@@ -2272,6 +2272,7 @@ _outRelOptInfo(StringInfo str, const RelOptInfo *node)
WRITE_BOOL_FIELD(consider_partitionwise_join);
WRITE_BITMAPSET_FIELD(top_parent_relids);
WRITE_NODE_FIELD(partitioned_child_rels);
+ WRITE_UINT_FIELD(inh_root_parent);
}
static void
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.cindex 61df22953a..ab4f376e92 100644--- a/src/backend/optimizer/path/allpaths.c+++ b/src/backend/optimizer/path/allpaths.c@@ -45,7 +45,6 @@
#include "optimizer/var.h"
#include "parser/parse_clause.h"
#include "parser/parsetree.h"
-#include "partitioning/partprune.h"
#include "rewrite/rewriteManip.h"
#include "utils/lsyscache.h"
@@ -383,6 +382,14 @@ set_rel_size(PlannerInfo *root, RelOptInfo *rel,
else if (rte->inh)
{
/*
+ * expand_inherited_tables may have proved that the relation is empty.+ * For example, if it's a partitioned table with 0 partitions or all+ * of its partitions are pruned. In that case nothing to do here.+ */+ if (IS_DUMMY_REL(rel))+ return;++ /*
* If it's a target relation, set the sizes of children instead.
* Otherwise, we'll append the outputs of children, so process it as
* an "append relation".
@@ -951,38 +958,18 @@ set_inherit_target_rel_sizes(PlannerInfo *root, RelOptInfo *rel,
int parentRTindex = rti;
bool has_live_children;
ListCell *l;
- Relids live_children = NULL;- bool did_pruning = false;
/* Guard against stack overflow due to overly deep inheritance tree. */
check_stack_depth();
Assert(IS_SIMPLE_REL(rel));
- /*- * If the partitioned relation has any baserestrictinfo quals then we- * attempt to use these quals to prune away partitions that cannot- * possibly contain any tuples matching these quals. In this case we'll- * store the relids of all partitions which could possibly contain a- * matching tuple, and skip anything else in the loop below.- */- if (enable_partition_pruning &&- rte->relkind == RELKIND_PARTITIONED_TABLE &&- rel->baserestrictinfo != NIL)- {- live_children = prune_append_rel_partitions(rel);- did_pruning = true;- }-
foreach(l, root->append_rel_list)
{
AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(l);
int childRTindex;
RangeTblEntry *childRTE;
RelOptInfo *childrel;
- List *childquals;- Index cq_min_security;- bool have_const_false_cq;
PlannerInfo *subroot;
ListCell *lc;
List *translated_exprs,
@@ -994,141 +981,22 @@ set_inherit_target_rel_sizes(PlannerInfo *root, RelOptInfo *rel,
childRTindex = appinfo->child_relid;
childRTE = root->simple_rte_array[childRTindex];
+ Assert(childRTE != NULL);
/*
- * The child rel's RelOptInfo was already created during- * add_base_rels_to_query.+ * The child rel's RelOptInfo was created during+ * expand_inherited_tables().
*/
childrel = find_base_rel(root, childRTindex);
+ Assert(childrel != NULL);
Assert(childrel->reloptkind == RELOPT_OTHER_MEMBER_REL);
/*
- * We have to copy the parent's quals to the child, with appropriate- * substitution of variables. However, only the baserestrictinfo- * quals are needed before we can check for constraint exclusion; so- * do that first and then check to see if we can disregard this child.- *- * The child rel's targetlist might contain non-Var expressions, which- * means that substitution into the quals could produce opportunities- * for const-simplification, and perhaps even pseudoconstant quals.- * Therefore, transform each RestrictInfo separately to see if it- * reduces to a constant or pseudoconstant. (We must process them- * separately to keep track of the security level of each qual.)+ * Child relation may have been marked dummy if build_append_child_rel+ * found self-contradictory quals.
*/
- childquals = NIL;- cq_min_security = UINT_MAX;- have_const_false_cq = false;- foreach(lc, rel->baserestrictinfo)- {- RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);- Node *childqual;- ListCell *lc2;-- Assert(IsA(rinfo, RestrictInfo));- childqual = adjust_appendrel_attrs(root,- (Node *) rinfo->clause,- 1, &appinfo);- childqual = eval_const_expressions(root, childqual);- /* check for flat-out constant */- if (childqual && IsA(childqual, Const))- {- if (((Const *) childqual)->constisnull ||- !DatumGetBool(((Const *) childqual)->constvalue))- {- /* Restriction reduces to constant FALSE or NULL */- have_const_false_cq = true;- break;- }- /* Restriction reduces to constant TRUE, so drop it */- continue;- }- /* might have gotten an AND clause, if so flatten it */- foreach(lc2, make_ands_implicit((Expr *) childqual))- {- Node *onecq = (Node *) lfirst(lc2);- bool pseudoconstant;-- /* check for pseudoconstant (no Vars or volatile functions) */- pseudoconstant =- !contain_vars_of_level(onecq, 0) &&- !contain_volatile_functions(onecq);- if (pseudoconstant)- {- /* tell createplan.c to check for gating quals */- root->hasPseudoConstantQuals = true;- }- /* reconstitute RestrictInfo with appropriate properties */- childquals = lappend(childquals,- make_restrictinfo((Expr *) onecq,- rinfo->is_pushed_down,- rinfo->outerjoin_delayed,- pseudoconstant,- rinfo->security_level,- NULL, NULL, NULL));- /* track minimum security level among child quals */- cq_min_security = Min(cq_min_security, rinfo->security_level);- }- }-- /*- * In addition to the quals inherited from the parent, we might have- * securityQuals associated with this particular child node.- * (Currently this can only happen in appendrels originating from- * UNION ALL; inheritance child tables don't have their own- * securityQuals, see expand_inherited_rtentry().) Pull any such- * securityQuals up into the baserestrictinfo for the child. This is- * similar to process_security_barrier_quals() for the parent rel,- * except that we can't make any general deductions from such quals,- * since they don't hold for the whole appendrel.- */- if (childRTE->securityQuals)- {- Index security_level = 0;-- foreach(lc, childRTE->securityQuals)- {- List *qualset = (List *) lfirst(lc);- ListCell *lc2;-- foreach(lc2, qualset)- {- Expr *qual = (Expr *) lfirst(lc2);-- /* not likely that we'd see constants here, so no check */- childquals = lappend(childquals,- make_restrictinfo(qual,- true, false, false,- security_level,- NULL, NULL, NULL));- cq_min_security = Min(cq_min_security, security_level);- }- security_level++;- }- Assert(security_level <= root->qual_security_level);- }-- /*- * OK, we've got all the baserestrictinfo quals for this child.- */- childrel->baserestrictinfo = childquals;- childrel->baserestrict_min_security = cq_min_security;-- if (have_const_false_cq)- {- /*- * Some restriction clause reduced to constant FALSE or NULL after- * substitution, so this child need not be scanned.- */- set_dummy_rel_pathlist(childrel);+ if (IS_DUMMY_REL(childrel))
continue;
- }-- if (did_pruning && !bms_is_member(appinfo->child_relid, live_children))- {- /* This partition was pruned; skip it. */- set_dummy_rel_pathlist(childrel);- continue;- }
if (relation_excluded_by_constraints(root, childrel, childRTE))
{
@@ -1181,15 +1049,9 @@ set_inherit_target_rel_sizes(PlannerInfo *root, RelOptInfo *rel,
EquivalenceClass *new_ec = makeNode(EquivalenceClass);
/*
- * First memcpy which creates shallow copies of all- * the members and then make copies of members that could- * change.- *- * XXX comment in _copyPathKey says it's OK to recycle EC- * pointers, but as long as we do the whole planning for a- * given child using a given root, copying ECs like this- * shouldn't be a problem. Maybe, the following code could- * be in _copyEquivalenceClass()?+ * First memcpy the original EC, which creates shallow copies+ * of all the members and then make copies of members that+ * might change during add_child_rel_equivalences().
*/
memcpy(new_ec, ec, sizeof(EquivalenceClass));
new_ec->ec_opfamilies = list_copy(ec->ec_opfamilies);
@@ -1332,8 +1194,6 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
double *parent_attrsizes;
int nattrs;
ListCell *l;
- Relids live_children = NULL;- bool did_pruning = false;
/* Guard against stack overflow due to overly deep inheritance tree. */
check_stack_depth();
@@ -1341,32 +1201,6 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
Assert(IS_SIMPLE_REL(rel));
/*
- * Initialize partitioned_child_rels to contain this RT index.- *- * Note that during the set_append_rel_pathlist() phase, we will bubble up- * the indexes of partitioned relations that appear down in the tree, so- * that when we've created Paths for all the children, the root- * partitioned table's list will contain all such indexes.- */- if (rte->relkind == RELKIND_PARTITIONED_TABLE)- rel->partitioned_child_rels = list_make1_int(rti);-- /*- * If the partitioned relation has any baserestrictinfo quals then we- * attempt to use these quals to prune away partitions that cannot- * possibly contain any tuples matching these quals. In this case we'll- * store the relids of all partitions which could possibly contain a- * matching tuple, and skip anything else in the loop below.- */- if (enable_partition_pruning &&- rte->relkind == RELKIND_PARTITIONED_TABLE &&- rel->baserestrictinfo != NIL)- {- live_children = prune_append_rel_partitions(rel);- did_pruning = true;- }-- /*
* If this is a partitioned baserel, set the consider_partitionwise_join
* flag; currently, we only consider partitionwise joins with the baserel
* if its targetlist doesn't contain a whole-row Var.
@@ -1403,12 +1237,8 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
int childRTindex;
RangeTblEntry *childRTE;
RelOptInfo *childrel;
- List *childquals;- Index cq_min_security;- bool have_const_false_cq;
ListCell *parentvars;
ListCell *childvars;
- ListCell *lc;
/* append_rel_list contains all append rels; ignore others */
if (appinfo->parent_relid != parentRTindex)
@@ -1416,142 +1246,22 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
childRTindex = appinfo->child_relid;
childRTE = root->simple_rte_array[childRTindex];
+ Assert(childRTE != NULL);
/*
- * The child rel's RelOptInfo was already created during- * add_base_rels_to_query.+ * The child rel's RelOptInfo was created during+ * expand_inherited_tables().
*/
childrel = find_base_rel(root, childRTindex);
+ Assert(childrel != NULL);
Assert(childrel->reloptkind == RELOPT_OTHER_MEMBER_REL);
/*
- * We have to copy the parent's targetlist and quals to the child,- * with appropriate substitution of variables. However, only the- * baserestrictinfo quals are needed before we can check for- * constraint exclusion; so do that first and then check to see if we- * can disregard this child.- *- * The child rel's targetlist might contain non-Var expressions, which- * means that substitution into the quals could produce opportunities- * for const-simplification, and perhaps even pseudoconstant quals.- * Therefore, transform each RestrictInfo separately to see if it- * reduces to a constant or pseudoconstant. (We must process them- * separately to keep track of the security level of each qual.)+ * Child relation may have been marked dummy if build_append_child_rel+ * found self-contradictory quals.
*/
- childquals = NIL;- cq_min_security = UINT_MAX;- have_const_false_cq = false;- foreach(lc, rel->baserestrictinfo)- {- RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);- Node *childqual;- ListCell *lc2;-- Assert(IsA(rinfo, RestrictInfo));- childqual = adjust_appendrel_attrs(root,- (Node *) rinfo->clause,- 1, &appinfo);- childqual = eval_const_expressions(root, childqual);- /* check for flat-out constant */- if (childqual && IsA(childqual, Const))- {- if (((Const *) childqual)->constisnull ||- !DatumGetBool(((Const *) childqual)->constvalue))- {- /* Restriction reduces to constant FALSE or NULL */- have_const_false_cq = true;- break;- }- /* Restriction reduces to constant TRUE, so drop it */- continue;- }- /* might have gotten an AND clause, if so flatten it */- foreach(lc2, make_ands_implicit((Expr *) childqual))- {- Node *onecq = (Node *) lfirst(lc2);- bool pseudoconstant;-- /* check for pseudoconstant (no Vars or volatile functions) */- pseudoconstant =- !contain_vars_of_level(onecq, 0) &&- !contain_volatile_functions(onecq);- if (pseudoconstant)- {- /* tell createplan.c to check for gating quals */- root->hasPseudoConstantQuals = true;- }- /* reconstitute RestrictInfo with appropriate properties */- childquals = lappend(childquals,- make_restrictinfo((Expr *) onecq,- rinfo->is_pushed_down,- rinfo->outerjoin_delayed,- pseudoconstant,- rinfo->security_level,- NULL, NULL, NULL));- /* track minimum security level among child quals */- cq_min_security = Min(cq_min_security, rinfo->security_level);- }- }-- /*- * In addition to the quals inherited from the parent, we might have- * securityQuals associated with this particular child node.- * (Currently this can only happen in appendrels originating from- * UNION ALL; inheritance child tables don't have their own- * securityQuals, see expand_inherited_rtentry().) Pull any such- * securityQuals up into the baserestrictinfo for the child. This is- * similar to process_security_barrier_quals() for the parent rel,- * except that we can't make any general deductions from such quals,- * since they don't hold for the whole appendrel.- */- if (childRTE->securityQuals)- {- Index security_level = 0;-- foreach(lc, childRTE->securityQuals)- {- List *qualset = (List *) lfirst(lc);- ListCell *lc2;-- foreach(lc2, qualset)- {- Expr *qual = (Expr *) lfirst(lc2);-- /* not likely that we'd see constants here, so no check */- childquals = lappend(childquals,- make_restrictinfo(qual,- true, false, false,- security_level,- NULL, NULL, NULL));- cq_min_security = Min(cq_min_security, security_level);- }- security_level++;- }- Assert(security_level <= root->qual_security_level);- }-- /*- * OK, we've got all the baserestrictinfo quals for this child.- */- childrel->baserestrictinfo = childquals;- childrel->baserestrict_min_security = cq_min_security;-- if (have_const_false_cq)- {- /*- * Some restriction clause reduced to constant FALSE or NULL after- * substitution, so this child need not be scanned.- */- set_dummy_rel_pathlist(childrel);+ if (IS_DUMMY_REL(childrel))
continue;
- }-- if (did_pruning && !bms_is_member(appinfo->child_relid, live_children))- {- /* This partition was pruned; skip it. */- set_dummy_rel_pathlist(childrel);- continue;- }
if (relation_excluded_by_constraints(root, childrel, childRTE))
{
@@ -1564,7 +1274,7 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
}
/*
- * CE failed, so finish copying/modifying targetlist and join quals.+ * Copy/Modify targetlist.
*
* NB: the resulting childrel->reltarget->exprs may contain arbitrary
* expressions, which otherwise would not occur in a rel's targetlist.
@@ -3069,6 +2779,7 @@ inheritance_make_rel_from_joinlist(PlannerInfo *root, List *joinlist)
continue;
childrel = find_base_rel(root, appinfo->child_relid);
+ Assert(childrel != NULL);
/* Ignore excluded/pruned children. */
if (IS_DUMMY_REL(childrel))
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.cindex 663130461a..bc89de9a9d 100644--- a/src/backend/optimizer/path/joinrels.c+++ b/src/backend/optimizer/path/joinrels.c@@ -20,6 +20,7 @@
#include "optimizer/joininfo.h"
#include "optimizer/pathnode.h"
#include "optimizer/paths.h"
+#include "optimizer/tlist.h"
#include "partitioning/partbounds.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
@@ -51,6 +52,9 @@ static SpecialJoinInfo *build_child_join_sjinfo(PlannerInfo *root,
Relids left_relids, Relids right_relids);
static int match_expr_to_partition_keys(Expr *expr, RelOptInfo *rel,
bool strict_op);
+static RelOptInfo *build_dummy_partition_rel(PlannerInfo *root,+ RelOptInfo *parent,+ int partidx);
/*
@@ -1383,6 +1387,11 @@ try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
AppendRelInfo **appinfos;
int nappinfos;
+ if (IS_SIMPLE_REL(rel1) && child_rel1 == NULL)+ child_rel1 = build_dummy_partition_rel(root, rel1, cnt_parts);+ if (IS_SIMPLE_REL(rel1) && child_rel2 == NULL)+ child_rel2 = build_dummy_partition_rel(root, rel2, cnt_parts);+
/*
* If a child table has consider_partitionwise_join=false, it means
* that it's a dummy relation for which we skipped setting up tlist
@@ -1674,3 +1683,55 @@ match_expr_to_partition_keys(Expr *expr, RelOptInfo *rel, bool strict_op)
return -1;
}
++/*+ * build_dummy_partition_rel+ * Build a RelOptInfo and AppendRelInfo for a pruned partition+ *+ * This does not result in opening the relation or a range table entry being+ * created. Also, the RelOptInfo thus created is not stored anywhere else+ * beside the parent's part_rels array.+ *+ * The only reason this exists is because partition-wise join, in some cases,+ * needs a RelOptInfo to represent an empty relation that's on the nullable+ * side of an outer join, so that a Path representing the outer join can be+ * created.+ */+static RelOptInfo *+build_dummy_partition_rel(PlannerInfo *root, RelOptInfo *parent, int partidx)+{+ RangeTblEntry *parentrte = root->simple_rte_array[parent->relid];+ RelOptInfo *rel;++ Assert(parent->part_rels[partidx] == NULL);++ /* Create minimally valid-looking RelOptInfo with parent's relid. */+ rel = makeNode(RelOptInfo);+ rel->reloptkind = RELOPT_OTHER_MEMBER_REL;+ rel->relid = parent->relid;+ rel->relids = bms_copy(parent->relids);+ if (parent->top_parent_relids)+ rel->top_parent_relids = parent->top_parent_relids;+ else+ rel->top_parent_relids = bms_copy(parent->relids);+ rel->reltarget = copy_pathtarget(parent->reltarget);+ parent->part_rels[partidx] = rel;+ mark_dummy_rel(rel);++ /*+ * Now we'll need a (no-op) AppendRelInfo for parent, because we're+ * setting the dummy partition's relid to be same as the parent's.+ */+ if (root->append_rel_array[parent->relid] == NULL)+ {+ AppendRelInfo *appinfo = make_append_rel_info(parent, parentrte,+ parent->tupdesc,+ parentrte->relid,+ parent->reltype,+ parent->relid);++ root->append_rel_array[parent->relid] = appinfo;+ }++ return rel;+}diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.cindex a66374094f..c628f3d9e7 100644--- a/src/backend/optimizer/plan/initsplan.c+++ b/src/backend/optimizer/plan/initsplan.c@@ -616,64 +616,6 @@ create_lateral_join_info(PlannerInfo *root)
bms_add_member(brel2->lateral_referencers, rti);
}
}
-- /*- * Lastly, propagate lateral_relids and lateral_referencers from appendrel- * parent rels to their child rels. We intentionally give each child rel- * the same minimum parameterization, even though it's quite possible that- * some don't reference all the lateral rels. This is because any append- * path for the parent will have to have the same parameterization for- * every child anyway, and there's no value in forcing extra- * reparameterize_path() calls. Similarly, a lateral reference to the- * parent prevents use of otherwise-movable join rels for each child.- */- for (rti = 1; rti < root->simple_rel_array_size; rti++)- {- RelOptInfo *brel = root->simple_rel_array[rti];- RangeTblEntry *brte = root->simple_rte_array[rti];-- /*- * Skip empty slots. Also skip non-simple relations i.e. dead- * relations.- */- if (brel == NULL || !IS_SIMPLE_REL(brel))- continue;-- /*- * In the case of table inheritance, the parent RTE is directly linked- * to every child table via an AppendRelInfo. In the case of table- * partitioning, the inheritance hierarchy is expanded one level at a- * time rather than flattened. Therefore, an other member rel that is- * a partitioned table may have children of its own, and must- * therefore be marked with the appropriate lateral info so that those- * children eventually get marked also.- */- Assert(brte);- if (brel->reloptkind == RELOPT_OTHER_MEMBER_REL &&- (brte->rtekind != RTE_RELATION ||- brte->relkind != RELKIND_PARTITIONED_TABLE))- continue;-- if (brte->inh)- {- foreach(lc, root->append_rel_list)- {- AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(lc);- RelOptInfo *childrel;-- if (appinfo->parent_relid != rti)- continue;- childrel = root->simple_rel_array[appinfo->child_relid];- Assert(childrel->reloptkind == RELOPT_OTHER_MEMBER_REL);- Assert(childrel->direct_lateral_relids == NULL);- childrel->direct_lateral_relids = brel->direct_lateral_relids;- Assert(childrel->lateral_relids == NULL);- childrel->lateral_relids = brel->lateral_relids;- Assert(childrel->lateral_referencers == NULL);- childrel->lateral_referencers = brel->lateral_referencers;- }- }- }
}
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.cindex 78557aeecb..62e11157da 100644--- a/src/backend/optimizer/plan/planmain.c+++ b/src/backend/optimizer/plan/planmain.c@@ -254,6 +254,16 @@ query_planner(PlannerInfo *root, List *tlist,
}
/*
+ * Expand RT entries that represent inherited or partitioned tables.+ * This will perform partition pruning on partitioned tables in the+ * original range table and also recursively on any child partitioned+ * tables that were added by the expansion of the original parent(s).+ * As new entries are added to the range table, various arrays in the+ * PlannerInfo will be expanded accordingly.+ */+ expand_inherited_tables(root);++ /*
* Add child subroots needed to use during planning for individual child
* targets
*/
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.cindex 703babfdf0..f80f35eed3 100644--- a/src/backend/optimizer/plan/planner.c+++ b/src/backend/optimizer/plan/planner.c@@ -25,6 +25,7 @@
#include "access/sysattr.h"
#include "access/xact.h"
#include "catalog/pg_constraint.h"
+#include "catalog/pg_inherits.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_type.h"
#include "executor/executor.h"
@@ -704,27 +705,18 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
}
if (rte->lateral)
root->hasLateralRTEs = true;
++ /*+ * While at it, also update the inh status. If the relation doesn't+ * or can't have any children, there is no point in letting inh be set+ * to true. Note that we do this before processing rowmarks, so that+ * the correct information for setting isParent field of PlanRowMarks.+ */+ if (rte->rtekind == RTE_RELATION)+ rte->inh = rte->inh && has_subclass(rte->relid);
}
/*
- * Preprocess RowMark information. We need to do this after subquery- * pullup (so that all non-inherited RTEs are present) and before- * inheritance expansion (so that the info is available for- * expand_inherited_tables to examine and modify).- */- preprocess_rowmarks(root);-- /*- * Expand any rangetable entries that are inheritance sets into "append- * relations". This can add entries to the rangetable, but they must be- * plain base relations not joins, so it's OK (and marginally more- * efficient) to do it after checking for join RTEs. We must do it after- * pulling up subqueries, else we'd fail to handle inherited tables in- * subqueries.- */- expand_inherited_tables(root);-- /*
* Now that we have figured out "actual" inheritance situation of the
* relations, set whether the query is an inherited UPDATE/DELETE.
*/
@@ -732,6 +724,12 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
rt_fetch(parse->resultRelation, parse->rtable)->inh);
/*
+ * Preprocess RowMark information. We need to do this after subquery+ * pullup (so that all non-inherited RTEs are present).+ */+ preprocess_rowmarks(root);++ /*
* Set hasHavingQual to remember if HAVING clause is present. Needed
* because preprocess_expression will reduce a constant-true condition to
* an empty qual list ... but "HAVING TRUE" is not a semantic no-op.
@@ -1233,7 +1231,9 @@ inheritance_planner(PlannerInfo *root)
* of the parent.
*/
root->unexpanded_tlist = list_copy(root->parse->targetList);
- tlist = preprocess_targetlist(root);+ + /* We haven't expanded inheritance yet, so pass false. */+ tlist = preprocess_targetlist(root, false);
root->processed_tlist = tlist;
qp_extra.tlist = tlist;
qp_extra.activeWindows = NIL;
@@ -1243,9 +1243,11 @@ inheritance_planner(PlannerInfo *root)
/*
* If it turned out during query planning that all the children are dummy
* (pruned or excluded by constraints), no need to do the steps below.
- * Let grouping_planner finish up the final path.+ * For regular inheritance case, it's possible that we only need to modify+ * the parent table. Let grouping_planner finish up the final path.
*/
- if (IS_DUMMY_REL(planned_rel))+ parent_rte = planner_rt_fetch(top_parentRTindex, root);+ if (!parent_rte->inh || IS_DUMMY_REL(planned_rel))
{
grouping_planner(root, false, planned_rel, 0.0);
return;
@@ -1261,7 +1263,6 @@ inheritance_planner(PlannerInfo *root)
* not appear anywhere else in the plan, so the confusion explained below
* for non-partitioning inheritance cases is not possible.
*/
- parent_rte = planner_rt_fetch(top_parentRTindex, root);
if (parent_rte->relkind == RELKIND_PARTITIONED_TABLE)
{
nominalRelation = top_parentRTindex;
@@ -1590,14 +1591,19 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
*/
if (planned_rel == NULL)
{
- tlist = preprocess_targetlist(root);+ /* We haven't expanded inheritance yet, so pass false. */+ tlist = preprocess_targetlist(root, false);
/*
- * We are now done hacking up the query's targetlist. Most of the- * remaining planning work will be done with the PathTarget- * representation of tlists, but save aside the full representation- * so that we can transfer its decoration (resnames etc) to the- * topmost tlist of the finished Plan.+ * We are now mostly done hacking up the query's targetlist. More+ * columns might be added during query_planner after inheritance+ * expansion in make_one_rel, because some children may require+ * different column than the parent for row mark handling; see+ * add_rowmark_junk_columns(). Most of the remaining planning+ * work will be done with the PathTarget representation of tlists,+ * but save aside the full representation so that we can transfer+ * its decoration (resnames etc) to the topmost tlist of the+ * finished Plan.
*/
root->processed_tlist = tlist;
}
@@ -2373,7 +2379,7 @@ preprocess_rowmarks(PlannerInfo *root)
newrc->allMarkTypes = (1 << newrc->markType);
newrc->strength = rc->strength;
newrc->waitPolicy = rc->waitPolicy;
- newrc->isParent = false;+ newrc->isParent = rte->inh;
prowmarks = lappend(prowmarks, newrc);
}
@@ -2398,7 +2404,7 @@ preprocess_rowmarks(PlannerInfo *root)
newrc->allMarkTypes = (1 << newrc->markType);
newrc->strength = LCS_NONE;
newrc->waitPolicy = LockWaitBlock; /* doesn't matter */
- newrc->isParent = false;+ newrc->isParent = rte->rtekind == RTE_RELATION ? rte->inh : false;
prowmarks = lappend(prowmarks, newrc);
}
@@ -6835,6 +6841,10 @@ apply_scanjoin_target_to_paths(PlannerInfo *root,
int nappinfos;
List *child_scanjoin_targets = NIL;
+ /* Skip processing pruned partitions. */+ if (child_rel == NULL)+ continue;+
/* Translate scan/join targets for this child. */
appinfos = find_appinfos_by_relids(root, child_rel->relids,
&nappinfos);
@@ -6936,6 +6946,10 @@ create_partitionwise_grouping_paths(PlannerInfo *root,
RelOptInfo *child_grouped_rel;
RelOptInfo *child_partially_grouped_rel;
+ /* Skip processing pruned partitions. */+ if (child_input_rel == NULL)+ continue;+
/* Input child rel must have a path */
Assert(child_input_rel->pathlist != NIL);
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.cindex 5d363edab8..4dcdede6b6 100644--- a/src/backend/optimizer/plan/setrefs.c+++ b/src/backend/optimizer/plan/setrefs.c@@ -325,6 +325,12 @@ add_rtes_to_flat_rtable(PlannerInfo *root, bool recursing)
UPPERREL_FINAL, NULL)))
add_rtes_to_flat_rtable(rel->subroot, true);
}
+ /*+ * A NULL rel also means an unplanned subquery rte, so apply+ * flatten_unplanned_rtes.+ */+ else+ flatten_unplanned_rtes(glob, rte);
}
rti++;
}
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.cindex f8bc2dd257..a55949c305 100644--- a/src/backend/optimizer/prep/preptlist.c+++ b/src/backend/optimizer/prep/preptlist.c@@ -65,9 +65,13 @@ static List *expand_targetlist(List *tlist, int command_type,
*
* As a side effect, if there's an ON CONFLICT UPDATE clause, its targetlist
* is also preprocessed (and updated in-place).
+ *+ * inheritance_expanded specifies whether inheritance tables are expanded+ * as of calling this function. Caller must specify it because that affects+ * which row marking related junk columns get added to the targetlist.
*/
List *
-preprocess_targetlist(PlannerInfo *root)+preprocess_targetlist(PlannerInfo *root, bool inheritance_expanded)
{
Query *parse = root->parse;
int result_relation = parse->resultRelation;
@@ -134,6 +138,15 @@ preprocess_targetlist(PlannerInfo *root)
if (rc->rti != rc->prti)
continue;
+ /*+ * For inheritance parent row marks, we defer adding junk columns+ * until we've added child row marks, because some children might+ * require different row mark types which will change the parent row+ * mark's allMarkTypes fields.+ */+ if (rc->isParent && !inheritance_expanded)+ continue;+
if (rc->allMarkTypes & ~(1 << ROW_MARK_COPY))
{
/* Need to fetch TID */
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.cindex 55eeb5127c..d4d36248a1 100644--- a/src/backend/optimizer/prep/prepunion.c+++ b/src/backend/optimizer/prep/prepunion.c@@ -31,13 +31,16 @@
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
+#include "optimizer/clauses.h"
#include "optimizer/cost.h"
#include "optimizer/pathnode.h"
#include "optimizer/paths.h"
#include "optimizer/planmain.h"
#include "optimizer/planner.h"
#include "optimizer/prep.h"
+#include "optimizer/restrictinfo.h"
#include "optimizer/tlist.h"
+#include "optimizer/var.h"
#include "parser/parse_coerce.h"
#include "parser/parsetree.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/optimizer/util/appendinfo.c b/src/backend/optimizer/util/appendinfo.cindex 34a3ebbbe4..d2c3c7b590 100644--- a/src/backend/optimizer/util/appendinfo.c+++ b/src/backend/optimizer/util/appendinfo.c@@ -31,10 +31,10 @@ typedef struct
AppendRelInfo **appinfos;
} adjust_appendrel_attrs_context;
-static void make_inh_translation_list(Relation oldrelation,- Relation newrelation,- Index newvarno,- List **translated_vars);+static void make_inh_translation_list(TupleDesc old_tupdesc,+ TupleDesc new_tupdesc,+ Oid from_rel, Oid to_rel,+ Index newvarno, List **translated_vars);
static Node *adjust_appendrel_attrs_mutator(Node *node,
adjust_appendrel_attrs_context *context);
static List *adjust_inherited_tlist(List *tlist,
@@ -46,18 +46,20 @@ static List *adjust_inherited_tlist(List *tlist,
* Build an AppendRelInfo for the parent-child pair
*/
AppendRelInfo *
-make_append_rel_info(Relation parentrel, Relation childrel,- Index parentRTindex, Index childRTindex)+make_append_rel_info(RelOptInfo *parent, RangeTblEntry *parentrte,+ TupleDesc childdesc, Oid childoid, Oid childtype,+ Index childRTindex)
{
AppendRelInfo *appinfo = makeNode(AppendRelInfo);
- appinfo->parent_relid = parentRTindex;+ appinfo->parent_relid = parent->relid;
appinfo->child_relid = childRTindex;
- appinfo->parent_reltype = parentrel->rd_rel->reltype;- appinfo->child_reltype = childrel->rd_rel->reltype;- make_inh_translation_list(parentrel, childrel, childRTindex,- &appinfo->translated_vars);- appinfo->parent_reloid = RelationGetRelid(parentrel);+ appinfo->parent_reltype = parent->reltype;+ appinfo->child_reltype = childtype;+ make_inh_translation_list(parent->tupdesc, childdesc,+ parentrte->relid, childoid,+ childRTindex, &appinfo->translated_vars);+ appinfo->parent_reloid = parentrte->relid;
return appinfo;
}
@@ -70,14 +72,11 @@ make_append_rel_info(Relation parentrel, Relation childrel,
* For paranoia's sake, we match type/collation as well as attribute name.
*/
static void
-make_inh_translation_list(Relation oldrelation, Relation newrelation,- Index newvarno,- List **translated_vars)+make_inh_translation_list(TupleDesc old_tupdesc, TupleDesc new_tupdesc,+ Oid from_rel, Oid to_rel,+ Index newvarno, List **translated_vars)
{
List *vars = NIL;
- TupleDesc old_tupdesc = RelationGetDescr(oldrelation);- TupleDesc new_tupdesc = RelationGetDescr(newrelation);- Oid new_relid = RelationGetRelid(newrelation);
int oldnatts = old_tupdesc->natts;
int newnatts = new_tupdesc->natts;
int old_attno;
@@ -107,7 +106,7 @@ make_inh_translation_list(Relation oldrelation, Relation newrelation,
* When we are generating the "translation list" for the parent table
* of an inheritance set, no need to search for matches.
*/
- if (oldrelation == newrelation)+ if (from_rel == to_rel)
{
vars = lappend(vars, makeVar(newvarno,
(AttrNumber) (old_attno + 1),
@@ -133,10 +132,10 @@ make_inh_translation_list(Relation oldrelation, Relation newrelation,
{
HeapTuple newtup;
- newtup = SearchSysCacheAttName(new_relid, attname);+ newtup = SearchSysCacheAttName(to_rel, attname);
if (!newtup)
elog(ERROR, "could not find inherited attribute \"%s\" of relation \"%s\"",
- attname, RelationGetRelationName(newrelation));+ attname, get_rel_name(to_rel));
new_attno = ((Form_pg_attribute) GETSTRUCT(newtup))->attnum - 1;
ReleaseSysCache(newtup);
@@ -146,10 +145,10 @@ make_inh_translation_list(Relation oldrelation, Relation newrelation,
/* Found it, check type and collation match */
if (atttypid != att->atttypid || atttypmod != att->atttypmod)
elog(ERROR, "attribute \"%s\" of relation \"%s\" does not match parent's type",
- attname, RelationGetRelationName(newrelation));+ attname, get_rel_name(to_rel));
if (attcollation != att->attcollation)
elog(ERROR, "attribute \"%s\" of relation \"%s\" does not match parent's collation",
- attname, RelationGetRelationName(newrelation));+ attname, get_rel_name(to_rel));
vars = lappend(vars, makeVar(newvarno,
(AttrNumber) (new_attno + 1),
diff --git a/src/backend/optimizer/util/inherit.c b/src/backend/optimizer/util/inherit.cindex 0d2b42f72e..f1bd954373 100644--- a/src/backend/optimizer/util/inherit.c+++ b/src/backend/optimizer/util/inherit.c@@ -18,33 +18,43 @@
#include "access/sysattr.h"
#include "catalog/partition.h"
#include "catalog/pg_inherits.h"
+#include "catalog/pg_type.h"
#include "miscadmin.h"
+#include "nodes/makefuncs.h"
#include "optimizer/appendinfo.h"
+#include "optimizer/clauses.h"
#include "optimizer/inherit.h"
+#include "optimizer/pathnode.h"+#include "optimizer/paths.h"
#include "optimizer/planmain.h"
#include "optimizer/planner.h"
#include "optimizer/prep.h"
+#include "optimizer/restrictinfo.h"+#include "optimizer/var.h"+#include "partitioning/partprune.h"
#include "utils/rel.h"
static PlannerInfo *create_inherited_target_child_root(PlannerInfo *root,
AppendRelInfo *appinfo);
-static void expand_inherited_rtentry(PlannerInfo *root, RangeTblEntry *rte,- Index rti);+static void expand_inherited_rtentry(PlannerInfo *root, RelOptInfo *rel,+ RangeTblEntry *rte, Index rti);+static void expand_nonpartitioned_inherited_rtentry(PlannerInfo *root,+ RangeTblEntry *rte, Index rti, RelOptInfo *rel);
static void expand_partitioned_rtentry(PlannerInfo *root,
RangeTblEntry *parentrte,
- Index parentRTindex, Relation parentrel,- PlanRowMark *top_parentrc, LOCKMODE lockmode,- List **appinfos);-static void expand_single_inheritance_child(PlannerInfo *root,- RangeTblEntry *parentrte,- Index parentRTindex, Relation parentrel,- PlanRowMark *top_parentrc, Relation childrel,- List **appinfos, RangeTblEntry **childrte_p,- Index *childRTindex_p);+ Index parentRTindex, RelOptInfo *parentrel);+static RelOptInfo *add_inheritance_child_rel(PlannerInfo *root,+ RangeTblEntry *parentrte,+ Index parentRTindex, RelOptInfo *parentrel,+ PlanRowMark *top_parentrc, Relation childrel,+ RangeTblEntry **childrte_p, Index *childRTindex_p);
static Bitmapset *translate_col_privs(const Bitmapset *parent_privs,
List *translated_vars);
-+static RelOptInfo *build_inheritance_child_rel(PlannerInfo *root,+ RelOptInfo *parent,+ Index childRTindex);+static List *add_rowmark_junk_columns(PlannerInfo *root, PlanRowMark *rc);
/*
* expand_inherited_tables
@@ -52,37 +62,145 @@ static Bitmapset *translate_col_privs(const Bitmapset *parent_privs,
* into an "append relation". At the conclusion of this process,
* the "inh" flag is set in all and only those RTEs that are append
* relation parents.
+ *+ * Note that although we're calling the combined output of inheritance set+ * relations an "append relation" here, the caller may not always want to+ * combine the relations. For example, if the parent of the inheritance+ * set is the query's target relation, each child relation is processed+ * on its own as the query's target relation.
*/
void
expand_inherited_tables(PlannerInfo *root)
{
- Index nrtes;+ int orig_rtable_size;
Index rti;
- ListCell *rl;++ Assert(root->simple_rel_array_size > 0);+ orig_rtable_size = root->simple_rel_array_size;
/*
* expand_inherited_rtentry may add RTEs to parse->rtable. The function is
* expected to recursively handle any RTEs that it creates with inh=true.
* So just scan as far as the original end of the rtable list.
*/
- nrtes = list_length(root->parse->rtable);- rl = list_head(root->parse->rtable);- for (rti = 1; rti <= nrtes; rti++)+ for (rti = 1; rti < orig_rtable_size; rti++)
{
- RangeTblEntry *rte = (RangeTblEntry *) lfirst(rl);+ RelOptInfo *brel = root->simple_rel_array[rti];+ RangeTblEntry *rte = root->simple_rte_array[rti];- expand_inherited_rtentry(root, rte, rti);- rl = lnext(rl);+ /* there may be empty slots corresponding to non-baserel RTEs */+ if (brel == NULL)+ continue;++ if (rte->inh)+ expand_inherited_rtentry(root, brel, rte, rti);
}
}
/*
* expand_inherited_rtentry
- * Check whether a rangetable entry represents an inheritance set.- * If so, add entries for all the child tables to the query's- * rangetable, and build AppendRelInfo nodes for all the child tables- * and add them to root->append_rel_list. If not, clear the entry's- * "inh" flag to prevent later code from looking for AppendRelInfos.+ * This initializes RelOptInfos for inheritance child relations if the+ * passed-in relation has any+ *+ * 'rel' is the parent relation, whose range table entry ('rte') has been+ * marked to require adding children. Parent could either be a subquery (if+ * we flattened UNION ALL query) or a table that's known to have (or once had)+ * inheritance children. The latter consists of both regular inheritance+ * parents and partitioned tables.+ *+ * For a subquery parent, there is not much to be done here because the+ * children's RTEs are already present in the query, so we just initialize+ * RelOptInfos for them. Also, the AppendRelInfos for child subqueries+ * have already been added.+ *+ * For tables, we need to add the children to the range table and initialize+ * AppendRelInfos, RelOptInfos, and PlanRowMarks (if any) for them. For+ * a partitioned parent, we only add the children remaining after pruning.+ * For regular inheritance parents, we find the children using+ * find_all_inheritors and add all of them.+ *+ * If it turns out that there are no children, then we set rte->inh to false+ * to let the caller know that only the parent table needs to be scanned. The+ * caller can accordingly switch to a non-Append path. For a partitioned+ * parent, that means an empty relation because parents themselves contain no+ * data.+ *+ * For the regular inheritance case, the parent also gets another RTE with+ * inh = false to represent it as a child to be scanned as part of the+ * inheritance set. The original RTE is considered to represent the whole+ * inheritance set.+ */+static void+expand_inherited_rtentry(PlannerInfo *root, RelOptInfo *rel,+ RangeTblEntry *rte, Index rti)+{+ Assert(rte->inh);+ /* Inheritance parent (partitioned or not) or UNION ALL parent subquery. */+ Assert(rte->rtekind == RTE_RELATION || rte->rtekind == RTE_SUBQUERY);++ /*+ * UNION ALL children already got RTEs and AppendRelInfos, so just build+ * RelOptInfos and return.+ *+ * It might be a bit odd that this code is in this, because there is+ * nothing to expand really.+ */+ if (rte->rtekind == RTE_SUBQUERY)+ {+ ListCell *l;++ /*+ * We don't need to use expand_planner_arrays in this case, because+ * no new child RTEs are created. setup_simple_rel_arrays() and+ * setup_append_rel_array would've considered these child RTEs when+ * allocating space for various arrays.+ */+ foreach(l, root->append_rel_list)+ {+ AppendRelInfo *appinfo = lfirst(l);+ Index childRTindex = appinfo->child_relid;++ if (appinfo->parent_relid != rti)+ continue;++ Assert(childRTindex < root->simple_rel_array_size);+ Assert(root->simple_rte_array[childRTindex] != NULL);++ /*+ * We set the correct value of baserestricinfo and+ * baserestrict_min_security below.+ */+ root->simple_rel_array[childRTindex] =+ build_inheritance_child_rel(root, rel, appinfo->child_relid);+ }+ }+ else+ {+ Assert(rte->rtekind == RTE_RELATION);+ Assert(has_subclass(rte->relid));++ /*+ * The rewriter should already have obtained an appropriate lock on+ * each relation named in the query. However, for each child relation+ * we add to the query, we must obtain an appropriate lock, because+ * this will be the first use of those relations in the+ * parse/rewrite/plan pipeline. Child rels should use the same+ * lockmode as their parent.+ */+ Assert(rte->rellockmode != NoLock);++ if (rte->relkind == RELKIND_PARTITIONED_TABLE)+ expand_partitioned_rtentry(root, rte, rti, rel);+ else+ expand_nonpartitioned_inherited_rtentry(root, rte, rti, rel);+ }+}++/*+ * expand_nonpartitioned_inherited_rtentry+ * Add entries for all the child tables to the query's rangetable, and+ * build AppendRelInfo nodes for all the child tables and add them to+ * root->append_rel_list.
*
* Note that the original RTE is considered to represent the whole
* inheritance set. The first of the generated RTEs is an RTE for the same
@@ -93,55 +211,35 @@ expand_inherited_tables(PlannerInfo *root)
* regular inheritance, a parent RTE must always have at least two associated
* AppendRelInfos: one corresponding to the parent table as a simple member of
* inheritance set and one or more corresponding to the actual children.
- * Since a partitioned table is not scanned, it might have only one associated- * AppendRelInfo.
*/
static void
-expand_inherited_rtentry(PlannerInfo *root, RangeTblEntry *rte, Index rti)+expand_nonpartitioned_inherited_rtentry(PlannerInfo *root,+ RangeTblEntry *rte,+ Index rti,+ RelOptInfo *rel)
{
Oid parentOID;
PlanRowMark *oldrc;
- Relation oldrelation;- LOCKMODE lockmode;+ LOCKMODE lockmode = rte->rellockmode;
List *inhOIDs;
ListCell *l;
+ int num_children;+ int num_children_added = 0;- /* Does RT entry allow inheritance? */- if (!rte->inh)- return;- /* Ignore any already-expanded UNION ALL nodes */- if (rte->rtekind != RTE_RELATION)- {- Assert(rte->rtekind == RTE_SUBQUERY);- return;- }- /* Fast path for common case of childless table */+ Assert(rte->rtekind == RTE_RELATION);+ Assert(lockmode != NoLock);
parentOID = rte->relid;
- if (!has_subclass(parentOID))- {- /* Clear flag before returning */- rte->inh = false;- return;- }-- /*- * The rewriter should already have obtained an appropriate lock on each- * relation named in the query. However, for each child relation we add- * to the query, we must obtain an appropriate lock, because this will be- * the first use of those relations in the parse/rewrite/plan pipeline.- * Child rels should use the same lockmode as their parent.- */- lockmode = rte->rellockmode;
/* Scan for all members of inheritance set, acquire needed locks */
inhOIDs = find_all_inheritors(parentOID, lockmode, NULL);
/*
* 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.+ * case. This could happen despite has_subclass() check performed by+ * subquery_planner, if table once had a child but no longer does.
*/
- if (list_length(inhOIDs) < 2)+ num_children = list_length(inhOIDs);+ if (num_children < 2)
{
/* Clear flag before returning */
rte->inh = false;
@@ -149,216 +247,221 @@ expand_inherited_rtentry(PlannerInfo *root, RangeTblEntry *rte, Index rti)
}
/*
- * If parent relation is selected FOR UPDATE/SHARE, we need to mark its- * PlanRowMark as isParent = true, and generate a new PlanRowMark for each- * child.+ * If parent relation is selected FOR UPDATE/SHARE, preprocess_rowmarks+ * should've set isParent = true. We'll generate a new PlanRowMark for+ * each child.
*/
oldrc = get_plan_rowmark(root->rowMarks, rti);
- if (oldrc)- oldrc->isParent = true;+ Assert(oldrc == NULL || oldrc->isParent);
/*
- * Must open the parent relation to examine its tupdesc. We need not lock- * it; we assume the rewriter already did.+ * Must expand PlannerInfo arrays by num_children before we can add+ * children.
*/
- oldrelation = heap_open(parentOID, NoLock);+ Assert(num_children > 0);+ expand_planner_arrays(root, num_children);- /* Scan the inheritance set and expand it */- if (RelationGetPartitionDesc(oldrelation) != NULL)+ foreach(l, inhOIDs)
{
- Assert(rte->relkind == RELKIND_PARTITIONED_TABLE);-- /*- * If this table has partitions, recursively expand them in the order- * in which they appear in the PartitionDesc. While at it, also- * extract the partition key columns of all the partitioned tables.- */- expand_partitioned_rtentry(root, rte, rti, oldrelation, oldrc,- lockmode, &root->append_rel_list);- }- else- {- List *appinfos = NIL;+ Oid childOID = lfirst_oid(l);+ Relation newrelation;
RangeTblEntry *childrte;
Index childRTindex;
+ /* Already locked above. */+ newrelation = heap_open(childOID, NoLock);+
/*
- * This table has no partitions. Expand any plain inheritance- * children in the order the OIDs were returned by- * find_all_inheritors.+ * It is possible that the parent table has children that are temp+ * tables of other backends. We cannot safely access such tables+ * (because of buffering issues), and the best thing to do seems+ * to be to silently ignore them.
*/
- foreach(l, inhOIDs)+ if (childOID != parentOID && RELATION_IS_OTHER_TEMP(newrelation))
{
- Oid childOID = lfirst_oid(l);- Relation newrelation;-- /* Open rel if needed; we already have required locks */- if (childOID != parentOID)- newrelation = heap_open(childOID, NoLock);- else- newrelation = oldrelation;-- /*- * It is possible that the parent table has children that are temp- * tables of other backends. We cannot safely access such tables- * (because of buffering issues), and the best thing to do seems- * to be to silently ignore them.- */- if (childOID != parentOID && RELATION_IS_OTHER_TEMP(newrelation))- {- heap_close(newrelation, lockmode);- continue;- }-- expand_single_inheritance_child(root, rte, rti, oldrelation, oldrc,- newrelation,- &appinfos, &childrte,- &childRTindex);-- /* Close child relations, but keep locks */- if (childOID != parentOID)- heap_close(newrelation, NoLock);+ heap_close(newrelation, lockmode);+ continue;
}
- /*- * If all the children were temp tables, pretend it's a- * non-inheritance situation; we don't need Append node in that case.- * The duplicate RTE we added for the parent table is harmless, so we- * don't bother to get rid of it; ditto for the useless PlanRowMark- * node.- */- if (list_length(appinfos) < 2)- rte->inh = false;- else- root->append_rel_list = list_concat(root->append_rel_list,- appinfos);+ (void) add_inheritance_child_rel(root, rte, rti, rel, oldrc,+ newrelation, &childrte,+ &childRTindex);+ Assert(childrte != NULL);+ /* All regular inheritance children are leaf children. */+ Assert(!childrte->inh);+ Assert(childRTindex > 0);+ /* Close child relations, but keep locks */+ heap_close(newrelation, NoLock);+ num_children_added++;
}
- heap_close(oldrelation, NoLock);+ /*+ * If all children, including the parent (as child rel), were+ * excluded, mark the parent rel as empty. If all the children were temp+ * tables, pretend it's a non-inheritance situation; we don't need Append+ * node in that case. The duplicate RTE we added for the parent table is+ * harmless, so we don't bother to get rid of it; ditto for the useless+ * PlanRowMark node.+ */+ if (num_children_added == 0)+ mark_dummy_rel(rel);+ else if (num_children_added == 1)+ rte->inh = false;++ /*+ * Add junk columns needed by the row mark if any and also add the+ * relevant expressions to the root parent's reltarget.+ */+ if (oldrc)+ {+ List *tlist = add_rowmark_junk_columns(root, oldrc);++ build_base_rel_tlists(root, tlist);+ }
}
/*
* expand_partitioned_rtentry
- * Recursively expand an RTE for a partitioned table.+ * Prunes unnecessary partitions of a partitioned table and adds+ * remaining ones to the Query and the PlannerInfo+ *+ * Partitions are added to the query in order in which they are found in+ * the parent's PartitionDesc.+ *+ * Note: even though only the unpruned partitions will be added to the+ * resulting plan, this still locks *all* partitions via find_all_inheritors+ * when this function is called for the root partitioned table.
*/
static void
expand_partitioned_rtentry(PlannerInfo *root, RangeTblEntry *parentrte,
- Index parentRTindex, Relation parentrel,- PlanRowMark *top_parentrc, LOCKMODE lockmode,- List **appinfos)+ Index parentRTindex, RelOptInfo *parentrel)
{
+ LOCKMODE lockmode = parentrte->rellockmode;+ PlanRowMark *rootrc = NULL;
int i;
- RangeTblEntry *childrte;- Index childRTindex;- PartitionDesc partdesc = RelationGetPartitionDesc(parentrel);+ Bitmapset *partindexes;+ Index rootParentRTindex = parentrel->inh_root_parent > 0 ?+ parentrel->inh_root_parent :+ parentRTindex;- check_stack_depth();-- /* A partitioned table should always have a partition descriptor. */- Assert(partdesc);-- Assert(parentrte->inh);+ /* If root partitioned table, lock *all* partitions in the tree. */+ if (parentRTindex == rootParentRTindex)+ (void) find_all_inheritors(parentrte->relid, lockmode, NULL);
/*
- * Note down whether any partition key cols are being updated. Though it's- * the root partitioned table's updatedCols we are interested in, we- * instead use parentrte to get the updatedCols. This is convenient- * because parentrte already has the root partrel's updatedCols translated- * to match the attribute ordering of parentrel.+ * Initialize partitioned_child_rels to contain this RT index.+ *+ * Note that during the set_append_rel_pathlist() phase, values of the+ * indexes of partitioned relations that appear down in the tree will be+ * bubbled up into root parent's list so that when we've created Paths for+ * all the children, the root table's list will contain all such indexes.
*/
- if (!root->partColsUpdated)- root->partColsUpdated =- has_partition_attrs(parentrel, parentrte->updatedCols, NULL);+ parentrel->partitioned_child_rels = list_make1_int(parentRTindex);- /* First expand the partitioned table itself. */- expand_single_inheritance_child(root, parentrte, parentRTindex, parentrel,- top_parentrc, parentrel,- appinfos, &childrte, &childRTindex);+ /* Perform pruning. */+ partindexes = prune_append_rel_partitions(parentrel);++ /* Must expand PlannerInfo arrays before we can add children. */+ if (bms_num_members(partindexes) > 0)+ expand_planner_arrays(root, bms_num_members(partindexes));
/*
- * If the partitioned table has no partitions, treat this as the- * non-inheritance case.+ * For partitioned tables, we also store the partition RelOptInfo+ * pointers in the parent's RelOptInfo.
*/
- if (partdesc->nparts == 0)- {- parentrte->inh = false;- return;- }+ parentrel->part_rels = (RelOptInfo **) palloc0(sizeof(RelOptInfo *) *+ parentrel->nparts);- for (i = 0; i < partdesc->nparts; i++)+ rootrc = get_plan_rowmark(root->rowMarks, rootParentRTindex);+ Assert(rootrc == NULL || rootrc->isParent);+ i = -1;+ while ((i = bms_next_member(partindexes, i)) >= 0)
{
- Oid childOID = partdesc->oids[i];- Relation childrel;+ Oid childOID = parentrel->part_oids[i];+ Relation newrelation;+ RelOptInfo *childrel;+ RangeTblEntry *childrte;+ Index childRTindex;- /* Open rel; we already have required locks */- childrel = heap_open(childOID, NoLock);+ /* Already locked above. */+ newrelation = heap_open(childOID, NoLock);+ Assert(!RELATION_IS_OTHER_TEMP(newrelation));
/*
- * Temporary partitions belonging to other sessions should have been- * disallowed at definition, but for paranoia's sake, let's double- * check.+ * A partitioned child table with 0 children is a dummy rel, so don't+ * bother creating planner objects for it.
*/
- if (RELATION_IS_OTHER_TEMP(childrel))- elog(ERROR, "temporary relation from another session found as partition");+ if (newrelation->rd_rel->relkind == RELKIND_PARTITIONED_TABLE &&+ RelationGetPartitionDesc(newrelation)->nparts == 0)+ {+ heap_close(newrelation, NoLock);+ continue;+ }- expand_single_inheritance_child(root, parentrte, parentRTindex,- parentrel, top_parentrc, childrel,- appinfos, &childrte, &childRTindex);+ childrel = add_inheritance_child_rel(root, parentrte, parentRTindex,+ parentrel, rootrc, newrelation,+ &childrte, &childRTindex);+ Assert(childrel != NULL);+ parentrel->part_rels[i] = childrel;- /* If this child is itself partitioned, recurse */- if (childrel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)+ /* Close child relations, but keep locks */+ heap_close(newrelation, NoLock);++ /* If the child is partitioned itself, expand it too. */+ if (childrel->part_scheme)+ {+ Assert(childrte->inh);
expand_partitioned_rtentry(root, childrte, childRTindex,
- childrel, top_parentrc, lockmode,- appinfos);+ childrel);+ }+ }- /* Close child relation, but keep locks */- heap_close(childrel, NoLock);+ /*+ * Add junk columns needed by the row mark if any and also add the+ * relevant expressions to the root parent's reltarget.+ */+ if (rootrc)+ {+ List *tlist = add_rowmark_junk_columns(root, rootrc);++ build_base_rel_tlists(root, tlist);
}
}
/*
- * expand_single_inheritance_child- * Build a RangeTblEntry and an AppendRelInfo, if appropriate, plus- * maybe a PlanRowMark.+ * add_inheritance_child_rel+ * Build a RangeTblEntry, an AppendRelInfo, a PlanRowMark, and finally+ * a RelOptInfo for an inheritance child relation.
*
- * We now expand the partition hierarchy level by level, creating a- * corresponding hierarchy of AppendRelInfos and RelOptInfos, where each- * partitioned descendant acts as a parent of its immediate partitions.- * (This is a difference from what older versions of PostgreSQL did and what- * is still done in the case of table inheritance for unpartitioned tables,- * where the hierarchy is flattened during RTE expansion.)+ * The return value is the RelOptInfo that's added.
*
* PlanRowMarks still carry the top-parent's RTI, and the top-parent's
* allMarkTypes field still accumulates values from all descendents.
*
* "parentrte" and "parentRTindex" are immediate parent's RTE and
* RTI. "top_parentrc" is top parent's PlanRowMark.
- *- * The child RangeTblEntry and its RTI are returned in "childrte_p" and- * "childRTindex_p" resp.
*/
-static void-expand_single_inheritance_child(PlannerInfo *root, RangeTblEntry *parentrte,- Index parentRTindex, Relation parentrel,- PlanRowMark *top_parentrc, Relation childrel,- List **appinfos, RangeTblEntry **childrte_p,- Index *childRTindex_p)+static RelOptInfo *+add_inheritance_child_rel(PlannerInfo *root, RangeTblEntry *parentrte,+ Index parentRTindex, RelOptInfo *parentrel,+ PlanRowMark *top_parentrc, Relation childrel,+ RangeTblEntry **childrte_p, Index *childRTindex_p)
{
Query *parse = root->parse;
- Oid parentOID = RelationGetRelid(parentrel);
Oid childOID = RelationGetRelid(childrel);
RangeTblEntry *childrte;
Index childRTindex;
AppendRelInfo *appinfo;
+ RelOptInfo *childrelopt;
/*
* Build an RTE for the child, and attach to query's rangetable list. We
* copy most fields of the parent's RTE, but replace relation OID and
- * relkind, and set inh = false. Also, set requiredPerms to zero since- * all required permissions checks are done on the original RTE. Likewise,- * set the child's securityQuals to empty, because we only want to apply- * the parent's RLS conditions regardless of what RLS properties+ * relkind, and set inh appropriately. Also, set requiredPerms to zero+ * since all required permissions checks are done on the original RTE.+ * Likewise, set the child's securityQuals to empty, because we only want+ * to apply the parent's RLS conditions regardless of what RLS properties
* individual children may have. (This is an intentional choice to make
* inherited RLS work like regular permissions checks.) The parent
* securityQuals will be propagated to children along with other base
@@ -368,49 +471,42 @@ expand_single_inheritance_child(PlannerInfo *root, RangeTblEntry *parentrte,
*childrte_p = childrte;
childrte->relid = childOID;
childrte->relkind = childrel->rd_rel->relkind;
- /* A partitioned child will need to be expanded further. */- if (childOID != parentOID &&- childrte->relkind == RELKIND_PARTITIONED_TABLE)- childrte->inh = true;- else- childrte->inh = false;+ /*+ * A partitioned child will need to be expanded as an append parent+ * itself, so set its inh to true.+ */+ childrte->inh = (childrte->relkind == RELKIND_PARTITIONED_TABLE);
childrte->requiredPerms = 0;
childrte->securityQuals = NIL;
parse->rtable = lappend(parse->rtable, childrte);
childRTindex = list_length(parse->rtable);
*childRTindex_p = childRTindex;
- /*- * We need an AppendRelInfo if paths will be built for the child RTE. If- * childrte->inh is true, then we'll always need to generate append paths- * for it. If childrte->inh is false, we must scan it if it's not a- * partitioned table; but if it is a partitioned table, then it never has- * any data of its own and need not be scanned.- */- if (childrte->relkind != RELKIND_PARTITIONED_TABLE || childrte->inh)- {- appinfo = make_append_rel_info(parentrel, childrel,- parentRTindex, childRTindex);- *appinfos = lappend(*appinfos, appinfo);+ /* Create an AppendRelInfo and add it to planner's global list. */+ appinfo = make_append_rel_info(parentrel, parentrte,+ RelationGetDescr(childrel),+ RelationGetRelid(childrel),+ RelationGetForm(childrel)->reltype,+ childRTindex);+ root->append_rel_list = lappend(root->append_rel_list, appinfo);- /*- * Translate the column permissions bitmaps to the child's attnums (we- * have to build the translated_vars list before we can do this). But- * if this is the parent table, leave copyObject's result alone.- *- * Note: we need to do this even though the executor won't run any- * permissions checks on the child RTE. The insertedCols/updatedCols- * bitmaps may be examined for trigger-firing purposes.- */- if (childOID != parentOID)- {- childrte->selectedCols = translate_col_privs(parentrte->selectedCols,- appinfo->translated_vars);- childrte->insertedCols = translate_col_privs(parentrte->insertedCols,- appinfo->translated_vars);- childrte->updatedCols = translate_col_privs(parentrte->updatedCols,- appinfo->translated_vars);- }+ /*+ * Translate the column permissions bitmaps to the child's attnums (we+ * have to build the translated_vars list before we can do this). But+ * if this is the parent table, leave copyObject's result alone.+ *+ * Note: we need to do this even though the executor won't run any+ * permissions checks on the child RTE. The insertedCols/updatedCols+ * bitmaps may be examined for trigger-firing purposes.+ */+ if (childrte->relid != parentrte->relid)+ {+ childrte->selectedCols = translate_col_privs(parentrte->selectedCols,+ appinfo->translated_vars);+ childrte->insertedCols = translate_col_privs(parentrte->insertedCols,+ appinfo->translated_vars);+ childrte->updatedCols = translate_col_privs(parentrte->updatedCols,+ appinfo->translated_vars);
}
/*
@@ -442,6 +538,253 @@ expand_single_inheritance_child(PlannerInfo *root, RangeTblEntry *parentrte,
root->rowMarks = lappend(root->rowMarks, childrc);
}
++ /*+ * Add the RelOptInfo. Even though we may not really scan this relation+ * for reasons such as contradictory quals, we still need to create one,+ * because for every RTE in the query's range table, there must be an+ * accompanying RelOptInfo.+ */++ /* First, store the RTE and appinfos into planner arrays. */+ Assert(root->simple_rte_array[childRTindex] == NULL);+ root->simple_rte_array[childRTindex] = childrte;+ Assert(root->append_rel_array[childRTindex] == NULL);+ root->append_rel_array[childRTindex] = appinfo;++ childrelopt = build_inheritance_child_rel(root, parentrel, childRTindex);+ Assert(childrelopt != NULL);++ return childrelopt;+}++/*+ * build_inheritance_child_rel+ * Build a RelOptInfo for child relation of an inheritance set+ *+ * After creating the RelOptInfo for the given child RT index, it goes on to+ * initialize some of its fields based on the parent RelOptInfo.+ *+ * If the quals in baserestrictinfo turn out to be self-contradictory,+ * RelOptInfo is marked dummy before returning.+ */+static RelOptInfo *+build_inheritance_child_rel(PlannerInfo *root,+ RelOptInfo *parent,+ Index childRTindex)+{+ RelOptInfo *childrel;+ RangeTblEntry *childRTE = root->simple_rte_array[childRTindex];+ AppendRelInfo *appinfo = root->append_rel_array[childRTindex];+ List *childquals;+ ListCell *lc;+ bool have_const_false_cq;+ Index cq_min_security;++ /* Build the RelOptInfo. */+ childrel = build_simple_rel(root, childRTindex, parent);++ /*+ * Propagate lateral_relids and lateral_referencers from appendrel+ * parent rels to their child rels. We intentionally give each child rel+ * the same minimum parameterization, even though it's quite possible that+ * some don't reference all the lateral rels. This is because any append+ * path for the parent will have to have the same parameterization for+ * every child anyway, and there's no value in forcing extra+ * reparameterize_path() calls. Similarly, a lateral reference to the+ * parent prevents use of otherwise-movable join rels for each child.+ */+ childrel->direct_lateral_relids = parent->direct_lateral_relids;+ childrel->lateral_relids = parent->lateral_relids;+ childrel->lateral_referencers = parent->lateral_referencers;++ /*+ * We have to copy the parent's quals to the child, with appropriate+ * substitution of variables. However, only the baserestrictinfo+ * quals are needed before we can check for constraint exclusion; so+ * do that first and then check to see if we can disregard this child.+ *+ * The child rel's targetlist might contain non-Var expressions, which+ * means that substitution into the quals could produce opportunities+ * for const-simplification, and perhaps even pseudoconstant quals.+ * Therefore, transform each RestrictInfo separately to see if it+ * reduces to a constant or pseudoconstant. (We must process them+ * separately to keep track of the security level of each qual.)+ */+ childquals = false;+ cq_min_security = UINT_MAX;+ have_const_false_cq = false;+ foreach(lc, parent->baserestrictinfo)+ {+ RestrictInfo *rinfo = (RestrictInfo *) lfirst(lc);+ Node *childqual = (Node *) rinfo->clause;+ ListCell *lc2;++ Assert(IsA(rinfo, RestrictInfo));+ childqual = adjust_appendrel_attrs(root, childqual,+ 1, &appinfo);+ childqual = eval_const_expressions(root, childqual);+ /* check for flat-out constant */+ if (childqual && IsA(childqual, Const))+ {+ if (((Const *) childqual)->constisnull ||+ !DatumGetBool(((Const *) childqual)->constvalue))+ {+ /* Restriction reduces to constant FALSE or NULL */+ have_const_false_cq = true;+ break;+ }+ /* Restriction reduces to constant TRUE, so drop it */+ continue;+ }+ /* might have gotten an AND clause, if so flatten it */+ foreach(lc2, make_ands_implicit((Expr *) childqual))+ {+ Node *onecq = (Node *) lfirst(lc2);+ bool pseudoconstant;++ /* check for pseudoconstant (no Vars or volatile functions) */+ pseudoconstant =+ !contain_vars_of_level(onecq, 0) &&+ !contain_volatile_functions(onecq);+ if (pseudoconstant)+ {+ /* tell createplan.c to check for gating quals */+ root->hasPseudoConstantQuals = true;+ }+ /* reconstitute RestrictInfo with appropriate properties */+ childquals = lappend(childquals,+ make_restrictinfo((Expr *) onecq,+ rinfo->is_pushed_down,+ rinfo->outerjoin_delayed,+ pseudoconstant,+ rinfo->security_level,+ NULL, NULL, NULL));+ cq_min_security = Min(cq_min_security, rinfo->security_level);+ }+ }++ /*+ * In addition to the quals inherited from the parent, we might+ * have securityQuals associated with this particular child node.+ * (Currently this can only happen in appendrels originating from+ * UNION ALL; inheritance child tables don't have their own+ * securityQuals.) Pull any such securityQuals up into the+ * baserestrictinfo for the child. This is similar to+ * process_security_barrier_quals() for the parent rel, except+ * that we can't make any general deductions from such quals,+ * since they don't hold for the whole appendrel.+ */+ if (childRTE->securityQuals)+ {+ Index security_level = 0;++ foreach(lc, childRTE->securityQuals)+ {+ List *qualset = (List *) lfirst(lc);+ ListCell *lc2;++ foreach(lc2, qualset)+ {+ Expr *qual = (Expr *) lfirst(lc2);++ /*+ * not likely that we'd see constants here, so no+ * check+ */+ childquals = lappend(childquals,+ make_restrictinfo(qual,+ true,+ false,+ false,+ security_level,+ NULL, NULL,+ NULL));+ cq_min_security = Min(cq_min_security, security_level);+ }+ security_level++;+ }+ Assert(security_level <= root->qual_security_level);+ }++ /* Set child's version of baserestrictinfo. */+ childrel->baserestrictinfo = childquals;+ childrel->baserestrict_min_security = cq_min_security;++ if (have_const_false_cq)+ {+ /*+ * Some restriction clause reduced to constant FALSE or NULL after+ * substitution, so this child need not be scanned.+ */+ set_dummy_rel_pathlist(childrel);+ }++ return childrel;+}++/*+ * add_rowmark_junk_columns+ * Add necessary junk columns for rowmarked inheritance parent rel.+ *+ * These values are needed for locking of rels selected FOR UPDATE/SHARE, and+ * to do EvalPlanQual rechecking. See comments for PlanRowMark in+ * plannodes.h.+ */+static List *+add_rowmark_junk_columns(PlannerInfo *root, PlanRowMark *rc)+{+ List *tlist = root->processed_tlist;+ Var *var;+ char resname[32];+ TargetEntry *tle;++ if (rc->allMarkTypes & ~(1 << ROW_MARK_COPY))+ {+ /* Need to fetch TID */+ var = makeVar(rc->rti,+ SelfItemPointerAttributeNumber,+ TIDOID,+ -1,+ InvalidOid,+ 0);+ snprintf(resname, sizeof(resname), "ctid%u", rc->rowmarkId);+ tle = makeTargetEntry((Expr *) var,+ list_length(tlist) + 1,+ pstrdup(resname),+ true);+ tlist = lappend(tlist, tle);+ }+ if (rc->allMarkTypes & (1 << ROW_MARK_COPY))+ {+ /* Need the whole row as a junk var */+ var = makeWholeRowVar(root->simple_rte_array[rc->rti],+ rc->rti,+ 0,+ false);+ snprintf(resname, sizeof(resname), "wholerow%u", rc->rowmarkId);+ tle = makeTargetEntry((Expr *) var,+ list_length(tlist) + 1,+ pstrdup(resname),+ true);+ tlist = lappend(tlist, tle);+ }++ /* For inheritance cases, always fetch the tableoid too. */+ var = makeVar(rc->rti,+ TableOidAttributeNumber,+ OIDOID,+ -1,+ InvalidOid,+ 0);+ snprintf(resname, sizeof(resname), "tableoid%u", rc->rowmarkId);+ tle = makeTargetEntry((Expr *) var,+ list_length(tlist) + 1,+ pstrdup(resname),+ true);+ tlist = lappend(tlist, tle);++ return tlist;
}
/*
@@ -583,7 +926,7 @@ create_inherited_target_child_root(PlannerInfo *root, AppendRelInfo *appinfo)
* column, filling placeholder entries for dropped columns, etc., all of
* which occurs with the child's TupleDesc.
*/
- tlist = preprocess_targetlist(subroot);+ tlist = preprocess_targetlist(subroot, true);
subroot->processed_tlist = tlist;
/* Add any newly added Vars to the child RelOptInfo. */
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.cindex 6009de309e..293f9ac619 100644--- a/src/backend/optimizer/util/plancat.c+++ b/src/backend/optimizer/util/plancat.c@@ -105,20 +105,20 @@ static void set_baserel_partition_key_exprs(Relation relation,
* important for it.
*/
void
-get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,- RelOptInfo *rel)+get_relation_info(PlannerInfo *root, RangeTblEntry *rte, RelOptInfo *rel)
{
Index varno = rel->relid;
Relation relation;
bool hasindex;
List *indexinfos = NIL;
+ bool inhparent = rte->inh;
/*
* We need not lock the relation since it was already locked, either by
* the rewriter or when expand_inherited_rtentry() added it to the query's
* rangetable.
*/
- relation = heap_open(relationObjectId, NoLock);+ relation = heap_open(rte->relid, NoLock);
/* Temporary and unlogged relations are inaccessible during recovery. */
if (!RelationNeedsWAL(relation) && RecoveryInProgress())
@@ -444,11 +444,32 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
get_relation_foreign_keys(root, rel, relation, inhparent);
/*
- * Collect info about relation's partitioning scheme, if any. Only- * inheritance parents may be partitioned.+ * Collect some additional information for inheritance parents.
*/
- if (inhparent && relation->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)- set_relation_partition_info(root, rel, relation);+ if (inhparent)+ {+ /*+ * We'll need the TupleDesc when initializing the child relation.+ * A copy is being made because concurrent changes might drop+ * the relcache entry. That's possible because ALTER TABLE+ * child_table NO INHERIT parent_table only requires an+ * AccessShareLock on parent_table.+ */+ rel->tupdesc = CreateTupleDescCopy(RelationGetDescr(relation));+ rel->reltype = RelationGetForm(relation)->reltype;++ /*+ * If partitioned, also save the information of partitioning scheme,+ * and whether the query updates any of the partition key columns.+ */+ if (relation->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)+ {+ set_relation_partition_info(root, rel, relation);+ root->partColsUpdated |= has_partition_attrs(relation,+ rte->updatedCols,+ NULL);+ }+ }
heap_close(relation, NoLock);
@@ -458,7 +479,7 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
* removing an index, or adding a hypothetical index to the indexlist.
*/
if (get_relation_info_hook)
- (*get_relation_info_hook) (root, relationObjectId, inhparent, rel);+ (*get_relation_info_hook) (root, rte->relid, rte->inh, rel);
}
/*
@@ -1844,16 +1865,20 @@ set_relation_partition_info(PlannerInfo *root, RelOptInfo *rel,
Relation relation)
{
PartitionDesc partdesc;
- PartitionKey partkey;
Assert(relation->rd_rel->relkind == RELKIND_PARTITIONED_TABLE);
partdesc = RelationGetPartitionDesc(relation);
- partkey = RelationGetPartitionKey(relation);
rel->part_scheme = find_partition_scheme(root, relation);
Assert(partdesc != NULL && rel->part_scheme != NULL);
- rel->boundinfo = partition_bounds_copy(partdesc->boundinfo, partkey);
rel->nparts = partdesc->nparts;
++ /*+ * Since we must've taken a lock on the table, it's okay to simply copy+ * the pointers to relcache data here.+ */+ rel->part_oids = partdesc->oids;+ rel->boundinfo = partdesc->boundinfo;
set_baserel_partition_key_exprs(relation, rel);
rel->partition_qual = RelationGetPartitionQual(relation);
}
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.cindex fe83ec4519..d12d047002 100644--- a/src/backend/optimizer/util/relnode.c+++ b/src/backend/optimizer/util/relnode.c@@ -132,6 +132,50 @@ setup_append_rel_array(PlannerInfo *root)
}
/*
+ * expand_planner_arrays+ * Expand the PlannerInfo arrays by add_size members and initialize the+ * the newly added bytes with zero+ */+void+expand_planner_arrays(PlannerInfo *root, int add_size)+{+ int new_size;++ Assert(add_size > 0);++ new_size = root->simple_rel_array_size + add_size;++ /* Expand various arrays and 0-initialize added bytes. */+ root->simple_rte_array = (RangeTblEntry **)+ repalloc(root->simple_rte_array,+ sizeof(RangeTblEntry *) * new_size);+ MemSet(root->simple_rte_array + root->simple_rel_array_size,+ 0, sizeof(RangeTblEntry *) * add_size);+ root->simple_rel_array = (RelOptInfo **)+ repalloc(root->simple_rel_array,+ sizeof(RelOptInfo *) * new_size);+ MemSet(root->simple_rel_array + root->simple_rel_array_size,+ 0, sizeof(RelOptInfo *) * add_size);++ if (root->append_rel_array)+ {+ root->append_rel_array = (AppendRelInfo **)+ repalloc(root->append_rel_array,+ sizeof(AppendRelInfo *) * new_size);+ MemSet(root->append_rel_array + root->simple_rel_array_size,+ 0, sizeof(AppendRelInfo *) * add_size);+ }+ else+ {+ root->append_rel_array = (AppendRelInfo **)+ palloc0(sizeof(AppendRelInfo *) *+ new_size);+ }++ root->simple_rel_array_size = new_size;+}++/*
* build_simple_rel
* Construct a new RelOptInfo for a base relation or 'other' relation.
*/
@@ -195,6 +239,7 @@ build_simple_rel(PlannerInfo *root, int relid, RelOptInfo *parent)
rel->joininfo = NIL;
rel->has_eclass_joins = false;
rel->consider_partitionwise_join = false; /* might get changed later */
+ rel->top_parent_relids = NULL; /* might be changed later */
rel->part_scheme = NULL;
rel->nparts = 0;
rel->boundinfo = NULL;
@@ -203,6 +248,7 @@ build_simple_rel(PlannerInfo *root, int relid, RelOptInfo *parent)
rel->partexprs = NULL;
rel->nullable_partexprs = NULL;
rel->partitioned_child_rels = NIL;
+ rel->inh_root_parent = 0; /* might be changed later */
/*
* Pass top parent's relids down the inheritance hierarchy. If the parent
@@ -216,16 +262,25 @@ build_simple_rel(PlannerInfo *root, int relid, RelOptInfo *parent)
rel->top_parent_relids = parent->top_parent_relids;
else
rel->top_parent_relids = bms_copy(parent->relids);
++ /*+ * For inheritance child relations, we also set inh_root_parent.+ * Note that 'parent' might itself be a child (a sub-partitioned+ * partition), in which case we simply use its value of+ * inh_root_parent.+ */+ if (parent->rtekind == RTE_RELATION)+ rel->inh_root_parent = parent->inh_root_parent > 0 ?+ parent->inh_root_parent :+ parent->relid;
}
- else- rel->top_parent_relids = NULL;
/* Check type of rtable entry */
switch (rte->rtekind)
{
case RTE_RELATION:
/* Table --- retrieve statistics from the system catalogs */
- get_relation_info(root, rte->relid, rte->inh, rel);+ get_relation_info(root, rte, rel);
break;
case RTE_SUBQUERY:
case RTE_FUNCTION:
@@ -266,52 +321,6 @@ build_simple_rel(PlannerInfo *root, int relid, RelOptInfo *parent)
root->qual_security_level = Max(root->qual_security_level,
list_length(rte->securityQuals));
- /*- * If this rel is an appendrel parent, recurse to build "other rel"- * RelOptInfos for its children. They are "other rels" because they are- * not in the main join tree, but we will need RelOptInfos to plan access- * to them.- */- if (rte->inh)- {- ListCell *l;- int nparts = rel->nparts;- int cnt_parts = 0;-- if (nparts > 0)- rel->part_rels = (RelOptInfo **)- palloc(sizeof(RelOptInfo *) * nparts);-- foreach(l, root->append_rel_list)- {- AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(l);- RelOptInfo *childrel;-- /* append_rel_list contains all append rels; ignore others */- if (appinfo->parent_relid != relid)- continue;-- childrel = build_simple_rel(root, appinfo->child_relid,- rel);-- /* Nothing more to do for an unpartitioned table. */- if (!rel->part_scheme)- continue;-- /*- * The order of partition OIDs in append_rel_list is the same as- * the order in the PartitionDesc, so the order of part_rels will- * also match the PartitionDesc. See expand_partitioned_rtentry.- */- Assert(cnt_parts < nparts);- rel->part_rels[cnt_parts] = childrel;- cnt_parts++;- }-- /* We should have seen all the child partitions. */- Assert(cnt_parts == nparts);- }-
return rel;
}
diff --git a/src/backend/partitioning/partprune.c b/src/backend/partitioning/partprune.cindex 901433c68c..9bb472fd98 100644--- a/src/backend/partitioning/partprune.c+++ b/src/backend/partitioning/partprune.c@@ -46,6 +46,7 @@
#include "nodes/nodeFuncs.h"
#include "optimizer/appendinfo.h"
#include "optimizer/clauses.h"
+#include "optimizer/cost.h"
#include "optimizer/pathnode.h"
#include "optimizer/planner.h"
#include "optimizer/predtest.h"
@@ -437,17 +438,23 @@ make_partitionedrel_pruneinfo(PlannerInfo *root, RelOptInfo *parentrel,
* is, not pruned already).
*/
subplan_map = (int *) palloc(nparts * sizeof(int));
+ memset(subplan_map, -1, nparts * sizeof(int));
subpart_map = (int *) palloc(nparts * sizeof(int));
+ memset(subpart_map, -1, nparts * sizeof(int));
present_parts = NULL;
for (i = 0; i < nparts; i++)
{
RelOptInfo *partrel = subpart->part_rels[i];
- int subplanidx = relid_subplan_map[partrel->relid] - 1;- int subpartidx = relid_subpart_map[partrel->relid] - 1;+ int subplanidx;+ int subpartidx;- subplan_map[i] = subplanidx;- subpart_map[i] = subpartidx;+ /* Skip processing pruned partitions. */+ if (partrel == NULL)+ continue;++ subplan_map[i] = subplanidx = relid_subplan_map[partrel->relid] - 1;+ subpart_map[i] = subpartidx = relid_subpart_map[partrel->relid] - 1;
if (subplanidx >= 0)
{
present_parts = bms_add_member(present_parts, i);
@@ -541,23 +548,20 @@ gen_partprune_steps(RelOptInfo *rel, List *clauses, bool *contradictory)
/*
* prune_append_rel_partitions
- * Returns RT indexes of the minimum set of child partitions which must- * be scanned to satisfy rel's baserestrictinfo quals.+ * Returns indexes into rel->part_rels of the minimum set of child+ * partitions which must be scanned to satisfy rel's baserestrictinfo+ * quals.
*
* Callers must ensure that 'rel' is a partitioned table.
*/
-Relids+Bitmapset *
prune_append_rel_partitions(RelOptInfo *rel)
{
- Relids result;
List *clauses = rel->baserestrictinfo;
List *pruning_steps;
bool contradictory;
PartitionPruneContext context;
- Bitmapset *partindexes;- int i;- Assert(clauses != NIL);
Assert(rel->part_scheme != NULL);
/* If there are no partitions, return the empty set */
@@ -565,6 +569,13 @@ prune_append_rel_partitions(RelOptInfo *rel)
return NULL;
/*
+ * If pruning is disabled or if there are no clauses to prune with,+ * return all partitions.+ */+ if (!enable_partition_pruning || clauses == NIL)+ return bms_add_range(NULL, 0, rel->nparts - 1);++ /*
* Process clauses. If the clauses are found to be contradictory, we can
* return the empty set.
*/
@@ -591,15 +602,7 @@ prune_append_rel_partitions(RelOptInfo *rel)
context.evalexecparams = false;
/* Actual pruning happens here. */
- partindexes = get_matching_partitions(&context, pruning_steps);-- /* Add selected partitions' RT indexes to result. */- i = -1;- result = NULL;- while ((i = bms_next_member(partindexes, i)) >= 0)- result = bms_add_member(result, rel->part_rels[i]->relid);-- return result;+ return get_matching_partitions(&context, pruning_steps);
}
/*
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.hindex beb2e323a8..01a664d246 100644--- a/src/include/nodes/relation.h+++ b/src/include/nodes/relation.h@@ -15,6 +15,7 @@
#define RELATION_H
#include "access/sdir.h"
+#include "access/tupdesc.h"
#include "fmgr.h"
#include "lib/stringinfo.h"
#include "nodes/params.h"
@@ -729,11 +730,28 @@ typedef struct RelOptInfo
int nparts; /* number of partitions */
struct PartitionBoundInfoData *boundinfo; /* Partition bounds */
List *partition_qual; /* partition constraint */
+ Oid *part_oids; /* partition OIDs */
struct RelOptInfo **part_rels; /* Array of RelOptInfos of partitions,
* stored in the same order of bounds */
List **partexprs; /* Non-nullable partition key expressions. */
List **nullable_partexprs; /* Nullable partition key expressions. */
List *partitioned_child_rels; /* List of RT indexes. */
++ /*+ * For inheritance children, this is the RT index of inheritance table+ * mentioned in the query from which this relation originated.+ * top_parent_relids cannot be used for this, because if the inheritance+ * root table is itself under UNION ALL, top_parent_relids contains the+ * RT index of UNION ALL parent subquery.+ */+ Index inh_root_parent;++ /*+ * Set only if this is an inheritance parent relation. This information+ * is needed when initializing the planning info for children.+ */+ TupleDesc tupdesc; /* A "copy" of the table's tuple desriptor */+ Oid reltype; /* Table's reltype */
} RelOptInfo;
/*
diff --git a/src/include/optimizer/appendinfo.h b/src/include/optimizer/appendinfo.hindex 604e36d73c..8f7b06a608 100644--- a/src/include/optimizer/appendinfo.h+++ b/src/include/optimizer/appendinfo.h@@ -17,9 +17,10 @@
#include "nodes/relation.h"
#include "utils/relcache.h"
-extern AppendRelInfo *make_append_rel_info(Relation parentrel,- Relation childrel,- Index parentRTindex, Index childRTindex);+extern AppendRelInfo *make_append_rel_info(RelOptInfo *parent,+ RangeTblEntry *parentrte,+ TupleDesc childdesc, Oid childoid, Oid childtype,+ Index childRTindex);
extern Node *adjust_appendrel_attrs(PlannerInfo *root, Node *node,
int nappinfos, AppendRelInfo **appinfos);
extern Node *adjust_appendrel_attrs_multilevel(PlannerInfo *root, Node *node,
diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.hindex bd905d3328..e7d0a20c54 100644--- a/src/include/optimizer/pathnode.h+++ b/src/include/optimizer/pathnode.h@@ -261,6 +261,7 @@ extern Path *reparameterize_path_by_child(PlannerInfo *root, Path *path,
*/
extern void setup_simple_rel_arrays(PlannerInfo *root);
extern void setup_append_rel_array(PlannerInfo *root);
+extern void expand_planner_arrays(PlannerInfo *root, int add_size);
extern RelOptInfo *build_simple_rel(PlannerInfo *root, int relid,
RelOptInfo *parent);
extern RelOptInfo *find_base_rel(PlannerInfo *root, int relid);
diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.hindex a1b23251a1..d8091cdfa4 100644--- a/src/include/optimizer/plancat.h+++ b/src/include/optimizer/plancat.h@@ -25,8 +25,8 @@ typedef void (*get_relation_info_hook_type) (PlannerInfo *root,
extern PGDLLIMPORT get_relation_info_hook_type get_relation_info_hook;
-extern void get_relation_info(PlannerInfo *root, Oid relationObjectId,- bool inhparent, RelOptInfo *rel);+extern void get_relation_info(PlannerInfo *root, RangeTblEntry *rte,+ RelOptInfo *rel);
extern List *infer_arbiter_indexes(PlannerInfo *root);
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.hindex 62d45dd142..a329e87fc2 100644--- a/src/include/optimizer/prep.h+++ b/src/include/optimizer/prep.h@@ -38,7 +38,8 @@ extern Expr *canonicalize_qual(Expr *qual, bool is_check);
/*
* prototypes for preptlist.c
*/
-extern List *preprocess_targetlist(PlannerInfo *root);+extern List *preprocess_targetlist(PlannerInfo *root,+ bool inheritance_expanded);
extern PlanRowMark *get_plan_rowmark(List *rowmarks, Index rtindex);
diff --git a/src/include/partitioning/partprune.h b/src/include/partitioning/partprune.hindex ce9bc8d9fd..5c5d27d040 100644--- a/src/include/partitioning/partprune.h+++ b/src/include/partitioning/partprune.h@@ -76,7 +76,7 @@ extern PartitionPruneInfo *make_partition_pruneinfo(PlannerInfo *root,
List *subpaths,
List *partitioned_rels,
List *prunequal);
-extern Relids prune_append_rel_partitions(RelOptInfo *rel);+extern Bitmapset *prune_append_rel_partitions(RelOptInfo *rel);
extern Bitmapset *get_matching_partitions(PartitionPruneContext *context,
List *pruning_steps);
diff --git a/src/test/regress/expected/partition_aggregate.out b/src/test/regress/expected/partition_aggregate.outindex 6bc106831e..1450cef057 100644--- a/src/test/regress/expected/partition_aggregate.out+++ b/src/test/regress/expected/partition_aggregate.out@@ -144,7 +144,7 @@ SELECT c, sum(a) FROM pagg_tab WHERE 1 = 2 GROUP BY c;
QUERY PLAN
--------------------------------
HashAggregate
- Group Key: pagg_tab.c+ Group Key: c
-> Result
One-Time Filter: false
(4 rows)
@@ -159,7 +159,7 @@ SELECT c, sum(a) FROM pagg_tab WHERE c = 'x' GROUP BY c;
QUERY PLAN
--------------------------------
GroupAggregate
- Group Key: pagg_tab.c+ Group Key: c
-> Result
One-Time Filter: false
(4 rows)
--
2.11.0
v16-0003-Teach-planner-to-only-process-unpruned-partition.patch (text/plain, 6.8K) download
From 3a2886cc047786892eea1ece2ba27b034860f9d2 Mon Sep 17 00:00:00 2001
From: amit <amitlangote09@gmail.com>
Date: Mon, 15 Oct 2018 10:59:24 +0900
Subject: [PATCH v16 3/4] Teach planner to only process unpruned partitions
This adds a bitmapset field live_parts to RelOptInfo and stores
the partition indexes of non-dummy partitions in it, meaning it
contains indexes of only those partitions that have a non-NULL
RelOptInfo present in its parent's RelOptInfo's part_rels array.
This speeds up processing partitioned table's partitions compared
to going through the whole part_rels array in a number of places.
---
src/backend/optimizer/path/joinrels.c | 3 +++
src/backend/optimizer/plan/planner.c | 18 +++++++++---------
src/backend/optimizer/util/inherit.c | 1 +
src/backend/optimizer/util/relnode.c | 3 +++
src/backend/partitioning/partprune.c | 18 +++++-------------
src/include/nodes/relation.h | 4 ++++
6 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.cindex bc89de9a9d..3d5b2df8d8 100644--- a/src/backend/optimizer/path/joinrels.c+++ b/src/backend/optimizer/path/joinrels.c@@ -1451,6 +1451,9 @@ try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
populate_joinrel_with_paths(root, child_rel1, child_rel2,
child_joinrel, child_sjinfo,
child_restrictlist);
+ if (!IS_DUMMY_REL(child_joinrel))+ joinrel->live_parts = bms_add_member(joinrel->live_parts,+ cnt_parts);
}
}
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.cindex f80f35eed3..faf5f343fb 100644--- a/src/backend/optimizer/plan/planner.c+++ b/src/backend/optimizer/plan/planner.c@@ -6833,7 +6833,9 @@ apply_scanjoin_target_to_paths(PlannerInfo *root,
List *live_children = NIL;
/* Adjust each partition. */
- for (partition_idx = 0; partition_idx < rel->nparts; partition_idx++)+ partition_idx = -1;+ while ((partition_idx = bms_next_member(rel->live_parts,+ partition_idx)) >= 0)
{
RelOptInfo *child_rel = rel->part_rels[partition_idx];
ListCell *lc;
@@ -6841,9 +6843,7 @@ apply_scanjoin_target_to_paths(PlannerInfo *root,
int nappinfos;
List *child_scanjoin_targets = NIL;
- /* Skip processing pruned partitions. */- if (child_rel == NULL)- continue;+ Assert(child_rel != NULL);
/* Translate scan/join targets for this child. */
appinfos = find_appinfos_by_relids(root, child_rel->relids,
@@ -6924,7 +6924,6 @@ create_partitionwise_grouping_paths(PlannerInfo *root,
PartitionwiseAggregateType patype,
GroupPathExtraData *extra)
{
- int nparts = input_rel->nparts;
int cnt_parts;
List *grouped_live_children = NIL;
List *partially_grouped_live_children = NIL;
@@ -6936,7 +6935,9 @@ create_partitionwise_grouping_paths(PlannerInfo *root,
partially_grouped_rel != NULL);
/* Add paths for partitionwise aggregation/grouping. */
- for (cnt_parts = 0; cnt_parts < nparts; cnt_parts++)+ cnt_parts = -1;+ while ((cnt_parts = bms_next_member(input_rel->live_parts,+ cnt_parts)) >= 0)
{
RelOptInfo *child_input_rel = input_rel->part_rels[cnt_parts];
PathTarget *child_target = copy_pathtarget(target);
@@ -6946,9 +6947,8 @@ create_partitionwise_grouping_paths(PlannerInfo *root,
RelOptInfo *child_grouped_rel;
RelOptInfo *child_partially_grouped_rel;
- /* Skip processing pruned partitions. */- if (child_input_rel == NULL)- continue;+ /* A live partition must have a RelOptInfo. */+ Assert(child_input_rel != NULL);
/* Input child rel must have a path */
Assert(child_input_rel->pathlist != NIL);
diff --git a/src/backend/optimizer/util/inherit.c b/src/backend/optimizer/util/inherit.cindex f1bd954373..d6f120fcc1 100644--- a/src/backend/optimizer/util/inherit.c+++ b/src/backend/optimizer/util/inherit.c@@ -361,6 +361,7 @@ expand_partitioned_rtentry(PlannerInfo *root, RangeTblEntry *parentrte,
/* Perform pruning. */
partindexes = prune_append_rel_partitions(parentrel);
+ parentrel->live_parts = partindexes;
/* Must expand PlannerInfo arrays before we can add children. */
if (bms_num_members(partindexes) > 0)
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.cindex d12d047002..059ab8f35e 100644--- a/src/backend/optimizer/util/relnode.c+++ b/src/backend/optimizer/util/relnode.c@@ -1757,6 +1757,9 @@ build_joinrel_partition_info(RelOptInfo *joinrel, RelOptInfo *outer_rel,
joinrel->partexprs[cnt] = partexpr;
joinrel->nullable_partexprs[cnt] = nullable_partexpr;
}
++ /* Partitions will be added by try_partitionwise_join. */+ joinrel->live_parts = NULL;
}
/*
diff --git a/src/backend/partitioning/partprune.c b/src/backend/partitioning/partprune.cindex 9bb472fd98..088b191bdd 100644--- a/src/backend/partitioning/partprune.c+++ b/src/backend/partitioning/partprune.c@@ -441,29 +441,21 @@ make_partitionedrel_pruneinfo(PlannerInfo *root, RelOptInfo *parentrel,
memset(subplan_map, -1, nparts * sizeof(int));
subpart_map = (int *) palloc(nparts * sizeof(int));
memset(subpart_map, -1, nparts * sizeof(int));
- present_parts = NULL;+ present_parts = bms_copy(subpart->live_parts);- for (i = 0; i < nparts; i++)+ i = -1;+ while ((i = bms_next_member(present_parts, i)) >= 0)
{
RelOptInfo *partrel = subpart->part_rels[i];
int subplanidx;
int subpartidx;
- /* Skip processing pruned partitions. */- if (partrel == NULL)- continue;-+ Assert(partrel != NULL);
subplan_map[i] = subplanidx = relid_subplan_map[partrel->relid] - 1;
subpart_map[i] = subpartidx = relid_subpart_map[partrel->relid] - 1;
+ /* Record finding this subplan */
if (subplanidx >= 0)
- {- present_parts = bms_add_member(present_parts, i);-- /* Record finding this subplan */
subplansfound = bms_add_member(subplansfound, subplanidx);
- }- else if (subpartidx >= 0)- present_parts = bms_add_member(present_parts, i);
}
pinfo = makeNode(PartitionedRelPruneInfo);
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.hindex 01a664d246..d27611c2c7 100644--- a/src/include/nodes/relation.h+++ b/src/include/nodes/relation.h@@ -733,6 +733,10 @@ typedef struct RelOptInfo
Oid *part_oids; /* partition OIDs */
struct RelOptInfo **part_rels; /* Array of RelOptInfos of partitions,
* stored in the same order of bounds */
+ Bitmapset *live_parts; /* Indexes into part_rels of the non-NULL+ * RelOptInfos of unpruned partitions; exists+ * to avoid having to iterate over the entire+ * part_rels array to filter NULL entries. */
List **partexprs; /* Non-nullable partition key expressions. */
List **nullable_partexprs; /* Nullable partition key expressions. */
List *partitioned_child_rels; /* List of RT indexes. */
--
2.11.0
v16-0004-Do-not-lock-all-partitions-at-the-beginning.patch (text/plain, 1.7K) download
From 33b554820f8f589e2f117c096b525b013cf2954c Mon Sep 17 00:00:00 2001
From: amit <amitlangote09@gmail.com>
Date: Fri, 12 Oct 2018 19:12:53 +0900
Subject: [PATCH v16 4/4] Do not lock all partitions at the beginning
---
src/backend/optimizer/util/inherit.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/backend/optimizer/util/inherit.c b/src/backend/optimizer/util/inherit.cindex d6f120fcc1..426d64faea 100644--- a/src/backend/optimizer/util/inherit.c+++ b/src/backend/optimizer/util/inherit.c@@ -328,10 +328,6 @@ expand_nonpartitioned_inherited_rtentry(PlannerInfo *root,
*
* Partitions are added to the query in order in which they are found in
* the parent's PartitionDesc.
- *- * Note: even though only the unpruned partitions will be added to the- * resulting plan, this still locks *all* partitions via find_all_inheritors- * when this function is called for the root partitioned table.
*/
static void
expand_partitioned_rtentry(PlannerInfo *root, RangeTblEntry *parentrte,
@@ -345,10 +341,6 @@ expand_partitioned_rtentry(PlannerInfo *root, RangeTblEntry *parentrte,
parentrel->inh_root_parent :
parentRTindex;
- /* If root partitioned table, lock *all* partitions in the tree. */- if (parentRTindex == rootParentRTindex)- (void) find_all_inheritors(parentrte->relid, lockmode, NULL);-
/*
* Initialize partitioned_child_rels to contain this RT index.
*
@@ -385,8 +377,7 @@ expand_partitioned_rtentry(PlannerInfo *root, RangeTblEntry *parentrte,
RangeTblEntry *childrte;
Index childRTindex;
- /* Already locked above. */- newrelation = heap_open(childOID, NoLock);+ newrelation = heap_open(childOID, lockmode);
Assert(!RELATION_IS_OTHER_TEMP(newrelation));
/*
--
2.11.0
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-hackers@postgresql.org
Cc: Langote_Amit_f8@lab.ntt.co.jp, alvherre@2ndquadrant.com, david.rowley@2ndquadrant.com, amitlangote09@gmail.com, imai.yoshikazu@jp.fujitsu.com
Subject: Re: speeding up planning with partitions
In-Reply-To: <9e1cf3fb-e7eb-6bda-126f-df11823293de@lab.ntt.co.jp>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox