JoinPath -> NestPath for nested loop.

Author: bmomjian

src/backend/nodes/copyfuncs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.68 1999/02/12 05:56:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.69 1999/02/12 06:43:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1174,35 +1174,35 @@ _copyIndexPath(IndexPath *from)
 }
 
 /* ----------------
- *		CopyJoinPathFields
+ *		CopyNestPathFields
  *
- *		This function copies the fields of the JoinPath node.  It is used by
- *		all the copy functions for classes which inherit from JoinPath.
+ *		This function copies the fields of the NestPath node.  It is used by
+ *		all the copy functions for classes which inherit from NestPath.
  * ----------------
  */
 static void
-CopyJoinPathFields(JoinPath *from, JoinPath *newnode)
+CopyNestPathFields(NestPath *from, NestPath *newnode)
 {
 	Node_Copy(from, newnode, pathinfo);
 	Node_Copy(from, newnode, outerjoinpath);
 	Node_Copy(from, newnode, innerjoinpath);
 }
 
 /* ----------------
- *		_copyJoinPath
+ *		_copyNestPath
  * ----------------
  */
-static JoinPath *
-_copyJoinPath(JoinPath *from)
+static NestPath *
+_copyNestPath(NestPath *from)
 {
-	JoinPath   *newnode = makeNode(JoinPath);
+	NestPath   *newnode = makeNode(NestPath);
 
 	/* ----------------
 	 *	copy the node superclass fields
 	 * ----------------
 	 */
 	CopyPathFields((Path *) from, (Path *) newnode);
-	CopyJoinPathFields(from, newnode);
+	CopyNestPathFields(from, newnode);
 
 	return newnode;
 }
@@ -1221,7 +1221,7 @@ _copyMergePath(MergePath *from)
 	 * ----------------
 	 */
 	CopyPathFields((Path *) from, (Path *) newnode);
-	CopyJoinPathFields((JoinPath *) from, (JoinPath *) newnode);
+	CopyNestPathFields((NestPath *) from, (NestPath *) newnode);
 
 	/* ----------------
 	 *	copy the remainder of the node
@@ -1248,7 +1248,7 @@ _copyHashPath(HashPath *from)
 	 * ----------------
 	 */
 	CopyPathFields((Path *) from, (Path *) newnode);
-	CopyJoinPathFields((JoinPath *) from, (JoinPath *) newnode);
+	CopyNestPathFields((NestPath *) from, (NestPath *) newnode);
 
 	/* ----------------
 	 *	copy remainder of node
@@ -1773,8 +1773,8 @@ copyObject(void *from)
 		case T_IndexPath:
 			retval = _copyIndexPath(from);
 			break;
-		case T_JoinPath:
-			retval = _copyJoinPath(from);
+		case T_NestPath:
+			retval = _copyNestPath(from);
 			break;
 		case T_MergePath:
 			retval = _copyMergePath(from);

src/backend/nodes/equalfuncs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.30 1999/02/11 14:58:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.31 1999/02/12 06:43:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -390,7 +390,7 @@ _equalIndexPath(IndexPath *a, IndexPath *b)
 }
 
 static bool
-_equalJoinPath(JoinPath *a, JoinPath *b)
+_equalNestPath(NestPath *a, NestPath *b)
 {
 	Assert(IsA_JoinPath(a));
 	Assert(IsA_JoinPath(b));
@@ -412,7 +412,7 @@ _equalMergePath(MergePath *a, MergePath *b)
 	Assert(IsA(a, MergePath));
 	Assert(IsA(b, MergePath));
 
-	if (!_equalJoinPath((JoinPath *) a, (JoinPath *) b))
+	if (!_equalNestPath((NestPath *) a, (NestPath *) b))
 		return false;
 	if (!equal(a->path_mergeclauses, b->path_mergeclauses))
 		return false;
@@ -429,7 +429,7 @@ _equalHashPath(HashPath *a, HashPath *b)
 	Assert(IsA(a, HashPath));
 	Assert(IsA(b, HashPath));
 
-	if (!_equalJoinPath((JoinPath *) a, (JoinPath *) b))
+	if (!_equalNestPath((NestPath *) a, (NestPath *) b))
 		return false;
 	if (!equal((a->path_hashclauses), (b->path_hashclauses)))
 		return false;
@@ -773,8 +773,8 @@ equal(void *a, void *b)
 		case T_IndexPath:
 			retval = _equalIndexPath(a, b);
 			break;
-		case T_JoinPath:
-			retval = _equalJoinPath(a, b);
+		case T_NestPath:
+			retval = _equalNestPath(a, b);
 			break;
 		case T_MergePath:
 			retval = _equalMergePath(a, b);

src/backend/nodes/freefuncs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.8 1999/02/12 05:56:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.9 1999/02/12 06:43:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -811,33 +811,33 @@ _freeIndexPath(IndexPath *node)
 }
 
 /* ----------------
- *		FreeJoinPathFields
+ *		FreeNestPathFields
  *
- *		This function frees the fields of the JoinPath node.  It is used by
- *		all the free functions for classes which inherit node JoinPath.
+ *		This function frees the fields of the NestPath node.  It is used by
+ *		all the free functions for classes which inherit node NestPath.
  * ----------------
  */
 static void
