diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 4465f00..3304edb 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -836,7 +836,8 @@ subquery_planner(PlannerGlobal *glob, Query *parse, */ if (rte->lateral && root->hasJoinRTEs) rte->subquery = (Query *) - flatten_join_alias_vars(root, (Node *) rte->subquery); + flatten_join_alias_vars(root->parse, + (Node *) rte->subquery); } else if (rte->rtekind == RTE_FUNCTION) { @@ -1033,7 +1034,7 @@ preprocess_expression(PlannerInfo *root, Node *expr, int kind) kind == EXPRKIND_VALUES || kind == EXPRKIND_TABLESAMPLE || kind == EXPRKIND_TABLEFUNC)) - expr = flatten_join_alias_vars(root, expr); + expr = flatten_join_alias_vars(root->parse, expr); /* * Simplify constant expressions. diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c index 3bef60a..1f993d4 100644 --- a/src/backend/optimizer/prep/prepjointree.c +++ b/src/backend/optimizer/prep/prepjointree.c @@ -986,7 +986,7 @@ pull_up_simple_subquery(PlannerInfo *root, Node *jtnode, RangeTblEntry *rte, * maybe even in the rewriter; but for now let's just fix this case here.) */ subquery->targetList = (List *) - flatten_join_alias_vars(subroot, (Node *) subquery->targetList); + flatten_join_alias_vars(subroot->parse, (Node *) subquery->targetList); /* * Adjust level-0 varnos in subquery so that we can append its rangetable @@ -3031,11 +3031,11 @@ get_relids_in_jointree(Node *jtnode, bool include_joins) * get_relids_for_join: get set of base RT indexes making up a join */ Relids -get_relids_for_join(PlannerInfo *root, int joinrelid) +get_relids_for_join(Query *query, int joinrelid) { Node *jtnode; - jtnode = find_jointree_node_for_rel((Node *) root->parse->jointree, + jtnode = find_jointree_node_for_rel((Node *) query->jointree, joinrelid); if (!jtnode) elog(ERROR, "could not find join node %d", joinrelid); diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c index 48175b7..5116d7f 100644 --- a/src/backend/optimizer/util/var.c +++ b/src/backend/optimizer/util/var.c @@ -60,7 +60,7 @@ typedef struct typedef struct { - PlannerInfo *root; + Query *query; /* outer Query */ int sublevels_up; bool possible_sublink; /* could aliases include a SubLink? */ bool inserted_sublink; /* have we inserted a SubLink? */ @@ -78,7 +78,7 @@ static bool pull_var_clause_walker(Node *node, pull_var_clause_context *context); static Node *flatten_join_alias_vars_mutator(Node *node, flatten_join_alias_vars_context *context); -static Relids alias_relid_set(PlannerInfo *root, Relids relids); +static Relids alias_relid_set(Query *query, Relids relids); /* @@ -667,16 +667,16 @@ pull_var_clause_walker(Node *node, pull_var_clause_context *context) * subqueries). */ Node * -flatten_join_alias_vars(PlannerInfo *root, Node *node) +flatten_join_alias_vars(Query *query, Node *node) { flatten_join_alias_vars_context context; - context.root = root; + context.query = query; context.sublevels_up = 0; /* flag whether join aliases could possibly contain SubLinks */ - context.possible_sublink = root->parse->hasSubLinks; + context.possible_sublink = query->hasSubLinks; /* if hasSubLinks is already true, no need to work hard */ - context.inserted_sublink = root->parse->hasSubLinks; + context.inserted_sublink = query->hasSubLinks; return flatten_join_alias_vars_mutator(node, &context); } @@ -696,7 +696,7 @@ flatten_join_alias_vars_mutator(Node *node, /* No change unless Var belongs to a JOIN of the target level */ if (var->varlevelsup != context->sublevels_up) return node; /* no need to copy, really */ - rte = rt_fetch(var->varno, context->root->parse->rtable); + rte = rt_fetch(var->varno, context->query->rtable); if (rte->rtekind != RTE_JOIN) return node; if (var->varattno == InvalidAttrNumber) @@ -783,7 +783,7 @@ flatten_join_alias_vars_mutator(Node *node, /* now fix PlaceHolderVar's relid sets */ if (phv->phlevelsup == context->sublevels_up) { - phv->phrels = alias_relid_set(context->root, + phv->phrels = alias_relid_set(context->query, phv->phrels); } return (Node *) phv; @@ -823,7 +823,7 @@ flatten_join_alias_vars_mutator(Node *node, * underlying base relids */ static Relids -alias_relid_set(PlannerInfo *root, Relids relids) +alias_relid_set(Query *query, Relids relids) { Relids result = NULL; int rtindex; @@ -831,10 +831,10 @@ alias_relid_set(PlannerInfo *root, Relids relids) rtindex = -1; while ((rtindex = bms_next_member(relids, rtindex)) >= 0) { - RangeTblEntry *rte = rt_fetch(rtindex, root->parse->rtable); + RangeTblEntry *rte = rt_fetch(rtindex, query->rtable); if (rte->rtekind == RTE_JOIN) - result = bms_join(result, get_relids_for_join(root, rtindex)); + result = bms_join(result, get_relids_for_join(query, rtindex)); else result = bms_add_member(result, rtindex); } diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index 8ed3816..5b73378 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -43,7 +43,7 @@ typedef struct { ParseState *pstate; Query *qry; - PlannerInfo *root; + bool hasJoinRTEs; List *groupClauses; List *groupClauseCommonVars; bool have_non_var_grouping; @@ -65,7 +65,7 @@ static void check_ungrouped_columns(Node *node, ParseState *pstate, Query *qry, static bool check_ungrouped_columns_walker(Node *node, check_ungrouped_columns_context *context); static void finalize_grouping_exprs(Node *node, ParseState *pstate, Query *qry, - List *groupClauses, PlannerInfo *root, + List *groupClauses, bool hasJoinRTEs, bool have_non_var_grouping); static bool finalize_grouping_exprs_walker(Node *node, check_ungrouped_columns_context *context); @@ -1039,7 +1039,6 @@ parseCheckAggregates(ParseState *pstate, Query *qry) ListCell *l; bool hasJoinRTEs; bool hasSelfRefRTEs; - PlannerInfo *root = NULL; Node *clause; /* This should only be called if we found aggregates or grouping */ @@ -1130,20 +1129,11 @@ parseCheckAggregates(ParseState *pstate, Query *qry) * If there are join alias vars involved, we have to flatten them to the * underlying vars, so that aliased and unaliased vars will be correctly * taken as equal. We can skip the expense of doing this if no rangetable - * entries are RTE_JOIN kind. We use the planner's flatten_join_alias_vars - * routine to do the flattening; it wants a PlannerInfo root node, which - * fortunately can be mostly dummy. + * entries are RTE_JOIN kind. */ if (hasJoinRTEs) - { - root = makeNode(PlannerInfo); - root->parse = qry; - root->planner_cxt = CurrentMemoryContext; - root->hasJoinRTEs = true; - - groupClauses = (List *) flatten_join_alias_vars(root, + groupClauses = (List *) flatten_join_alias_vars(qry, (Node *) groupClauses); - } /* * Detect whether any of the grouping expressions aren't simple Vars; if @@ -1183,10 +1173,10 @@ parseCheckAggregates(ParseState *pstate, Query *qry) */ clause = (Node *) qry->targetList; finalize_grouping_exprs(clause, pstate, qry, - groupClauses, root, + groupClauses, hasJoinRTEs, have_non_var_grouping); if (hasJoinRTEs) - clause = flatten_join_alias_vars(root, clause); + clause = flatten_join_alias_vars(qry, clause); check_ungrouped_columns(clause, pstate, qry, groupClauses, groupClauseCommonVars, have_non_var_grouping, @@ -1194,10 +1184,10 @@ parseCheckAggregates(ParseState *pstate, Query *qry) clause = (Node *) qry->havingQual; finalize_grouping_exprs(clause, pstate, qry, - groupClauses, root, + groupClauses, hasJoinRTEs, have_non_var_grouping); if (hasJoinRTEs) - clause = flatten_join_alias_vars(root, clause); + clause = flatten_join_alias_vars(qry, clause); check_ungrouped_columns(clause, pstate, qry, groupClauses, groupClauseCommonVars, have_non_var_grouping, @@ -1245,7 +1235,7 @@ check_ungrouped_columns(Node *node, ParseState *pstate, Query *qry, context.pstate = pstate; context.qry = qry; - context.root = NULL; + context.hasJoinRTEs = false; /* assume caller flattened join Vars */ context.groupClauses = groupClauses; context.groupClauseCommonVars = groupClauseCommonVars; context.have_non_var_grouping = have_non_var_grouping; @@ -1445,14 +1435,14 @@ check_ungrouped_columns_walker(Node *node, */ static void finalize_grouping_exprs(Node *node, ParseState *pstate, Query *qry, - List *groupClauses, PlannerInfo *root, + List *groupClauses, bool hasJoinRTEs, bool have_non_var_grouping) { check_ungrouped_columns_context context; context.pstate = pstate; context.qry = qry; - context.root = root; + context.hasJoinRTEs = hasJoinRTEs; context.groupClauses = groupClauses; context.groupClauseCommonVars = NIL; context.have_non_var_grouping = have_non_var_grouping; @@ -1525,8 +1515,8 @@ finalize_grouping_exprs_walker(Node *node, Node *expr = lfirst(lc); Index ref = 0; - if (context->root) - expr = flatten_join_alias_vars(context->root, expr); + if (context->hasJoinRTEs) + expr = flatten_join_alias_vars(context->qry, expr); /* * Each expression must match a grouping entry at the current diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index 62d45dd..3ad8dcb 100644 --- a/src/include/optimizer/prep.h +++ b/src/include/optimizer/prep.h @@ -27,7 +27,7 @@ extern void pull_up_subqueries(PlannerInfo *root); extern void flatten_simple_union_all(PlannerInfo *root); extern void reduce_outer_joins(PlannerInfo *root); extern Relids get_relids_in_jointree(Node *jtnode, bool include_joins); -extern Relids get_relids_for_join(PlannerInfo *root, int joinrelid); +extern Relids get_relids_for_join(Query *query, int joinrelid); /* * prototypes for prepqual.c diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h index a0c1387..f975074 100644 --- a/src/include/optimizer/var.h +++ b/src/include/optimizer/var.h @@ -35,6 +35,6 @@ extern bool contain_var_clause(Node *node); extern bool contain_vars_of_level(Node *node, int levelsup); extern int locate_var_of_level(Node *node, int levelsup); extern List *pull_var_clause(Node *node, int flags); -extern Node *flatten_join_alias_vars(PlannerInfo *root, Node *node); +extern Node *flatten_join_alias_vars(Query *query, Node *node); #endif /* VAR_H */