aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2019-02-20 20:53:08 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2019-02-20 20:53:17 -0500
commitfa86238f1eac5b1bfb3887d2deb138f53da82c9b (patch)
tree03f783a84587332ebffba69d556d366e344e137c
parentd26a810ebf9e419556a60bdc0a4190883c38f4c4 (diff)
downloadpostgresql-fa86238f1eac5b1bfb3887d2deb138f53da82c9b.tar.gz
postgresql-fa86238f1eac5b1bfb3887d2deb138f53da82c9b.zip
Speed up match_eclasses_to_foreign_key_col() when there are many ECs.
Check ec_relids before bothering to iterate through the EC members. On a perhaps extreme, but still real-world, query in which match_eclasses_to_foreign_key_col() accounts for the bulk of the planner's runtime, this saves nearly 40% of the runtime. It's a bit of a stopgap fix, but it's simple enough to be back-patched to 9.6 where this code came in; so let's do that. David Rowley Discussion: https://postgr.es/m/6970.1545327857@sss.pgh.pa.us
-rw-r--r--src/backend/optimizer/path/equivclass.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c
index 23792508b7b..61b5b119b00 100644
--- a/src/backend/optimizer/path/equivclass.c
+++ b/src/backend/optimizer/path/equivclass.c
@@ -2052,6 +2052,14 @@ match_eclasses_to_foreign_key_col(PlannerInfo *root,
continue;
/* Note: it seems okay to match to "broken" eclasses here */
+ /*
+ * If eclass visibly doesn't have members for both rels, there's no
+ * need to grovel through the members.
+ */
+ if (!bms_is_member(var1varno, ec->ec_relids) ||
+ !bms_is_member(var2varno, ec->ec_relids))
+ continue;
+
foreach(lc2, ec->ec_members)
{
EquivalenceMember *em = (EquivalenceMember *) lfirst(lc2);