From 537ef6c3889754aa9566cae21421371c345143d7 Mon Sep 17 00:00:00 2001 From: Tomas Vondra Date: Tue, 28 Apr 2015 19:56:33 +0200 Subject: [PATCH 1/7] teach pull_(varno|varattno)_walker about RestrictInfo otherwise pull_varnos fails when processing OR clauses --- src/backend/optimizer/util/var.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c index 32038ce..141a491 100644 --- a/src/backend/optimizer/util/var.c +++ b/src/backend/optimizer/util/var.c @@ -197,6 +197,13 @@ pull_varnos_walker(Node *node, pull_varnos_context *context) context->sublevels_up--; return result; } + if (IsA(node, RestrictInfo)) + { + RestrictInfo *rinfo = (RestrictInfo*)node; + context->varnos = bms_add_members(context->varnos, + rinfo->clause_relids); + return false; + } return expression_tree_walker(node, pull_varnos_walker, (void *) context); } @@ -245,6 +252,15 @@ pull_varattnos_walker(Node *node, pull_varattnos_context *context) return false; } + if (IsA(node, RestrictInfo)) + { + RestrictInfo *rinfo = (RestrictInfo *)node; + + return expression_tree_walker((Node*)rinfo->clause, + pull_varattnos_walker, + (void*) context); + } + /* Should not find an unplanned subquery */ Assert(!IsA(node, Query)); -- 2.1.0