diff options
Diffstat (limited to 'src/backend/optimizer/path/indxpath.c')
| -rw-r--r-- | src/backend/optimizer/path/indxpath.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index d46876ec0c9..42cbade63ad 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.36 1999/02/03 20:15:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.37 1999/02/03 21:16:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -238,8 +238,7 @@ match_index_orclauses(RelOptInfo * rel, * each of its subclauses. The list is generated by adding * 'index' to the existing list where appropriate. */ - restrictinfo->indexids = - match_index_orclause(rel, index, indexkey, + restrictinfo->indexids = match_index_orclause(rel, index, indexkey, xclass, restrictinfo->clause->args, restrictinfo->indexids); @@ -649,8 +648,7 @@ match_clause_to_indexkey(RelOptInfo * rel, { restrict_op = oprid(newop); - isIndexable = - (op_class(restrict_op, xclass, index->relam) && + isIndexable = (op_class(restrict_op, xclass, index->relam) && IndexScanableOperand(leftop, indexkey, rel, @@ -670,8 +668,7 @@ match_clause_to_indexkey(RelOptInfo * rel, else if ((leftop && IsA(leftop, Const)) || (leftop && IsA(leftop, Param))) { - restrict_op = - get_commutator(((Oper *) ((Expr *) clause)->oper)->opno); + restrict_op = get_commutator(((Oper *) ((Expr *) clause)->oper)->opno); isIndexable = ((restrict_op != InvalidOid) && op_class(restrict_op, xclass, index->relam) && @@ -703,8 +700,7 @@ match_clause_to_indexkey(RelOptInfo * rel, if (HeapTupleIsValid(newop) && (oprid(newop) != restrict_op)) { - restrict_op = - get_commutator(oprid(newop)); + restrict_op = get_commutator(oprid(newop)); isIndexable = ((restrict_op != InvalidOid) && op_class(restrict_op, xclass, index->relam) && @@ -1201,8 +1197,7 @@ indexable_joinclauses(RelOptInfo * rel, RelOptInfo * index, if (joininfo->jinfo_restrictinfo == NIL) continue; - clausegroups = - group_clauses_by_ikey_for_joins(rel, + clausegroups = group_clauses_by_ikey_for_joins(rel, index, index->indexkeys, index->classlist, @@ -1213,8 +1208,7 @@ indexable_joinclauses(RelOptInfo * rel, RelOptInfo * index, { List *clauses = lfirst(clausegroups); - ((RestrictInfo *) lfirst(clauses))->cinfojoinid = - joininfo->otherrels; + ((RestrictInfo *) lfirst(clauses))->cinfojoinid = joininfo->otherrels; } cg_list = nconc(cg_list, clausegroups); } @@ -1306,8 +1300,7 @@ index_innerjoin(Query *root, RelOptInfo * rel, List *clausegroup_list, pathnode->path.joinid = ((RestrictInfo *) lfirst(clausegroup))->cinfojoinid; - pathnode->path.path_cost = - cost_index((Oid) lfirsti(index->relids), + pathnode->path.path_cost = cost_index((Oid) lfirsti(index->relids), (int) temp_pages, temp_selec, rel->pages, @@ -1320,16 +1313,14 @@ index_innerjoin(Query *root, RelOptInfo * rel, List *clausegroup_list, * copy restrictinfo list into path for expensive function * processing -- JMH, 7/7/92 */ - pathnode->path.loc_restrictinfo = - set_difference(copyObject((Node *) rel->restrictinfo), + pathnode->path.loc_restrictinfo = set_difference(copyObject((Node *) rel->restrictinfo), clausegroup); #if 0 /* fix xfunc */ /* add in cost for expensive functions! -- JMH, 7/7/92 */ if (XfuncMode != XFUNC_OFF) { - ((Path *) pathnode)->path_cost += - xfunc_get_path_cost((Path *) pathnode); + ((Path *) pathnode)->path_cost += xfunc_get_path_cost((Path *) pathnode); } #endif cg_list = lappend(cg_list, pathnode); |