diff options
Diffstat (limited to 'contrib/postgres_fdw')
| -rw-r--r-- | contrib/postgres_fdw/deparse.c | 16 | ||||
| -rw-r--r-- | contrib/postgres_fdw/postgres_fdw.c | 22 | ||||
| -rw-r--r-- | contrib/postgres_fdw/postgres_fdw.h | 4 |
3 files changed, 21 insertions, 21 deletions
diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c index 1d5aa837635..482a3dd3016 100644 --- a/contrib/postgres_fdw/deparse.c +++ b/contrib/postgres_fdw/deparse.c @@ -171,8 +171,8 @@ static void deparseFromExprForRel(StringInfo buf, PlannerInfo *root, RelOptInfo *joinrel, bool use_alias, List **params_list); static void deparseFromExpr(List *quals, deparse_expr_cxt *context); static void deparseRangeTblRef(StringInfo buf, PlannerInfo *root, - RelOptInfo *foreignrel, bool make_subquery, - List **params_list); + RelOptInfo *foreignrel, bool make_subquery, + List **params_list); static void deparseAggref(Aggref *node, deparse_expr_cxt *context); static void appendGroupByClause(List *tlist, deparse_expr_cxt *context); static void appendAggOrderBy(List *orderList, List *targetList, @@ -185,9 +185,9 @@ static Node *deparseSortGroupClause(Index ref, List *tlist, * Helper functions */ static bool is_subquery_var(Var *node, RelOptInfo *foreignrel, - int *relno, int *colno); + int *relno, int *colno); static void get_relation_column_alias_ids(Var *node, RelOptInfo *foreignrel, - int *relno, int *colno); + int *relno, int *colno); /* @@ -1017,8 +1017,8 @@ deparseSelectSql(List *tlist, bool is_subquery, List **retrieved_attrs, { /* * For a relation that is deparsed as a subquery, emit expressions - * specified in the relation's reltarget. Note that since this is - * for the subquery, no need to care about *retrieved_attrs. + * specified in the relation's reltarget. Note that since this is for + * the subquery, no need to care about *retrieved_attrs. */ deparseSubqueryTargetList(context); } @@ -2189,8 +2189,8 @@ deparseVar(Var *node, deparse_expr_cxt *context) /* * If the Var belongs to the foreign relation that is deparsed as a - * subquery, use the relation and column alias to the Var provided - * by the subquery, instead of the remote name. + * subquery, use the relation and column alias to the Var provided by the + * subquery, instead of the remote name. */ if (is_subquery_var(node, context->scanrel, &relno, &colno)) { diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index 18b4b01cfa4..080cb0a0742 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -417,8 +417,8 @@ static void add_foreign_grouping_paths(PlannerInfo *root, static void apply_server_options(PgFdwRelationInfo *fpinfo); static void apply_table_options(PgFdwRelationInfo *fpinfo); static void merge_fdw_options(PgFdwRelationInfo *fpinfo, - const PgFdwRelationInfo *fpinfo_o, - const PgFdwRelationInfo *fpinfo_i); + const PgFdwRelationInfo *fpinfo_o, + const PgFdwRelationInfo *fpinfo_i); /* @@ -4170,8 +4170,8 @@ foreign_join_ok(PlannerInfo *root, RelOptInfo *joinrel, JoinType jointype, fpinfo->jointype = jointype; /* - * By default, both the input relations are not required to be deparsed - * as subqueries, but there might be some relations covered by the input + * By default, both the input relations are not required to be deparsed as + * subqueries, but there might be some relations covered by the input * relations that are required to be deparsed as subqueries, so save the * relids of those relations for later use by the deparser. */ @@ -4227,8 +4227,8 @@ foreign_join_ok(PlannerInfo *root, RelOptInfo *joinrel, JoinType jointype, case JOIN_FULL: /* - * In this case, if any of the input relations has conditions, - * we need to deparse that relation as a subquery so that the + * In this case, if any of the input relations has conditions, we + * need to deparse that relation as a subquery so that the * conditions can be evaluated before the join. Remember it in * the fpinfo of this relation so that the deparser can take * appropriate action. Also, save the relids of base relations @@ -4305,7 +4305,7 @@ foreign_join_ok(PlannerInfo *root, RelOptInfo *joinrel, JoinType jointype, * Note that since this joinrel is at the end of the join_rel_list list * when we are called, we can get the position by list_length. */ - Assert(fpinfo->relation_index == 0); /* shouldn't be set yet */ + Assert(fpinfo->relation_index == 0); /* shouldn't be set yet */ fpinfo->relation_index = list_length(root->parse->rtable) + list_length(root->join_rel_list); @@ -4354,7 +4354,7 @@ add_paths_with_pathkeys_for_rel(PlannerInfo *root, RelOptInfo *rel, static void apply_server_options(PgFdwRelationInfo *fpinfo) { - ListCell *lc; + ListCell *lc; foreach(lc, fpinfo->server->options) { @@ -4382,7 +4382,7 @@ apply_server_options(PgFdwRelationInfo *fpinfo) static void apply_table_options(PgFdwRelationInfo *fpinfo) { - ListCell *lc; + ListCell *lc; foreach(lc, fpinfo->table->options) { @@ -4439,7 +4439,7 @@ merge_fdw_options(PgFdwRelationInfo *fpinfo, * best. */ fpinfo->use_remote_estimate = fpinfo_o->use_remote_estimate || - fpinfo_i->use_remote_estimate; + fpinfo_i->use_remote_estimate; /* * Set fetch size to maximum of the joining sides, since we are @@ -4869,7 +4869,7 @@ add_foreign_grouping_paths(PlannerInfo *root, RelOptInfo *input_rel, fpinfo->table = ifpinfo->table; fpinfo->server = ifpinfo->server; fpinfo->user = ifpinfo->user; - merge_fdw_options(fpinfo, ifpinfo , NULL); + merge_fdw_options(fpinfo, ifpinfo, NULL); /* Assess if it is safe to push down aggregation and grouping. */ if (!foreign_grouping_ok(root, grouped_rel)) diff --git a/contrib/postgres_fdw/postgres_fdw.h b/contrib/postgres_fdw/postgres_fdw.h index 2bae799ccfe..25c950dd768 100644 --- a/contrib/postgres_fdw/postgres_fdw.h +++ b/contrib/postgres_fdw/postgres_fdw.h @@ -96,9 +96,9 @@ typedef struct PgFdwRelationInfo List *grouped_tlist; /* Subquery information */ - bool make_outerrel_subquery; /* do we deparse outerrel as a + bool make_outerrel_subquery; /* do we deparse outerrel as a * subquery? */ - bool make_innerrel_subquery; /* do we deparse innerrel as a + bool make_innerrel_subquery; /* do we deparse innerrel as a * subquery? */ Relids lower_subquery_rels; /* all relids appearing in lower * subqueries */ |