diff options
Diffstat (limited to 'src/backend/optimizer/plan')
| -rw-r--r-- | src/backend/optimizer/plan/createplan.c | 60 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/initsplan.c | 22 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/planmain.c | 14 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/planner.c | 12 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/setrefs.c | 26 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/subselect.c | 58 |
6 files changed, 96 insertions, 96 deletions
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 54b1cb63354..5011d0b2487 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.30 1998/08/04 16:44:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.31 1998/09/01 03:23:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -154,7 +154,7 @@ create_plan(Path *best_path) } #endif - return (plan_node); + return plan_node; } /* @@ -281,7 +281,7 @@ create_join_node(JoinPath *best_path, List *tlist) (get_locclauseinfo(best_path))))); #endif - return (retval); + return retval; } /***************************************************************************** @@ -316,7 +316,7 @@ create_seqscan_node(Path *best_path, List *tlist, List *scan_clauses) scan_node->plan.cost = best_path->path_cost; - return (scan_node); + return scan_node; } /* @@ -342,7 +342,7 @@ create_indexscan_node(IndexPath *best_path, IndexScan *scan_node = (IndexScan *) NULL; bool lossy = FALSE; HeapTuple indexTuple; - IndexTupleForm index; + Form_pg_index index; /* * If an 'or' clause is to be used with this index, the indxqual field @@ -377,7 +377,7 @@ create_indexscan_node(IndexPath *best_path, if (!HeapTupleIsValid(indexTuple)) elog(ERROR, "create_plan: index %d not found", lfirsti(ixid)); - index = (IndexTupleForm) GETSTRUCT(indexTuple); + index = (Form_pg_index) GETSTRUCT(indexTuple); if (index->indislossy) lossy = TRUE; } @@ -418,7 +418,7 @@ create_indexscan_node(IndexPath *best_path, fixed_indxqual, best_path->path.path_cost); - return (scan_node); + return scan_node; } /***************************************************************************** @@ -506,7 +506,7 @@ create_nestloop_node(JoinPath *best_path, join_node->join.cost = best_path->path.path_cost; - return (join_node); + return join_node; } static MergeJoin * @@ -595,7 +595,7 @@ create_mergejoin_node(MergePath *best_path, join_node->join.cost = best_path->jpath.path.path_cost; - return (join_node); + return join_node; } /* @@ -650,7 +650,7 @@ create_hashjoin_node(HashPath *best_path, (Plan *) hash_node); join_node->join.cost = best_path->jpath.path.path_cost; - return (join_node); + return join_node; } @@ -684,17 +684,17 @@ fix_indxqual_references(Node *clause, Path *index_path) } newclause = copyObject((Node *) clause); ((Var *) newclause)->varattno = pos + 1; - return (newclause); + return newclause; } else - return (clause); + return clause; } else if (IsA(clause, Const)) - return (clause); + return clause; else if (IsA(clause, Param)) { /* Function parameter used as index scan arg. DZ - 27-8-1996 */ - return (clause); + return clause; } else if (is_opclause(clause) && is_funcclause((Node *) get_leftop((Expr *) clause)) && @@ -743,7 +743,7 @@ fix_indxqual_references(Node *clause, Path *index_path) make_clause(expr->opType, expr->oper, new_subclauses); } else - return (clause); + return clause; } else { @@ -770,7 +770,7 @@ fix_indxqual_references(Node *clause, Path *index_path) if (new_subclauses) return (Node *) new_subclauses; else - return (clause); + return clause; } } @@ -812,7 +812,7 @@ switch_outer(List *clauses) else t_list = lappend(t_list, clause); } - return (t_list); + return t_list; } /* @@ -856,7 +856,7 @@ set_temp_tlist_operators(List *tlist, List *pathkeys, Oid *operators) } keyno += 1; } - return (tlist); + return tlist; } /***************************************************************************** @@ -917,7 +917,7 @@ make_temp(List *tlist, elog(ERROR, "make_temp: unknown temp type %d", temptype); } - return (retval); + return retval; } @@ -939,7 +939,7 @@ make_seqscan(List *qptlist, node->scanrelid = scanrelid; node->scanstate = (CommonScanState *) NULL; - return (node); + return node; } static IndexScan * @@ -964,7 +964,7 @@ make_indexscan(List *qptlist, node->indxqual = indxqual; node->scan.scanstate = (CommonScanState *) NULL; - return (node); + return node; } @@ -986,7 +986,7 @@ make_nestloop(List *qptlist, plan->righttree = righttree; node->nlstate = (NestLoopState *) NULL; - return (node); + return node; } static HashJoin * @@ -1013,7 +1013,7 @@ make_hashjoin(List *tlist, node->hashjointablesize = 0; node->hashdone = false; - return (node); + return node; } static Hash * @@ -1034,7 +1034,7 @@ make_hash(List *tlist, Var *hashkey, Plan *lefttree) node->hashtablekey = 0; node->hashtablesize = 0; - return (node); + return node; } static MergeJoin * @@ -1062,7 +1062,7 @@ make_mergejoin(List *tlist, node->mergerightorder = rightorder; node->mergeleftorder = leftorder; - return (node); + return node; } Sort * @@ -1080,7 +1080,7 @@ make_sort(List *tlist, Oid tempid, Plan *lefttree, int keycount) node->tempid = tempid; node->keycount = keycount; - return (node); + return node; } static Material * @@ -1101,7 +1101,7 @@ make_material(List *tlist, node->tempid = tempid; node->keycount = keycount; - return (node); + return node; } Agg * @@ -1117,7 +1117,7 @@ make_agg(List *tlist, Plan *lefttree) node->plan.righttree = (Plan *) NULL; node->aggs = NIL; - return (node); + return node; } Group * @@ -1139,7 +1139,7 @@ make_group(List *tlist, node->numCols = ngrp; node->grpColIdx = grpColIdx; - return (node); + return node; } /* @@ -1168,7 +1168,7 @@ make_unique(List *tlist, Plan *lefttree, char *uniqueAttr) node->uniqueAttr = NULL; else node->uniqueAttr = pstrdup(uniqueAttr); - return (node); + return node; } #ifdef NOT_USED diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index feb9bff1274..22cfeaf7557 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.18 1998/08/10 02:26:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.19 1998/09/01 03:23:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,7 +40,7 @@ extern int Quiet; static void add_clause_to_rels(Query *root, List *clause); -static void add_join_info_to_rels(Query *root, CInfo *clauseinfo, +static void add_join_info_to_rels(Query *root, ClauseInfo *clauseinfo, List *join_relids); static void add_vars_to_targetlist(Query *root, List *vars, List *join_relids); @@ -170,7 +170,7 @@ add_clause_to_rels(Query *root, List *clause) { List *relids; List *vars; - CInfo *clauseinfo = makeNode(CInfo); + ClauseInfo *clauseinfo = makeNode(ClauseInfo); /* * Retrieve all relids and vars contained within the clause. @@ -252,13 +252,13 @@ add_clause_to_rels(Query *root, List *clause) * */ static void -add_join_info_to_rels(Query *root, CInfo *clauseinfo, List *join_relids) +add_join_info_to_rels(Query *root, ClauseInfo *clauseinfo, List *join_relids) { List *join_relid; foreach(join_relid, join_relids) { - JInfo *joininfo; + JoinInfo *joininfo; List *other_rels = NIL; List *rel; @@ -332,8 +332,8 @@ init_join_info(List *rel_list) *y, *z; RelOptInfo *rel; - JInfo *joininfo; - CInfo *clauseinfo; + JoinInfo *joininfo; + ClauseInfo *clauseinfo; Expr *clause; foreach(x, rel_list) @@ -341,10 +341,10 @@ init_join_info(List *rel_list) rel = (RelOptInfo *) lfirst(x); foreach(y, rel->joininfo) { - joininfo = (JInfo *) lfirst(y); + joininfo = (JoinInfo *) lfirst(y); foreach(z, joininfo->jinfoclauseinfo) { - clauseinfo = (CInfo *) lfirst(z); + clauseinfo = (ClauseInfo *) lfirst(z); clause = clauseinfo->clause; if (is_joinable((Node *) clause)) { @@ -400,10 +400,10 @@ mergejoinop(Expr *clause) morder->right_operator = rightOp; morder->left_type = (get_leftop(clause))->vartype; morder->right_type = (get_rightop(clause))->vartype; - return (morder); + return morder; } else - return (NULL); + return NULL; } /* diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c index 7cbd1879e53..a3e97063a79 100644 --- a/src/backend/optimizer/plan/planmain.c +++ b/src/backend/optimizer/plan/planmain.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.26 1998/08/10 04:49:39 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.27 1998/09/01 03:23:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -112,7 +112,7 @@ query_planner(Query *root, (Plan *) NULL)); } else - return ((Plan *) NULL); + return (Plan *) NULL; } /* @@ -167,12 +167,12 @@ query_planner(Query *root, (Plan *) scan)); } else - return ((Plan *) scan); + return (Plan *) scan; } break; default: - return ((Plan *) NULL); + return (Plan *) NULL; } } @@ -312,11 +312,11 @@ subplanner(Query *root, * it. */ if (final_rel) - return (create_plan((Path *) final_rel->cheapestpath)); + return create_plan((Path *) final_rel->cheapestpath); else { elog(NOTICE, "final relation is nil"); - return (create_plan((Path *) NULL)); + return create_plan((Path *) NULL); } } @@ -344,7 +344,7 @@ make_result(List *tlist, node->resconstantqual = resconstantqual; node->resstate = NULL; - return (node); + return node; } /***************************************************************************** diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 4fe55a7b72d..703e067e4cf 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.30 1998/08/29 04:09:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.31 1998/09/01 03:23:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -79,7 +79,7 @@ planner(Query *parse) } result_plan->nParamExec = length(PlannerParamVar); - return (result_plan); + return result_plan; } /* @@ -298,14 +298,14 @@ union_planner(Query *parse) { Plan *sortplan = make_sortplan(tlist, parse->sortClause, result_plan); - return ((Plan *) make_unique(tlist, sortplan, parse->uniqueFlag)); + return (Plan *) make_unique(tlist, sortplan, parse->uniqueFlag); } else { if (parse->sortClause) - return (make_sortplan(tlist, parse->sortClause, result_plan)); + return make_sortplan(tlist, parse->sortClause, result_plan); else - return ((Plan *) result_plan); + return (Plan *) result_plan; } } @@ -367,7 +367,7 @@ make_sortplan(List *tlist, List *sortcls, Plan *plannode) sortplan->cost = plannode->cost; - return (sortplan); + return sortplan; } /* diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index 4fdde87938a..32f0b8225ff 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.24 1998/07/20 19:53:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.25 1998/09/01 03:23:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -274,7 +274,7 @@ index_outerjoin_references(List *inner_indxqual, } } - return (t_list); + return t_list; } /* @@ -305,14 +305,14 @@ replace_clause_joinvar_refs(Expr *clause, temp = (List *) replace_joinvar_refs((Var *) clause, outer_tlist, inner_tlist); if (temp) - return (temp); + return temp; else if (clause != NULL) - return ((List *) clause); + return (List *) clause; else - return (NIL); + return NIL; } else if (single_node((Node *) clause)) - return ((List *) clause); + return (List *) clause; else if (and_clause((Node *) clause)) { List *andclause = @@ -320,7 +320,7 @@ replace_clause_joinvar_refs(Expr *clause, outer_tlist, inner_tlist); - return ((List *) make_andclause(andclause)); + return (List *) make_andclause(andclause); } else if (or_clause((Node *) clause)) { @@ -329,7 +329,7 @@ replace_clause_joinvar_refs(Expr *clause, outer_tlist, inner_tlist); - return ((List *) make_orclause(orclause)); + return (List *) make_orclause(orclause); } else if (IsA(clause, ArrayRef)) { @@ -355,7 +355,7 @@ replace_clause_joinvar_refs(Expr *clause, * structure 'clause'. */ - return ((List *) clause); + return (List *) clause; } else if (is_funcclause((Node *) clause)) { @@ -374,7 +374,7 @@ replace_clause_joinvar_refs(Expr *clause, outer_tlist, inner_tlist); - return ((List *) make_notclause((Expr *) notclause)); + return (List *) make_notclause((Expr *) notclause); } else if (is_opclause((Node *) clause)) { @@ -401,7 +401,7 @@ replace_clause_joinvar_refs(Expr *clause, replace_subclause_joinvar_refs(((SubPlan *) ((Expr *) clause)->oper)->sublink->oper, outer_tlist, inner_tlist); - return ((List *) clause); + return (List *) clause; } /* shouldn't reach here */ elog(ERROR, "replace_clause_joinvar_refs: unsupported clause %d", @@ -425,7 +425,7 @@ replace_subclause_joinvar_refs(List *clauses, inner_tlist); t_list = lappend(t_list, temp); } - return (t_list); + return t_list; } static Var * @@ -508,7 +508,7 @@ tlist_temp_references(Oid tempid, t_list = lappend(t_list, temp); } - return (t_list); + return t_list; } /*--------------------------------------------------------- diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c index d01cb72383d..61d0df57afa 100644 --- a/src/backend/optimizer/plan/subselect.c +++ b/src/backend/optimizer/plan/subselect.c @@ -58,7 +58,7 @@ _new_param(Var *var, int varlevel) lfirst(last) = makeVar(var->varno, var->varattno, var->vartype, var->vartypmod, varlevel, var->varnoold, var->varoattno); - return (i); + return i; } static Param * @@ -99,7 +99,7 @@ _replace_var(Var *var) retval->paramid = (AttrNumber) i; retval->paramtype = var->vartype; - return (retval); + return retval; } static Node * @@ -239,7 +239,7 @@ _make_subplan(SubLink *slink) result = (Node *) expr; } - return (result); + return result; } @@ -247,11 +247,11 @@ static List * set_unioni(List *l1, List *l2) { if (l1 == NULL) - return (l2); + return l2; if (l2 == NULL) - return (l1); + return l1; - return (nconc(l1, set_differencei(l2, l1))); + return nconc(l1, set_differencei(l2, l1)); } static List * @@ -260,15 +260,15 @@ _finalize_primnode(void *expr, List **subplan) List *result = NULL; if (expr == NULL) - return (NULL); + return NULL; if (IsA(expr, Param)) { if (((Param *) expr)->paramkind == PARAM_EXEC) - return (lconsi(((Param *) expr)->paramid, (List *) NULL)); + return lconsi(((Param *) expr)->paramid, (List *) NULL); } else if (single_node(expr)) - return (NULL); + return NULL; else if (IsA(expr, List)) { List *le; @@ -278,12 +278,12 @@ _finalize_primnode(void *expr, List **subplan) _finalize_primnode(lfirst(le), subplan)); } else if (IsA(expr, Iter)) - return (_finalize_primnode(((Iter *) expr)->iterexpr, subplan)); + return _finalize_primnode(((Iter *) expr)->iterexpr, subplan); else if (or_clause(expr) || and_clause(expr) || is_opclause(expr) || not_clause(expr) || is_funcclause(expr)) - return (_finalize_primnode(((Expr *) expr)->args, subplan)); + return _finalize_primnode(((Expr *) expr)->args, subplan); else if (IsA(expr, Aggreg)) - return (_finalize_primnode(((Aggreg *) expr)->target, subplan)); + return _finalize_primnode(((Aggreg *) expr)->target, subplan); else if (IsA(expr, ArrayRef)) { result = _finalize_primnode(((ArrayRef *) expr)->refupperindexpr, subplan); @@ -295,7 +295,7 @@ _finalize_primnode(void *expr, List **subplan) _finalize_primnode(((ArrayRef *) expr)->refassgnexpr, subplan)); } else if (IsA(expr, TargetEntry)) - return (_finalize_primnode(((TargetEntry *) expr)->expr, subplan)); + return _finalize_primnode(((TargetEntry *) expr)->expr, subplan); else if (is_subplan(expr)) { List *lst; @@ -314,7 +314,7 @@ _finalize_primnode(void *expr, List **subplan) elog(ERROR, "_finalize_primnode: can't handle node %d", nodeTag(expr)); - return (result); + return result; } Node * @@ -322,7 +322,7 @@ SS_replace_correlation_vars(Node *expr) { if (expr == NULL) - return (NULL); + return NULL; if (IsA(expr, List)) { List *le; @@ -344,7 +344,7 @@ SS_replace_correlation_vars(Node *expr) SS_replace_correlation_vars(((Iter *) expr)->iterexpr); } else if (single_node(expr)) - return (expr); + return expr; else if (or_clause(expr) || and_clause(expr) || is_opclause(expr) || not_clause(expr) || is_funcclause(expr)) ((Expr *) expr)->args = (List *) @@ -384,14 +384,14 @@ SS_replace_correlation_vars(Node *expr) elog(NOTICE, "SS_replace_correlation_vars: can't handle node %d", nodeTag(expr)); - return (expr); + return expr; } Node * SS_process_sublinks(Node *expr) { if (expr == NULL) - return (NULL); + return NULL; if (IsA(expr, List)) { List *le; @@ -419,7 +419,7 @@ SS_process_sublinks(Node *expr) expr = _make_subplan((SubLink *) expr); } - return (expr); + return expr; } List * @@ -432,7 +432,7 @@ SS_finalize_plan(Plan *plan) List *lst; if (plan == NULL) - return (NULL); + return NULL; param_list = _finalize_primnode(plan->targetlist, &subPlan); Assert(subPlan == NULL); @@ -489,7 +489,7 @@ SS_finalize_plan(Plan *plan) break; default: elog(ERROR, "SS_finalize_plan: node %d unsupported", nodeTag(plan)); - return (NULL); + return NULL; } param_list = set_unioni(param_list, _finalize_primnode(plan->qual, &subPlan)); @@ -515,7 +515,7 @@ SS_finalize_plan(Plan *plan) plan->locParam = locParam; plan->subPlan = subPlan; - return (param_list); + return param_list; } @@ -527,7 +527,7 @@ SS_pull_subplan(void *expr) List *result = NULL; if (expr == NULL || single_node(expr)) - return (NULL); + return NULL; if (IsA(expr, List)) { @@ -537,12 +537,12 @@ SS_pull_subplan(void *expr) result = nconc(result, SS_pull_subplan(lfirst(le))); } else if (IsA(expr, Iter)) - return (SS_pull_subplan(((Iter *) expr)->iterexpr)); + return SS_pull_subplan(((Iter *) expr)->iterexpr); else if (or_clause(expr) || and_clause(expr) || is_opclause(expr) || not_clause(expr) || is_funcclause(expr)) - return (SS_pull_subplan(((Expr *) expr)->args)); + return SS_pull_subplan(((Expr *) expr)->args); else if (IsA(expr, Aggreg)) - return (SS_pull_subplan(((Aggreg *) expr)->target)); + return SS_pull_subplan(((Aggreg *) expr)->target); else if (IsA(expr, ArrayRef)) { result = SS_pull_subplan(((ArrayRef *) expr)->refupperindexpr); @@ -554,12 +554,12 @@ SS_pull_subplan(void *expr) SS_pull_subplan(((ArrayRef *) expr)->refassgnexpr)); } else if (IsA(expr, TargetEntry)) - return (SS_pull_subplan(((TargetEntry *) expr)->expr)); + return SS_pull_subplan(((TargetEntry *) expr)->expr); else if (is_subplan(expr)) - return (lcons(((Expr *) expr)->oper, NULL)); + return lcons(((Expr *) expr)->oper, NULL); else elog(ERROR, "SS_pull_subplan: can't handle node %d", nodeTag(expr)); - return (result); + return result; } |