mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-27 08:39:28 +08:00
Fix EXPLAIN output for cases where parent table is excluded by constraints.
The previous coding in EXPLAIN always labeled a ModifyTable node with the name of the target table affected by its first child plan. When originally written, this was necessarily the parent table of the inheritance tree, so everything was unconfusing. But when we added NO INHERIT constraints, it became possible for the parent table to be deleted from the plan by constraint exclusion while still leaving child tables present. This led to the ModifyTable plan node being labeled with the first surviving child, which was deemed confusing. Fix it by retaining the parent table's RT index in a new field in ModifyTable. Etsuro Fujita, reviewed by Ashutosh Bapat and myself
This commit is contained in:
parent
931bf3eb9b
commit
abe45a9b31
@ -736,9 +736,8 @@ ExplainPreScanNode(PlanState *planstate, Bitmapset **rels_used)
|
|||||||
((Scan *) plan)->scanrelid);
|
((Scan *) plan)->scanrelid);
|
||||||
break;
|
break;
|
||||||
case T_ModifyTable:
|
case T_ModifyTable:
|
||||||
/* cf ExplainModifyTarget */
|
|
||||||
*rels_used = bms_add_member(*rels_used,
|
*rels_used = bms_add_member(*rels_used,
|
||||||
linitial_int(((ModifyTable *) plan)->resultRelations));
|
((ModifyTable *) plan)->nominalRelation);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@ -2192,16 +2191,7 @@ ExplainScanTarget(Scan *plan, ExplainState *es)
|
|||||||
static void
|
static void
|
||||||
ExplainModifyTarget(ModifyTable *plan, ExplainState *es)
|
ExplainModifyTarget(ModifyTable *plan, ExplainState *es)
|
||||||
{
|
{
|
||||||
Index rti;
|
ExplainTargetRel((Plan *) plan, plan->nominalRelation, es);
|
||||||
|
|
||||||
/*
|
|
||||||
* We show the name of the first target relation. In multi-target-table
|
|
||||||
* cases this should always be the parent of the inheritance tree.
|
|
||||||
*/
|
|
||||||
Assert(plan->resultRelations != NIL);
|
|
||||||
rti = linitial_int(plan->resultRelations);
|
|
||||||
|
|
||||||
ExplainTargetRel((Plan *) plan, rti, es);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -175,6 +175,7 @@ _copyModifyTable(const ModifyTable *from)
|
|||||||
*/
|
*/
|
||||||
COPY_SCALAR_FIELD(operation);
|
COPY_SCALAR_FIELD(operation);
|
||||||
COPY_SCALAR_FIELD(canSetTag);
|
COPY_SCALAR_FIELD(canSetTag);
|
||||||
|
COPY_SCALAR_FIELD(nominalRelation);
|
||||||
COPY_NODE_FIELD(resultRelations);
|
COPY_NODE_FIELD(resultRelations);
|
||||||
COPY_SCALAR_FIELD(resultRelIndex);
|
COPY_SCALAR_FIELD(resultRelIndex);
|
||||||
COPY_NODE_FIELD(plans);
|
COPY_NODE_FIELD(plans);
|
||||||
|
@ -327,6 +327,7 @@ _outModifyTable(StringInfo str, const ModifyTable *node)
|
|||||||
|
|
||||||
WRITE_ENUM_FIELD(operation, CmdType);
|
WRITE_ENUM_FIELD(operation, CmdType);
|
||||||
WRITE_BOOL_FIELD(canSetTag);
|
WRITE_BOOL_FIELD(canSetTag);
|
||||||
|
WRITE_UINT_FIELD(nominalRelation);
|
||||||
WRITE_NODE_FIELD(resultRelations);
|
WRITE_NODE_FIELD(resultRelations);
|
||||||
WRITE_INT_FIELD(resultRelIndex);
|
WRITE_INT_FIELD(resultRelIndex);
|
||||||
WRITE_NODE_FIELD(plans);
|
WRITE_NODE_FIELD(plans);
|
||||||
|
@ -4809,6 +4809,7 @@ make_result(PlannerInfo *root,
|
|||||||
ModifyTable *
|
ModifyTable *
|
||||||
make_modifytable(PlannerInfo *root,
|
make_modifytable(PlannerInfo *root,
|
||||||
CmdType operation, bool canSetTag,
|
CmdType operation, bool canSetTag,
|
||||||
|
Index nominalRelation,
|
||||||
List *resultRelations, List *subplans,
|
List *resultRelations, List *subplans,
|
||||||
List *withCheckOptionLists, List *returningLists,
|
List *withCheckOptionLists, List *returningLists,
|
||||||
List *rowMarks, int epqParam)
|
List *rowMarks, int epqParam)
|
||||||
@ -4857,6 +4858,7 @@ make_modifytable(PlannerInfo *root,
|
|||||||
|
|
||||||
node->operation = operation;
|
node->operation = operation;
|
||||||
node->canSetTag = canSetTag;
|
node->canSetTag = canSetTag;
|
||||||
|
node->nominalRelation = nominalRelation;
|
||||||
node->resultRelations = resultRelations;
|
node->resultRelations = resultRelations;
|
||||||
node->resultRelIndex = -1; /* will be set correctly in setrefs.c */
|
node->resultRelIndex = -1; /* will be set correctly in setrefs.c */
|
||||||
node->plans = subplans;
|
node->plans = subplans;
|
||||||
|
@ -607,6 +607,7 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
|
|||||||
plan = (Plan *) make_modifytable(root,
|
plan = (Plan *) make_modifytable(root,
|
||||||
parse->commandType,
|
parse->commandType,
|
||||||
parse->canSetTag,
|
parse->canSetTag,
|
||||||
|
parse->resultRelation,
|
||||||
list_make1_int(parse->resultRelation),
|
list_make1_int(parse->resultRelation),
|
||||||
list_make1(plan),
|
list_make1(plan),
|
||||||
withCheckOptionLists,
|
withCheckOptionLists,
|
||||||
@ -790,6 +791,7 @@ inheritance_planner(PlannerInfo *root)
|
|||||||
{
|
{
|
||||||
Query *parse = root->parse;
|
Query *parse = root->parse;
|
||||||
int parentRTindex = parse->resultRelation;
|
int parentRTindex = parse->resultRelation;
|
||||||
|
int nominalRelation = -1;
|
||||||
List *final_rtable = NIL;
|
List *final_rtable = NIL;
|
||||||
int save_rel_array_size = 0;
|
int save_rel_array_size = 0;
|
||||||
RelOptInfo **save_rel_array = NULL;
|
RelOptInfo **save_rel_array = NULL;
|
||||||
@ -924,6 +926,20 @@ inheritance_planner(PlannerInfo *root)
|
|||||||
*/
|
*/
|
||||||
appinfo->child_relid = subroot.parse->resultRelation;
|
appinfo->child_relid = subroot.parse->resultRelation;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We'll use the first child relation (even if it's excluded) as the
|
||||||
|
* nominal target relation of the ModifyTable node. Because of the
|
||||||
|
* way expand_inherited_rtentry works, this should always be the RTE
|
||||||
|
* representing the parent table in its role as a simple member of the
|
||||||
|
* inheritance set. (It would be logically cleaner to use the
|
||||||
|
* inheritance parent RTE as the nominal target; but since that RTE
|
||||||
|
* will not be otherwise referenced in the plan, doing so would give
|
||||||
|
* rise to confusing use of multiple aliases in EXPLAIN output for
|
||||||
|
* what the user will think is the "same" table.)
|
||||||
|
*/
|
||||||
|
if (nominalRelation < 0)
|
||||||
|
nominalRelation = appinfo->child_relid;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If this child rel was excluded by constraint exclusion, exclude it
|
* If this child rel was excluded by constraint exclusion, exclude it
|
||||||
* from the result plan.
|
* from the result plan.
|
||||||
@ -1051,6 +1067,7 @@ inheritance_planner(PlannerInfo *root)
|
|||||||
return (Plan *) make_modifytable(root,
|
return (Plan *) make_modifytable(root,
|
||||||
parse->commandType,
|
parse->commandType,
|
||||||
parse->canSetTag,
|
parse->canSetTag,
|
||||||
|
nominalRelation,
|
||||||
resultRelations,
|
resultRelations,
|
||||||
subplans,
|
subplans,
|
||||||
withCheckOptionLists,
|
withCheckOptionLists,
|
||||||
|
@ -754,6 +754,8 @@ set_plan_refs(PlannerInfo *root, Plan *plan, int rtoffset)
|
|||||||
splan->plan.targetlist = copyObject(linitial(newRL));
|
splan->plan.targetlist = copyObject(linitial(newRL));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
splan->nominalRelation += rtoffset;
|
||||||
|
|
||||||
foreach(l, splan->resultRelations)
|
foreach(l, splan->resultRelations)
|
||||||
{
|
{
|
||||||
lfirst_int(l) += rtoffset;
|
lfirst_int(l) += rtoffset;
|
||||||
|
@ -174,6 +174,7 @@ typedef struct ModifyTable
|
|||||||
Plan plan;
|
Plan plan;
|
||||||
CmdType operation; /* INSERT, UPDATE, or DELETE */
|
CmdType operation; /* INSERT, UPDATE, or DELETE */
|
||||||
bool canSetTag; /* do we set the command tag/es_processed? */
|
bool canSetTag; /* do we set the command tag/es_processed? */
|
||||||
|
Index nominalRelation; /* Parent RT index for use of EXPLAIN */
|
||||||
List *resultRelations; /* integer list of RT indexes */
|
List *resultRelations; /* integer list of RT indexes */
|
||||||
int resultRelIndex; /* index of first resultRel in plan's list */
|
int resultRelIndex; /* index of first resultRel in plan's list */
|
||||||
List *plans; /* plan(s) producing source data */
|
List *plans; /* plan(s) producing source data */
|
||||||
|
@ -82,6 +82,7 @@ extern Result *make_result(PlannerInfo *root, List *tlist,
|
|||||||
Node *resconstantqual, Plan *subplan);
|
Node *resconstantqual, Plan *subplan);
|
||||||
extern ModifyTable *make_modifytable(PlannerInfo *root,
|
extern ModifyTable *make_modifytable(PlannerInfo *root,
|
||||||
CmdType operation, bool canSetTag,
|
CmdType operation, bool canSetTag,
|
||||||
|
Index nominalRelation,
|
||||||
List *resultRelations, List *subplans,
|
List *resultRelations, List *subplans,
|
||||||
List *withCheckOptionLists, List *returningLists,
|
List *withCheckOptionLists, List *returningLists,
|
||||||
List *rowMarks, int epqParam);
|
List *rowMarks, int epqParam);
|
||||||
|
Loading…
Reference in New Issue
Block a user