Commit 111b80ce authored by Bruce Momjian's avatar Bruce Momjian

cleanups.

parent e6311b4a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.10 1998/08/01 22:12:11 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.11 1998/08/09 04:17:37 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -159,7 +159,7 @@ set_rest_selec(Query *root, List *clauseinfo_list) ...@@ -159,7 +159,7 @@ set_rest_selec(Query *root, List *clauseinfo_list)
Cost Cost
compute_clause_selec(Query *root, Node *clause, List *or_selectivities) compute_clause_selec(Query *root, Node *clause, List *or_selectivities)
{ {
if (is_opclause (clause)) if (is_opclause(clause))
return compute_selec(root, lcons(clause,NIL), or_selectivities); return compute_selec(root, lcons(clause,NIL), or_selectivities);
else if (not_clause(clause)) else if (not_clause(clause))
{ {
...@@ -179,13 +179,11 @@ compute_clause_selec(Query *root, Node *clause, List *or_selectivities) ...@@ -179,13 +179,11 @@ compute_clause_selec(Query *root, Node *clause, List *or_selectivities)
* Both 'or' and 'and' clauses are evaluated as described in * Both 'or' and 'and' clauses are evaluated as described in
* (compute_selec). * (compute_selec).
*/ */
return (compute_selec(root, return (compute_selec(root, ((Expr *) clause)->args, or_selectivities));
((Expr *) clause)->args, or_selectivities));
} }
else else
{ {
return (compute_selec(root, return (compute_selec(root, lcons(clause, NIL), or_selectivities));
lcons(clause, NIL), or_selectivities));
} }
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.15 1998/08/07 05:02:17 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.16 1998/08/09 04:17:38 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -207,8 +207,7 @@ add_clause_to_rels(Query *root, List *clause) ...@@ -207,8 +207,7 @@ add_clause_to_rels(Query *root, List *clause)
else else
{ {
clauseinfo->selectivity = clauseinfo->selectivity =
compute_clause_selec(root, (Node *) clause, compute_clause_selec(root, (Node *) clause, NIL);
NIL);
} }
rel->clauseinfo = lcons(clauseinfo, rel->clauseinfo = lcons(clauseinfo,
rel->clauseinfo); rel->clauseinfo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment