cleanups.

bmomjian · bmomjian · commit 111b80ce0092 · 1998-08-09T04:17:38.000Z
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
@@ -7,7 +7,7 @@
  *
  *
  * 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)
 Cost
 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);
 	else if (not_clause(clause))
 	{
@@ -179,13 +179,11 @@ compute_clause_selec(Query *root, Node *clause, List *or_selectivities)
 		 * Both 'or' and 'and' clauses are evaluated as described in
 		 * (compute_selec).
 		 */
-		return (compute_selec(root,
-							  ((Expr *) clause)->args, or_selectivities));
+		return (compute_selec(root, ((Expr *) clause)->args, or_selectivities));
 	}
 	else
 	{
-		return (compute_selec(root,
-							  lcons(clause, NIL), or_selectivities));
+		return (compute_selec(root, lcons(clause, NIL), or_selectivities));
 	}
 }
 
diff --git 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.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)
 		else
 		{
 			clauseinfo->selectivity =
-				compute_clause_selec(root, (Node *) clause,
-									 NIL);
+				compute_clause_selec(root, (Node *) clause, NIL);
 		}
 		rel->clauseinfo = lcons(clauseinfo,
 								rel->clauseinfo);

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.10 1998/08/01 22:12:11 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.11 1998/08/09 04:17:37 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -159,7 +159,7 @@ set_rest_selec(Query root, List clauseinfo_list)`
`159`	`159`	`Cost`
`160`	`160`	`compute_clause_selec(Query root, Node clause, List *or_selectivities)`
`161`	`161`	`{`
`162`		`- if (is_opclause (clause))`
	`162`	`+ if (is_opclause(clause))`
`163`	`163`	`return compute_selec(root, lcons(clause,NIL), or_selectivities);`
`164`	`164`	`else if (not_clause(clause))`
`165`	`165`	`{`
`@@ -179,13 +179,11 @@ compute_clause_selec(Query root, Node clause, List *or_selectivities)`
`179`	`179`	`* Both 'or' and 'and' clauses are evaluated as described in`
`180`	`180`	`* (compute_selec).`
`181`	`181`	`*/`
`182`		`- return (compute_selec(root,`
`183`		`- ((Expr *) clause)->args, or_selectivities));`
	`182`	`+ return (compute_selec(root, ((Expr *) clause)->args, or_selectivities));`
`184`	`183`	`}`
`185`	`184`	`else`
`186`	`185`	`{`
`187`		`- return (compute_selec(root,`
`188`		`- lcons(clause, NIL), or_selectivities));`
	`186`	`+ return (compute_selec(root, lcons(clause, NIL), or_selectivities));`
`189`	`187`	`}`
`190`	`188`	`}`
`191`	`189`