-FreeJoinPathFields(JoinPath *node)
+FreeNestPathFields(NestPath *node)
 {
 	freeObject(node->pathinfo);
 	freeObject(node->outerjoinpath);
 	freeObject(node->innerjoinpath);
 }
 
 /* ----------------
- *		_freeJoinPath
+ *		_freeNestPath
  * ----------------
  */
 static void
-_freeJoinPath(JoinPath *node)
+_freeNestPath(NestPath *node)
 {
 	/* ----------------
 	 *	free the node superclass fields
 	 * ----------------
 	 */
 	FreePathFields((Path *) node);
-	FreeJoinPathFields(node);
+	FreeNestPathFields(node);
 
 	pfree(node);
 }
@@ -854,7 +854,7 @@ _freeMergePath(MergePath *node)
 	 * ----------------
 	 */
 	FreePathFields((Path *) node);
-	FreeJoinPathFields((JoinPath *) node);
+	FreeNestPathFields((NestPath *) node);
 
 	/* ----------------
 	 *	free the remainder of the node
@@ -879,7 +879,7 @@ _freeHashPath(HashPath *node)
 	 * ----------------
 	 */
 	FreePathFields((Path *) node);
-	FreeJoinPathFields((JoinPath *) node);
+	FreeNestPathFields((NestPath *) node);
 
 	/* ----------------
 	 *	free remainder of node
@@ -1292,8 +1292,8 @@ freeObject(void *node)
 		case T_IndexPath:
 			_freeIndexPath(node);
 			break;
-		case T_JoinPath:
-			_freeJoinPath(node);
+		case T_NestPath:
+			_freeNestPath(node);
 			break;
 		case T_MergePath:
 			_freeMergePath(node);

src/backend/nodes/outfuncs.c

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *  $Id: outfuncs.c,v 1.70 1999/02/12 05:56:46 momjian Exp $
+ *  $Id: outfuncs.c,v 1.71 1999/02/12 06:43:24 momjian Exp $
  *
  * NOTES
  *	  Every (plan) node in POSTGRES has an associated "out" routine which
@@ -990,13 +990,13 @@ _outIndexPath(StringInfo str, IndexPath *node)
 }
 
 /*
- *	JoinPath is a subclass of Path
+ *	NestPath is a subclass of Path
  */
 static void
-_outJoinPath(StringInfo str, JoinPath *node)
+_outNestPath(StringInfo str, NestPath *node)
 {
 	appendStringInfo(str, 
-			" JOINPATH :pathtype %d :cost %f :pathkeys ",
+			" NESTPATH :pathtype %d :cost %f :pathkeys ",
 			node->path.pathtype,
 			node->path.path_cost);
 	_outNode(str, node->path.pathkeys);
@@ -1021,7 +1021,7 @@ _outJoinPath(StringInfo str, JoinPath *node)
 }
 
 /*
- *	MergePath is a subclass of JoinPath.
+ *	MergePath is a subclass of NestPath.
  */
 static void
 _outMergePath(StringInfo str, MergePath *node)
@@ -1061,7 +1061,7 @@ _outMergePath(StringInfo str, MergePath *node)
 }
 
 /*
- *	HashPath is a subclass of JoinPath.
+ *	HashPath is a subclass of NestPath.
  */
 static void
 _outHashPath(StringInfo str, HashPath *node)
@@ -1600,8 +1600,8 @@ _outNode(StringInfo str, void *obj)
 			case T_IndexPath:
 				_outIndexPath(str, obj);
 				break;
-			case T_JoinPath:
-				_outJoinPath(str, obj);
+			case T_NestPath:
+				_outNestPath(str, obj);
 				break;
 			case T_MergePath:
 				_outMergePath(str, obj);

