Rename Temp to Noname for noname tables.

4 files changed, 22 insertions, 22 deletions

diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 4ce89d0e4e..5a8b9dbfc9 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodes.h,v 1.40 1999/02/09 03:51:41 momjian Exp $
+ * $Id: nodes.h,v 1.41 1999/02/09 17:03:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,7 +38,7 @@ typedef enum NodeTag
 	T_NestLoop,
 	T_MergeJoin,
 	T_HashJoin,
-	T_Temp,
+	T_Noname,
 	T_Material,
 	T_Sort,
 	T_Agg,
@@ -251,8 +251,8 @@ typedef struct Node
 	(nodeTag(j)==T_Join || nodeTag(j)==T_NestLoop || \
 	 nodeTag(j)==T_MergeJoin || nodeTag(j)==T_HashJoin)
 
-#define IsA_Temp(t) \
-	(nodeTag(t)==T_Temp || nodeTag(t)==T_Material || nodeTag(t)==T_Sort || \
+#define IsA_Noname(t) \
+	(nodeTag(t)==T_Noname || nodeTag(t)==T_Material || nodeTag(t)==T_Sort || \
 	 nodeTag(t)==T_Unique)
 
 /* ----------------------------------------------------------------
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index d652a48f6b..a54b8e0a96 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: plannodes.h,v 1.20 1999/01/23 23:28:09 momjian Exp $
+ * $Id: plannodes.h,v 1.21 1999/02/09 17:03:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -262,15 +262,15 @@ typedef struct Group
 
 /*
  * ==========
- * Temp nodes
+ * Noname nodes
  * ==========
  */
-typedef struct Temp
+typedef struct Noname
 {
 	Plan		plan;
-	Oid			tempid;
+	Oid			nonameid;
 	int			keycount;
-} Temp;
+} Noname;
 
 /* ----------------
  *		materialization node
@@ -278,8 +278,8 @@ typedef struct Temp
  */
 typedef struct Material
 {
-	Plan		plan;			/* temp node flattened out */
-	Oid			tempid;
+	Plan		plan;			/* noname node flattened out */
+	Oid			nonameid;
 	int			keycount;
 	MaterialState *matstate;
 } Material;
@@ -290,8 +290,8 @@ typedef struct Material
  */
 typedef struct Sort
 {
-	Plan		plan;			/* temp node flattened out */
-	Oid			tempid;
+	Plan		plan;			/* noname node flattened out */
+	Oid			nonameid;
 	int			keycount;
 	SortState  *sortstate;
 	void	   *psortstate;
@@ -304,8 +304,8 @@ typedef struct Sort
  */
 typedef struct Unique
 {
-	Plan		plan;			/* temp node flattened out */
-	Oid			tempid;
+	Plan		plan;			/* noname node flattened out */
+	Oid			nonameid;
 	int			keycount;
 	char	   *uniqueAttr;		/* NULL if all attrs, or unique attribute
 								 * name */
diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h
index 76327c0327..5d8e75d146 100644
--- a/src/include/optimizer/internal.h
+++ b/src/include/optimizer/internal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: internal.h,v 1.12 1999/02/02 03:45:24 momjian Exp $
+ * $Id: internal.h,v 1.13 1999/02/09 17:03:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,12 +41,12 @@
 
 /*	   The cost of sequentially scanning a materialized temporary relation
  */
-#define _TEMP_SCAN_COST_		10
+#define _NONAME_SCAN_COST_		10
 
 /*	   The number of pages and tuples in a materialized relation
  */
-#define _TEMP_RELATION_PAGES_			1
-#define _TEMP_RELATION_TUPLES_	10
+#define _NONAME_RELATION_PAGES_			1
+#define _NONAME_RELATION_TUPLES_	10
 
 /*	   The length of a variable-length field in bytes
  */
@@ -59,7 +59,7 @@
 
 /*	   Identifier for (sort) temp relations   */
 /* used to be -1 */
-#define _TEMP_RELATION_ID_	 InvalidOid
+#define _NONAME_RELATION_ID_	 InvalidOid
 
 /*	   Identifier for invalid relation OIDs and attribute numbers for use by
  *	   selectivity functions
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 82024732f1..1bb2b636aa 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planmain.h,v 1.19 1999/02/02 17:46:16 momjian Exp $
+ * $Id: planmain.h,v 1.20 1999/02/09 17:03:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,7 +31,7 @@ extern Plan *query_planner(Query *root,
 extern Plan *create_plan(Path *best_path);
 extern SeqScan *make_seqscan(List *qptlist, List *qpqual, Index scanrelid,
 			 Plan *lefttree);
-extern Sort *make_sort(List *tlist, Oid tempid, Plan *lefttree,
+extern Sort *make_sort(List *tlist, Oid nonameid, Plan *lefttree,
 		  int keycount);
 extern Agg *make_agg(List *tlist, Plan *lefttree);
 extern Group *make_group(List *tlist, bool tuplePerGroup, int ngrp,