Commit feeb526c authored by Tom Lane's avatar Tom Lane

Fix ExecOpenScanRelation to take a lock on a ROW_MARK_COPY relation.

ExecOpenScanRelation assumed that any relation listed in the ExecRowMark
list has been locked by InitPlan; but this is not true if the rel's
markType is ROW_MARK_COPY, which is possible if it's a foreign table.

In most (possibly all) cases, failure to acquire a lock here isn't really
problematic because the parser, planner, or plancache would have taken the
appropriate lock already.  In principle though it might leave us vulnerable
to working with a relation that we hold no lock on, and in any case if the
executor isn't depending on previously-taken locks otherwise then it should
not do so for ROW_MARK_COPY relations.

Noted by Etsuro Fujita.  Back-patch to all active versions, since the
inconsistency has been there a long time.  (It's almost certainly
irrelevant in 9.0, since that predates foreign tables, but the code's
still wrong on its own terms.)
parent e5f455f5
...@@ -817,6 +817,10 @@ InitPlan(QueryDesc *queryDesc, int eflags) ...@@ -817,6 +817,10 @@ InitPlan(QueryDesc *queryDesc, int eflags)
/* get relation's OID (will produce InvalidOid if subquery) */ /* get relation's OID (will produce InvalidOid if subquery) */
relid = getrelid(rc->rti, rangeTable); relid = getrelid(rc->rti, rangeTable);
/*
* If you change the conditions under which rel locks are acquired
* here, be sure to adjust ExecOpenScanRelation to match.
*/
switch (rc->markType) switch (rc->markType)
{ {
case ROW_MARK_EXCLUSIVE: case ROW_MARK_EXCLUSIVE:
......
...@@ -820,7 +820,9 @@ ExecOpenScanRelation(EState *estate, Index scanrelid, int eflags) ...@@ -820,7 +820,9 @@ ExecOpenScanRelation(EState *estate, Index scanrelid, int eflags)
{ {
ExecRowMark *erm = lfirst(l); ExecRowMark *erm = lfirst(l);
if (erm->rti == scanrelid) /* Keep this check in sync with InitPlan! */
if (erm->rti == scanrelid &&
erm->relation != NULL)
{ {
lockmode = NoLock; lockmode = NoLock;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment