Rename Rel to RelOptInfo.

3 files changed, 16 insertions, 16 deletions

diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 8979d09922..518b6f553d 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.43 1998/07/15 14:54:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.44 1998/07/18 04:22:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -998,10 +998,10 @@ _copyArrayRef(ArrayRef *from)
  ** planner/path/xfunc.c accordingly!!!
  **			-- JMH, 8/2/93
  */
-static Rel *
-_copyRel(Rel *from)
+static RelOptInfo *
+_copyRel(RelOptInfo *from)
 {
-	Rel		   *newnode = makeNode(Rel);
+	RelOptInfo		   *newnode = makeNode(RelOptInfo);
 	int			i,
 				len;
 
@@ -1734,7 +1734,7 @@ copyObject(void *from)
 			/*
 			 * RELATION NODES
 			 */
-		case T_Rel:
+		case T_RelOptInfo:
 			retval = _copyRel(from);
 			break;
 		case T_Path:
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 43f0204015..aaa726740f 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.40 1998/07/15 14:54:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.41 1998/07/18 04:22:26 momjian Exp $
  *
  * NOTES
  *	  Every (plan) node in POSTGRES has an associated "out" routine which
@@ -990,11 +990,11 @@ _outEState(StringInfo str, EState *node)
  *	Stuff from relation.h
  */
 static void
-_outRel(StringInfo str, Rel *node)
+_outRel(StringInfo str, RelOptInfo *node)
 {
 	char		buf[500];
 
-	appendStringInfo(str, " REL ");
+	appendStringInfo(str, " RELOPTINFO ");
 
 	appendStringInfo(str, " :relids ");
 	_outIntList(str, node->relids);
@@ -1058,7 +1058,7 @@ _outRel(StringInfo str, Rel *node)
 static void
 _outTargetEntry(StringInfo str, TargetEntry *node)
 {
-	appendStringInfo(str, " TLE ");
+	appendStringInfo(str, " TARGETENTRY ");
 	appendStringInfo(str, " :resdom ");
 	_outNode(str, node->resdom);
 
@@ -1787,7 +1787,7 @@ _outNode(StringInfo str, void *obj)
 			case T_EState:
 				_outEState(str, obj);
 				break;
-			case T_Rel:
+			case T_RelOptInfo:
 				_outRel(str, obj);
 				break;
 			case T_TargetEntry:
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index c82e5e5ff8..39201e2613 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.32 1998/07/15 14:54:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.33 1998/07/18 04:22:26 momjian Exp $
  *
  * NOTES
  *	  Most of the read functions for plan nodes are tested. (In fact, they
@@ -1221,14 +1221,14 @@ _readEState()
  *		_readRel
  * ----------------
  */
-static Rel *
+static RelOptInfo *
 _readRel()
 {
-	Rel		   *local_node;
+	RelOptInfo		   *local_node;
 	char	   *token;
 	int			length;
 
-	local_node = makeNode(Rel);
+	local_node = makeNode(RelOptInfo);
 
 	token = lsptok(NULL, &length);		/* get :relids */
 	local_node->relids =
@@ -1990,9 +1990,9 @@ parsePlanString(void)
 		return_value = _readParam();
 	else if (!strncmp(token, "ESTATE", length))
 		return_value = _readEState();
-	else if (!strncmp(token, "REL", length))
+	else if (!strncmp(token, "RELOPTINFO", length))
 		return_value = _readRel();
-	else if (!strncmp(token, "TLE", length))
+	else if (!strncmp(token, "TARGETENTRY", length))
 		return_value = _readTargetEntry();
 	else if (!strncmp(token, "RTE", length))
 		return_value = _readRangeTblEntry();