otherrels is now unjoined_rels

Author: bmomjian

src/backend/nodes/copyfuncs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.71 1999/02/15 03:21:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.72 1999/02/15 05:21:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1428,7 +1428,7 @@ _copyJoinInfo(JoinInfo *from)
 	 *	copy remainder of node
 	 * ----------------
 	 */
-	newnode->otherrels = listCopy(from->otherrels);
+	newnode->unjoined_rels = listCopy(from->unjoined_rels);
 	Node_Copy(from, newnode, jinfo_restrictinfo);
 
 	newnode->mergejoinable = from->mergejoinable;

src/backend/nodes/equalfuncs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.33 1999/02/15 03:21:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.34 1999/02/15 05:21:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -526,7 +526,7 @@ _equalJoinInfo(JoinInfo *a, JoinInfo *b)
 {
 	Assert(IsA(a, JoinInfo));
 	Assert(IsA(b, JoinInfo));
-	if (!equal(a->otherrels, b->otherrels))
+	if (!equal(a->unjoined_rels, b->unjoined_rels))
 		return false;
 	if (!equal(a->jinfo_restrictinfo, b->jinfo_restrictinfo))
 		return false;

src/backend/nodes/freefuncs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.11 1999/02/15 03:21:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.12 1999/02/15 05:21:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1024,7 +1024,7 @@ _freeJoinInfo(JoinInfo *node)
 	 *	free remainder of node
 	 * ----------------
 	 */
-	freeList(node->otherrels);
+	freeList(node->unjoined_rels);
 	freeObject(node->jinfo_restrictinfo);
 
 	pfree(node);

src/backend/nodes/outfuncs.c

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *  $Id: outfuncs.c,v 1.73 1999/02/15 03:21:59 momjian Exp $
+ *  $Id: outfuncs.c,v 1.74 1999/02/15 05:21:02 momjian Exp $
  *
  * NOTES
  *	  Every (plan) node in POSTGRES has an associated "out" routine which
@@ -1198,8 +1198,8 @@ _outHashInfo(StringInfo str, HashInfo *node)
 static void
 _outJoinInfo(StringInfo str, JoinInfo *node)
 {
-	appendStringInfo(str, " JINFO :otherrels ");
-	_outIntList(str, node->otherrels);
+	appendStringInfo(str, " JINFO :unjoined_rels ");
+	_outIntList(str, node->unjoined_rels);
 
 	appendStringInfo(str, " :jinfo_restrictinfo ");
 	_outNode(str, node->jinfo_restrictinfo);

src/backend/nodes/readfuncs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.57 1999/02/13 23:16:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.58 1999/02/15 05:21:03 momjian Exp $
  *
  * NOTES
  *	  Most of the read functions for plan nodes are tested. (In fact, they
@@ -1982,8 +1982,8 @@ _readJoinInfo()
 
 	local_node = makeNode(JoinInfo);
 
-	token = lsptok(NULL, &length);		/* get :otherrels */
-	local_node->otherrels = toIntList(nodeRead(true));		/* now read it */
+	token = lsptok(NULL, &length);		/* get :unjoined_rels */
+	local_node->unjoined_rels = toIntList(nodeRead(true));		/* now read it */
 
 	token = lsptok(NULL, &length);		/* get :jinfo_restrictinfo */
 	local_node->jinfo_restrictinfo = nodeRead(true);		/* now read it */

src/backend/optimizer/path/allpaths.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.36 1999/02/15 03:59:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.37 1999/02/15 05:21:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,8 +43,9 @@ bool		_use_geqo_ = false;
 int32		_use_geqo_rels_ = GEQO_RELS;
 
 
-static void find_base_rel_paths(Query *root, List *rels);
-static RelOptInfo *make_one_rel_by_joins(Query *root, List *outer_rels, int levels_needed);
+static void set_base_rel_pathlist(Query *root, List *rels);
+static RelOptInfo *make_one_rel_by_joins(Query *root, List *rels,
+										 int levels_needed);
 
 #ifdef OPTIMIZER_DEBUG
 static void debug_print_rel(Query *root, RelOptInfo *rel);
@@ -71,7 +72,7 @@ make_one_rel(Query *root, List *rels)
 	if (levels_needed <= 0)
 		return NULL;
 
-	find_base_rel_paths(root, rels);
+	set_base_rel_pathlist(root, rels);
 
 	if (levels_needed <= 1)
 	{
@@ -83,7 +84,7 @@ make_one_rel(Query *root, List *rels)
 	else
 	{
 		/*
-		 * this means that joins or sorts are required. set selectivities
+		 * This means that joins or sorts are required. set selectivities
 		 * of clauses that have not been set by an index.
 		 */
 		set_rest_relselec(root, rels);
@@ -93,7 +94,7 @@ make_one_rel(Query *root, List *rels)
 }
 
 /*
- * find_base_rel_paths
+ * set_base_rel_pathlist
  *	  Finds all paths available for scanning each relation entry in
  *	  'rels'.  Sequential scan and any available indices are considered
  *	  if possible(indices are not considered for lower nesting levels).
@@ -102,7 +103,7 @@ make_one_rel(Query *root, List *rels)
  *	  MODIFIES: rels
  */
 static void
-find_base_rel_paths(Query *root, List *rels)
+set_base_rel_pathlist(Query *root, List *rels)
 {
 	List	   *temp;
 
@@ -150,7 +151,7 @@ find_base_rel_paths(Query *root, List *rels)
  *	  Find all possible joinpaths(bushy trees) for a query by systematically
  *	  finding ways to join relations(both original and derived) together.
  *
- * 'outer_rels' is the current list of relations for which join paths
+ * 'rels' is the current list of relations for which join paths
  *				are to be found, i.e., the current list of relations that
  *				have already been derived.
  * 'levels_needed' is the number of iterations needed
@@ -159,7 +160,7 @@ find_base_rel_paths(Query *root, List *rels)
  * the result of joining all the original relations together.
  */
 static RelOptInfo *
-make_one_rel_by_joins(Query *root, List *outer_rels, int levels_needed)
+make_one_rel_by_joins(Query *root, List *rels, int levels_needed)
 {
 	List	   *x;
 	List	   *joined_rels = NIL;
@@ -180,11 +181,11 @@ make_one_rel_by_joins(Query *root, List *outer_rels, int levels_needed)
 	{
 		/*
 		 * Determine all possible pairs of relations to be joined at this
-		 * level. Determine paths for joining these relation pairs and
+		 * level.  Determine paths for joining these relation pairs and
 		 * modify 'joined_rels' accordingly, then eliminate redundant join
 		 * relations.
 		 */
-		joined_rels = make_rels_by_joins(root, outer_rels);
+		joined_rels = make_rels_by_joins(root, rels);
 
 		update_rels_pathlist_for_joins(root, joined_rels);
 
@@ -211,7 +212,7 @@ make_one_rel_by_joins(Query *root, List *outer_rels, int levels_needed)
 			 * involves the join relation to the joininfo list of the
 			 * other relation
 			 */
-			add_rel_to_rel_joininfos(root, joined_rels, outer_rels);
+			add_rel_to_rel_joininfos(root, joined_rels, rels);
 		}
 #endif
 
@@ -236,33 +237,25 @@ make_one_rel_by_joins(Query *root, List *outer_rels, int levels_needed)
 			 * prune rels that have been completely incorporated into new
 			 * join rels
 			 */
-			outer_rels = del_rels_all_bushy_inactive(outer_rels);
+			rels = del_rels_all_bushy_inactive(rels);
 
 			/*
 			 * merge join rels if then contain the same list of base rels
 			 */
-			outer_rels = merge_rels_with_same_relids(joined_rels, outer_rels);
-			root->join_rel_list = outer_rels;
+			joined_rels = merge_rels_with_same_relids(joined_rels, rels);
 		}
-		else
 #endif
-		root->join_rel_list = joined_rels;
-
-#ifdef NOT_USED
-		if (!BushyPlanFlag)
-#endif
-		outer_rels = joined_rels;
-
+		root->join_rel_list = rels = joined_rels;
 	}
 
-	Assert(length(joined_rels) == 1);
+	Assert(BushyPlanFlag || length(rels) == 1);
 
 #ifdef NOT_USED
 	if (BushyPlanFlag)
-		return final_join_rels(outer_rels);
+		return get_cheapest_complete_rel(rels);
 	else
 #endif
-	return lfirst(joined_rels);
+	return lfirst(rels);
 }
 
 /*****************************************************************************

src/backend/optimizer/path/indxpath.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.47 1999/02/15 03:22:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.48 1999/02/15 05:21:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1208,7 +1208,7 @@ indexable_joinclauses(RelOptInfo *rel, RelOptInfo *index,
 		{
 			List	   *clauses = lfirst(clausegroups);
 
-			((RestrictInfo *) lfirst(clauses))->restrictinfojoinid = joininfo->otherrels;
+			((RestrictInfo *) lfirst(clauses))->restrictinfojoinid = joininfo->unjoined_rels;
 		}
 		cg_list = nconc(cg_list, clausegroups);
 	}