diff options
Diffstat (limited to 'src/backend/executor/nodeForeignscan.c')
| -rw-r--r-- | src/backend/executor/nodeForeignscan.c | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/src/backend/executor/nodeForeignscan.c b/src/backend/executor/nodeForeignscan.c index 41c23f687db..a5b37748904 100644 --- a/src/backend/executor/nodeForeignscan.c +++ b/src/backend/executor/nodeForeignscan.c @@ -55,8 +55,7 @@ ForeignNext(ForeignScanState *node) * direct modifications cannot be re-evaluated, so shouldn't get here * during EvalPlanQual processing */ - if (estate->es_epq_active != NULL) - elog(ERROR, "cannot re-evaluate a Foreign Update or Delete during EvalPlanQual"); + Assert(estate->es_epq_active == NULL); slot = node->fdwroutine->IterateDirectModify(node); } @@ -121,6 +120,15 @@ static TupleTableSlot * ExecForeignScan(PlanState *pstate) { ForeignScanState *node = castNode(ForeignScanState, pstate); + ForeignScan *plan = (ForeignScan *) node->ss.ps.plan; + EState *estate = node->ss.ps.state; + + /* + * Ignore direct modifications when EvalPlanQual is active --- they are + * irrelevant for EvalPlanQual rechecking + */ + if (estate->es_epq_active != NULL && plan->operation != CMD_SELECT) + return NULL; return ExecScan(&node->ss, (ExecScanAccessMtd) ForeignNext, @@ -265,9 +273,12 @@ ExecInitForeignScan(ForeignScan *node, EState *estate, int eflags) { /* * Direct modifications cannot be re-evaluated by EvalPlanQual, so - * don't bother preparing the FDW. There can be ForeignScan nodes in - * the EvalPlanQual subtree, but ExecForeignScan should never be - * called on them when EvalPlanQual is active. + * don't bother preparing the FDW. + * + * In case of an inherited UPDATE/DELETE with foreign targets there + * can be direct-modify ForeignScan nodes in the EvalPlanQual subtree, + * so we need to ignore such ForeignScan nodes during EvalPlanQual + * processing. See also ExecForeignScan/ExecReScanForeignScan. */ if (estate->es_epq_active == NULL) fdwroutine->BeginDirectModify(scanstate, eflags); @@ -321,8 +332,17 @@ ExecEndForeignScan(ForeignScanState *node) void ExecReScanForeignScan(ForeignScanState *node) { + ForeignScan *plan = (ForeignScan *) node->ss.ps.plan; + EState *estate = node->ss.ps.state; PlanState *outerPlan = outerPlanState(node); + /* + * Ignore direct modifications when EvalPlanQual is active --- they are + * irrelevant for EvalPlanQual rechecking + */ + if (estate->es_epq_active != NULL && plan->operation != CMD_SELECT) + return; + node->fdwroutine->ReScanForeignScan(node); /* |