Cleanup makeTargetEntry and remove internal.c.

4 files changed, 22 insertions, 98 deletions

diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 96b203498ff..4fdde87938a 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.23 1998/07/19 05:49:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.24 1998/07/20 19:53:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -132,7 +132,7 @@ set_join_tlist_references(Join *join)
 											  outer_tlist,
 											  inner_tlist);
 
-		temp = MakeTLE(xtl->resdom, (Node *) joinvar);
+		temp = makeTargetEntry(xtl->resdom, (Node *) joinvar);
 		new_join_targetlist = lappend(new_join_targetlist, temp);
 	}
 
@@ -497,7 +497,7 @@ tlist_temp_references(Oid tempid,
 		else
 			oattno = 0;
 
-		temp = MakeTLE(xtl->resdom,
+		temp = makeTargetEntry(xtl->resdom,
 					   (Node *) makeVar(tempid,
 										xtl->resdom->resno,
 										xtl->resdom->restype,
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index e8dc816de9e..636df6111d4 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.13 1998/07/20 19:21:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.14 1998/07/20 19:53:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -114,9 +114,7 @@ preprocess_targetlist(List *tlist,
 
 		var = makeVar(result_relation, -1, TIDOID, -1, 0, result_relation, -1);
 
-		ctid = makeNode(TargetEntry);
-		ctid->resdom = resdom;
-		ctid->expr = (Node *) var;
+		ctid = makeTargetEntry(resdom, (Node *) var);
 		t_list = lappend(t_list, ctid);
 	}
 
@@ -233,7 +231,7 @@ replace_matching_resname(List *new_tlist, List *old_tlist)
 			newresno = (Resdom *) copyObject((Node *) old_tle->resdom);
 			newresno->resno = length(t_list) + 1;
 			newresno->resjunk = 1;
-			new_tl = MakeTLE(newresno, old_tle->expr);
+			new_tl = makeTargetEntry(newresno, old_tle->expr);
 			t_list = lappend(t_list, new_tl);
 		}
 	}
@@ -296,7 +294,7 @@ new_relation_targetlist(Oid relid, Index rt_index, NodeTag node_type)
 									  false,	/* not a set */
 									  false);
 
-					temp3 = MakeTLE(makeResdom(attno,
+					temp3 = makeTargetEntry(makeResdom(attno,
 											   atttype,
 											   -1,
 											   attname,
@@ -317,7 +315,7 @@ new_relation_targetlist(Oid relid, Index rt_index, NodeTag node_type)
 								get_atttypmod(relid, attno),
 								0, rt_index, attno);
 
-					temp_list = MakeTLE(makeResdom(attno,
+					temp_list = makeTargetEntry(makeResdom(attno,
 												   atttype,
 												   get_atttypmod(relid, attno),
 												   attname,
diff --git a/src/backend/optimizer/util/internal.c b/src/backend/optimizer/util/internal.c
deleted file mode 100644
index fdb094a3db9..00000000000
--- a/src/backend/optimizer/util/internal.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * internal.c--
- *	  Definitions required throughout the query optimizer.
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- *
- * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/internal.c,v 1.7 1998/02/26 04:33:17 momjian Exp $
- *
- *-------------------------------------------------------------------------
- */
-
-/*
- *		---------- SHARED MACROS
- *
- *		Macros common to modules for creating, accessing, and modifying
- *		query tree and query plan components.
- *		Shared with the executor.
- *
- */
-#include <sys/types.h>
-
-#include "postgres.h"
-
-#include "optimizer/internal.h"
-
-#include "nodes/relation.h"
-#include "nodes/plannodes.h"
-#include "nodes/primnodes.h"
-#include "utils/palloc.h"
-
-#ifdef NOT_USED
-/*****************************************************************************
- *
- *****************************************************************************/
-
-/* the following should probably be moved elsewhere -ay */
-
-TargetEntry *
-MakeTLE(Resdom *resdom, Node *expr)
-{
-	TargetEntry *rt = makeNode(TargetEntry);
-
-	rt->resdom = resdom;
-	rt->expr = expr;
-	return rt;
-}
-
-Var *
-get_expr(TargetEntry *tle)
-{
-	Assert(tle != NULL);
-	Assert(tle->expr != NULL);
-
-	return ((Var *) tle->expr);
-}
-
-#endif							/* 0 */
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index 488bc4b5e14..ed39fd43f20 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.14 1998/07/18 04:22:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.15 1998/07/20 19:53:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -133,19 +133,15 @@ add_tl_element(RelOptInfo *rel, Var *var)
 TargetEntry *
 create_tl_element(Var *var, int resdomno)
 {
-	TargetEntry *tlelement = makeNode(TargetEntry);
-
-	tlelement->resdom =
-		makeResdom(resdomno,
-				   var->vartype,
-				   var->vartypmod,
-				   NULL,
-				   (Index) 0,
-				   (Oid) 0,
-				   0);
-	tlelement->expr = (Node *) var;
-
-	return (tlelement);
+
+	return	makeTargetEntry(makeResdom(resdomno,
+					   var->vartype,
+					   var->vartypmod,
+					   NULL,
+					   (Index) 0,
+					   (Oid) 0,
+					   0),
+				(Node *) var);
 }
 
 /*
@@ -351,7 +347,7 @@ copy_vars(List *target, List *source)
 	for (src = source, dest = target; src != NIL &&
 		 dest != NIL; src = lnext(src), dest = lnext(dest))
 	{
-		TargetEntry *temp = MakeTLE(((TargetEntry *) lfirst(dest))->resdom,
+		TargetEntry *temp = makeTargetEntry(((TargetEntry *) lfirst(dest))->resdom,
 									(Node *) get_expr(lfirst(src)));
 
 		result = lappend(result, temp);
@@ -404,7 +400,7 @@ flatten_tlist(List *tlist)
 						   (Oid) 0,
 						   0);
 			last_resdomno++;
-			new_tlist = lappend(new_tlist, MakeTLE(r, (Node *) var));
+			new_tlist = lappend(new_tlist, makeTargetEntry(r, (Node *) var));
 		}
 	}
 
@@ -435,7 +431,7 @@ flatten_tlist_vars(List *full_tlist, List *flat_tlist)
 
 		result =
 			lappend(result,
-					MakeTLE(tle->resdom,
+					makeTargetEntry(tle->resdom,
 							flatten_tlistentry((Node *) get_expr(tle),
 											   flat_tlist)));
 	}
@@ -544,16 +540,6 @@ flatten_tlistentry(Node *tlistentry, List *flat_tlist)
 }
 
 
-TargetEntry *
-MakeTLE(Resdom *resdom, Node *expr)
-{
-	TargetEntry *rt = makeNode(TargetEntry);
-
-	rt->resdom = resdom;
-	rt->expr = expr;
-	return rt;
-}
-
 Var *
 get_expr(TargetEntry *tle)
 {
@@ -597,7 +583,7 @@ AddGroupAttrToTlist(List *tlist, List *grpCl)
 						   (Oid) 0,
 						   0);
 			last_resdomno++;
-			tlist = lappend(tlist, MakeTLE(r, (Node *) var));
+			tlist = lappend(tlist, makeTargetEntry(r, (Node *) var));
 		}
 	}
 }