From fed8dcdb84d255088d22efa3156a193f3399e792 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 12 Jan 2011 20:47:09 -0500 Subject: Fix PlanRowMark/ExecRowMark structures to handle inheritance correctly. In an inherited UPDATE/DELETE, each target table has its own subplan, because it might have a column set different from other targets. This means that the resjunk columns we add to support EvalPlanQual might be at different physical column numbers in each subplan. The EvalPlanQual rewrite I did for 9.0 failed to account for this, resulting in possible misbehavior or even crashes during concurrent updates to the same row, as seen in a recent report from Gordon Shannon. Revise the data structure so that we track resjunk column numbers separately for each subplan. I also chose to move responsibility for identifying the physical column numbers back to executor startup, instead of assuming that numbers derived during preprocess_targetlist would stay valid throughout subsequent massaging of the plan. That's a bit slower, so we might want to consider undoing it someday; but it would complicate the patch considerably and didn't seem justifiable in a bug fix that has to be back-patched to 9.0. --- src/backend/executor/execJunk.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/backend/executor/execJunk.c') diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c index 2fa7e68a8ed..da227093f30 100644 --- a/src/backend/executor/execJunk.c +++ b/src/backend/executor/execJunk.c @@ -207,10 +207,22 @@ ExecInitJunkFilterConversion(List *targetList, */ AttrNumber ExecFindJunkAttribute(JunkFilter *junkfilter, const char *attrName) +{ + return ExecFindJunkAttributeInTlist(junkfilter->jf_targetList, attrName); +} + +/* + * ExecFindJunkAttributeInTlist + * + * Find a junk attribute given a subplan's targetlist (not necessarily + * part of a JunkFilter). + */ +AttrNumber +ExecFindJunkAttributeInTlist(List *targetlist, const char *attrName) { ListCell *t; - foreach(t, junkfilter->jf_targetList) + foreach(t, targetlist) { TargetEntry *tle = lfirst(t); -- cgit v1.2.3