3 files changed, 11 insertions, 35 deletions

diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 044cee23ea..a74f16348d 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execnodes.h,v 1.41 2000/04/12 17:16:39 momjian Exp $
+ * $Id: execnodes.h,v 1.42 2000/06/18 22:44:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -565,11 +565,9 @@ typedef struct HashJoinState
  *	 MaterialState information
  *
  *		materialize nodes are used to materialize the results
- *		of a subplan into a temporary relation.
+ *		of a subplan into a temporary file.
  *
- *		Flag			indicated whether subplan has been materialized
- *		TempRelation	temporary relation containing result of executing
- *						the subplan.
+ *		tuplestorestate		private state of tuplestore.c
  *
  *	 CommonScanState information
  *
@@ -590,8 +588,7 @@ typedef struct HashJoinState
 typedef struct MaterialState
 {
 	CommonScanState csstate;	/* its first field is NodeTag */
-	bool		mat_Flag;
-	Relation	mat_TempRelation;
+	void	   *tuplestorestate;
 } MaterialState;
 
 /* ---------------------
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 5d049dadfb..3be4831778 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodes.h,v 1.68 2000/05/29 01:59:12 tgl Exp $
+ * $Id: nodes.h,v 1.69 2000/06/18 22:44:31 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,13 +39,13 @@ typedef enum NodeTag
 	T_NestLoop,
 	T_MergeJoin,
 	T_HashJoin,
-	T_Noname,
+	T_Noname_XXX,				/* not used anymore; this tag# is available */
 	T_Material,
 	T_Sort,
 	T_Agg,
 	T_Unique,
 	T_Hash,
-	T_Choose,
+	T_Choose_XXX,				/* not used anymore; this tag# is available */
 	T_Group,
 	T_SubPlan,
 	T_TidScan,
@@ -261,10 +261,6 @@ typedef struct Node
 	(IsA(jp, Join) || IsA(jp, NestLoop) || \
 	 IsA(jp, MergeJoin) || IsA(jp, HashJoin))
 
-#define IsA_Noname(t) \
-	(IsA(t, Noname) || IsA(t, Material) || IsA(t, Sort) || \
-	 IsA(t, Unique))
-
 #define IsA_Value(t) \
 	(IsA(t, Integer) || IsA(t, Float) || IsA(t, String))
 
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 1cab6e03fc..37006e621f 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: plannodes.h,v 1.39 2000/04/12 17:16:40 momjian Exp $
+ * $Id: plannodes.h,v 1.40 2000/06/18 22:44:31 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -277,27 +277,13 @@ typedef struct Group
 	GroupState *grpstate;
 } Group;
 
-/*
- * ==========
- * Noname nodes
- * ==========
- */
-typedef struct Noname
-{
-	Plan		plan;
-	Oid			nonameid;
-	int			keycount;
-} Noname;
-
 /* ----------------
  *		materialization node
  * ----------------
  */
 typedef struct Material
 {
-	Plan		plan;			/* noname node flattened out */
-	Oid			nonameid;
-	int			keycount;
+	Plan		plan;
 	MaterialState *matstate;
 } Material;
 
@@ -307,8 +293,7 @@ typedef struct Material
  */
 typedef struct Sort
 {
-	Plan		plan;			/* noname node flattened out */
-	Oid			nonameid;
+	Plan		plan;
 	int			keycount;
 	SortState  *sortstate;
 } Sort;
@@ -319,9 +304,7 @@ typedef struct Sort
  */
 typedef struct Unique
 {
-	Plan		plan;			/* noname node flattened out */
-	Oid			nonameid;
-	int			keycount;
+	Plan		plan;
 	int			numCols;		/* number of columns to check for
 								 * uniqueness */
 	AttrNumber *uniqColIdx;		/* indexes into the target list */