src/backend/nodes/readfuncs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.55 1999/02/12 05:56:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.56 1999/02/12 06:43:24 momjian Exp $
  *
  * NOTES
  *	  Most of the read functions for plan nodes are tested. (In fact, they
@@ -1564,20 +1564,20 @@ _readIndexPath()
 }
 
 /* ----------------
- *		_readJoinPath
+ *		_readNestPath
  *
- *	JoinPath is a subclass of Path
+ *	NestPath is a subclass of Path
  * ----------------
  */
-static JoinPath *
-_readJoinPath()
+static NestPath *
+_readNestPath()
 {
-	JoinPath   *local_node;
+	NestPath   *local_node;
 	char	   *token;
 	int			length;
 
 
-	local_node = makeNode(JoinPath);
+	local_node = makeNode(NestPath);
 
 	token = lsptok(NULL, &length);		/* get :pathtype */
 	token = lsptok(NULL, &length);		/* now read it */
@@ -1630,7 +1630,7 @@ _readJoinPath()
 /* ----------------
  *		_readMergePath
  *
- *	MergePath is a subclass of JoinPath.
+ *	MergePath is a subclass of NestPath.
  * ----------------
  */
 static MergePath *
@@ -1704,7 +1704,7 @@ _readMergePath()
 /* ----------------
  *		_readHashPath
  *
- *	HashPath is a subclass of JoinPath.
+ *	HashPath is a subclass of NestPath.
  * ----------------
  */
 static HashPath *
@@ -2110,8 +2110,8 @@ parsePlanString(void)
 		return_value = _readPath();
 	else if (!strncmp(token, "INDEXPATH", length))
 		return_value = _readIndexPath();
-	else if (!strncmp(token, "JOINPATH", length))
-		return_value = _readJoinPath();
+	else if (!strncmp(token, "NESTPATH", length))
+		return_value = _readNestPath();
 	else if (!strncmp(token, "MERGEPATH", length))
 		return_value = _readMergePath();
 	else if (!strncmp(token, "HASHPATH", length))

src/backend/optimizer/geqo/geqo_misc.c

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_misc.c,v 1.14 1999/02/10 21:02:34 momjian Exp $
+ * $Id: geqo_misc.c,v 1.15 1999/02/12 06:43:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -158,7 +158,7 @@ void
 geqo_print_path(Query *root, Path *path, int indent)
 {
 	char	   *ptype = NULL;
-	JoinPath   *jp;
+	NestPath   *jp;
 	bool		join = false;
 	int			i;
 
@@ -175,7 +175,7 @@ geqo_print_path(Query *root, Path *path, int indent)
 			ptype = "IdxScan";
 			join = false;
 			break;
-		case T_JoinPath:
+		case T_NestPath:
 			ptype = "Nestloop";
 			join = true;
 			break;
@@ -194,7 +194,7 @@ geqo_print_path(Query *root, Path *path, int indent)
 	{
 		int			size = path->parent->size;
 
-		jp = (JoinPath *) path;
+		jp = (NestPath *) path;
 		printf("%s size=%d cost=%f\n", ptype, size, path->path_cost);
 		switch (nodeTag(path))
 		{
@@ -203,8 +203,7 @@ geqo_print_path(Query *root, Path *path, int indent)
 				for (i = 0; i < indent + 1; i++)
 					printf("\t");
 				printf("   clauses=(");
-				geqo_print_joinclauses(root,
-									((JoinPath *) path)->pathinfo);
+				geqo_print_joinclauses(root, ((NestPath *) path)->pathinfo);
 				printf(")\n");
 
 				if (nodeTag(path) == T_MergePath)

src/backend/optimizer/geqo/geqo_paths.c

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_paths.c,v 1.17 1999/02/12 05:56:48 momjian Exp $
+ * $Id: geqo_paths.c,v 1.18 1999/02/12 06:43:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -98,7 +98,7 @@ geqo_prune_rel(RelOptInfo *rel, List *other_rels)
 void
 geqo_set_cheapest(RelOptInfo *rel)
 {
-	JoinPath *cheapest = (JoinPath *)set_cheapest(rel, rel->pathlist);
+	NestPath *cheapest = (NestPath *)set_cheapest(rel, rel->pathlist);
 
 	if (IsA_JoinPath(cheapest))
 		rel->size = compute_joinrel_size(cheapest);