mirror of
https://github.com/postgres/postgres.git
synced 2025-11-09 06:21:09 +03:00
Allow FDWs to push down quals without breaking EvalPlanQual rechecks.
This fixes a long-standing bug which was discovered while investigating the interaction between the new join pushdown code and the EvalPlanQual machinery: if a ForeignScan appears on the inner side of a paramaterized nestloop, an EPQ recheck would re-return the original tuple even if it no longer satisfied the pushed-down quals due to changed parameter values. This fix adds a new member to ForeignScan and ForeignScanState and a new argument to make_foreignscan, and requires changes to FDWs which push down quals to populate that new argument with a list of quals they have chosen to push down. Therefore, I'm only back-patching to 9.5, even though the bug is not new in 9.5. Etsuro Fujita, reviewed by me and by Kyotaro Horiguchi.
This commit is contained in:
@@ -2153,6 +2153,9 @@ create_foreignscan_plan(PlannerInfo *root, ForeignPath *best_path,
|
||||
replace_nestloop_params(root, (Node *) scan_plan->scan.plan.qual);
|
||||
scan_plan->fdw_exprs = (List *)
|
||||
replace_nestloop_params(root, (Node *) scan_plan->fdw_exprs);
|
||||
scan_plan->fdw_recheck_quals = (List *)
|
||||
replace_nestloop_params(root,
|
||||
(Node *) scan_plan->fdw_recheck_quals);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -3738,7 +3741,8 @@ make_foreignscan(List *qptlist,
|
||||
Index scanrelid,
|
||||
List *fdw_exprs,
|
||||
List *fdw_private,
|
||||
List *fdw_scan_tlist)
|
||||
List *fdw_scan_tlist,
|
||||
List *fdw_recheck_quals)
|
||||
{
|
||||
ForeignScan *node = makeNode(ForeignScan);
|
||||
Plan *plan = &node->scan.plan;
|
||||
@@ -3754,6 +3758,7 @@ make_foreignscan(List *qptlist,
|
||||
node->fdw_exprs = fdw_exprs;
|
||||
node->fdw_private = fdw_private;
|
||||
node->fdw_scan_tlist = fdw_scan_tlist;
|
||||
node->fdw_recheck_quals = fdw_recheck_quals;
|
||||
/* fs_relids will be filled in by create_foreignscan_plan */
|
||||
node->fs_relids = NULL;
|
||||
/* fsSystemCol will be filled in by create_foreignscan_plan */
|
||||
|
||||
Reference in New Issue
Block a user