Cleanups of optimizer.

bmomjian · bmomjian · commit 956b91a9440a · 1998-08-10T04:49:39.000Z
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.20 1998/08/10 02:26:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.21 1998/08/10 04:49:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -117,12 +117,11 @@ find_rel_paths(Query *root, List *rels)
 
 		sequential_scan_list = lcons(create_seqscan_path(rel), NIL);
 
-		rel_index_scan_list =
-			find_index_paths(root,
-							 rel,
-							 find_relation_indices(root, rel),
-							 rel->clauseinfo,
-							 rel->joininfo);
+		rel_index_scan_list = find_index_paths(root,
+											 rel,
+											 find_relation_indices(root, rel),
+											 rel->clauseinfo,
+											 rel->joininfo);
 
 		or_index_scan_list = create_or_index_paths(root, rel, rel->clauseinfo);
 
diff --git 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.26 1998/08/10 02:26:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.27 1998/08/10 04:49:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -602,20 +602,18 @@ match_clause_to_indexkey(RelOptInfo *rel,
 	 */
 	if (!join)
 	{
-
 		/*
 		 * Check for standard s-argable clause
 		 */
 		if ((rightop && IsA(rightop, Const)) ||
 			(rightop && IsA(rightop, Param)))
 		{
 			restrict_op = ((Oper *) ((Expr *) clause)->oper)->opno;
-			isIndexable =
-				(op_class(restrict_op, xclass, index->relam) &&
-				 IndexScanableOperand(leftop,
-									  indexkey,
-									  rel,
-									  index));
+			isIndexable = (op_class(restrict_op, xclass, index->relam) &&
+				 			IndexScanableOperand(leftop,
+												  indexkey,
+												  rel,
+												  index));
 		}
 
 		/*
diff --git 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.25 1998/08/10 02:26:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.26 1998/08/10 04:49:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -276,6 +276,7 @@ subplanner(Query *root,
 	 * the exhaustive path search.
 	 */
 	init_join_info(root->base_rel_list);
+
 	final_rel_list = find_paths(root, root->base_rel_list);
 
 	if (final_rel_list)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.26 1998/08/10 02:26:22 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.27 1998/08/10 04:49:37 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -602,20 +602,18 @@ match_clause_to_indexkey(RelOptInfo *rel,`
`602`	`602`	`*/`
`603`	`603`	`if (!join)`
`604`	`604`	`{`
`605`		`-`
`606`	`605`	`/*`
`607`	`606`	`* Check for standard s-argable clause`
`608`	`607`	`*/`
`609`	`608`	`if ((rightop && IsA(rightop, Const)) \|\|`
`610`	`609`	`(rightop && IsA(rightop, Param)))`
`611`	`610`	`{`
`612`	`611`	`restrict_op = ((Oper ) ((Expr ) clause)->oper)->opno;`
`613`		`- isIndexable =`
`614`		`- (op_class(restrict_op, xclass, index->relam) &&`
`615`		`- IndexScanableOperand(leftop,`
`616`		`- indexkey,`
`617`		`- rel,`
`618`		`- index));`
	`612`	`+ isIndexable = (op_class(restrict_op, xclass, index->relam) &&`
	`613`	`+ IndexScanableOperand(leftop,`
	`614`	`+ indexkey,`
	`615`	`+ rel,`
	`616`	`+ index));`
`619`	`617`	`}`
`620`	`618`
`621`	`619`	`/*`
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/plan/planmain.c,v 1.25 1998/08/10 02:26:28 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.26 1998/08/10 04:49:39 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -276,6 +276,7 @@ subplanner(Query *root,`
`276`	`276`	`* the exhaustive path search.`
`277`	`277`	`*/`
`278`	`278`	`init_join_info(root->base_rel_list);`
	`279`	`+`
`279`	`280`	`final_rel_list = find_paths(root, root->base_rel_list);`
`280`	`281`
`281`	`282`	`if (final_rel_list)`