aboutsummaryrefslogtreecommitdiff
path: root/contrib/postgres_fdw/postgres_fdw.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2017-04-25 10:01:59 -0400
committerPeter Eisentraut <peter_e@gmx.net>2017-04-26 09:14:21 -0400
commit86e640a6941b956d05c0380b754a92050f06bf43 (patch)
treec749e9340fa854cb53c3bf3b3d543c10bffb2c7e /contrib/postgres_fdw/postgres_fdw.c
parente615605239f6df491cd171ed6890b8c70566ef75 (diff)
downloadpostgresql-86e640a6941b956d05c0380b754a92050f06bf43.tar.gz
postgresql-86e640a6941b956d05c0380b754a92050f06bf43.zip
postgres_fdw: Fix join push down with extensions
Objects in an extension are shippable to a foreign server if the extension is part of the foreign server definition's shippable extensions list. But this was not properly considered in some cases when checking whether a join condition can be pushed to a foreign server and the join condition uses an object from a shippable extension. So the join would never be pushed down in those cases. So, the list of extensions needs to be made available in fpinfo of the relation being considered to be pushed down before any expressions are assessed for being shippable. Fix foreign_join_ok() to do that for a join relation. David Rowley and Ashutosh Bapat, per report from David Rowley reduced version of patch 332bec1e6096679b04ec9717beb44a858495260f for backpatch to 9.6, first release with join push down
Diffstat (limited to 'contrib/postgres_fdw/postgres_fdw.c')
-rw-r--r--contrib/postgres_fdw/postgres_fdw.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index 856798ee720..88fac15a5ce 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -3990,6 +3990,15 @@ foreign_join_ok(PlannerInfo *root, RelOptInfo *joinrel, JoinType jointype,
joinclauses = NIL;
}
+ /* Get foreign server */
+ fpinfo->server = fpinfo_o->server;
+
+ /*
+ * Copy shippable_extensions before checking whether the foreign join is
+ * OK, so that we know which quals can be evaluated on the foreign server.
+ */
+ fpinfo->shippable_extensions = fpinfo_o->shippable_extensions;
+
/* Join quals must be safe to push down. */
foreach(lc, joinclauses)
{
@@ -4133,9 +4142,6 @@ foreign_join_ok(PlannerInfo *root, RelOptInfo *joinrel, JoinType jointype,
else
fpinfo->user = NULL;
- /* Get foreign server */
- fpinfo->server = fpinfo_o->server;
-
/*
* Since both the joining relations come from the same server, the server
* level options should have same value for both the relations. Pick from