heapattr functions now return a Datum, not char *.

7 files changed, 32 insertions, 42 deletions

diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c
index cd07b2fa1dc..e3e0623b957 100644
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.8 1997/09/08 21:42:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.9 1997/09/12 04:07:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -315,8 +315,7 @@ ExecGetJunkAttribute(JunkFilter *junkfilter,
 	tuple = slot->val;
 	tupType = (TupleDesc) junkfilter->jf_tupType;
 
-	*value = (Datum)
-		heap_getattr(tuple, InvalidBuffer, resno, tupType, isNull);
+	*value = heap_getattr(tuple, InvalidBuffer, resno, tupType, isNull);
 
 	return true;
 }
@@ -391,10 +390,8 @@ ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot)
 	 */
 	for (i = 0; i < cleanLength; i++)
 	{
-		Datum		d = (Datum)
-		heap_getattr(tuple, InvalidBuffer, cleanMap[i], tupType, &isNull);
-
-		values[i] = d;
+		values[i] =
+			heap_getattr(tuple, InvalidBuffer, cleanMap[i], tupType, &isNull);
 
 		if (isNull)
 			nulls[i] = 'n';
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 05d0721e31c..2f351276d4b 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.16 1997/09/08 21:43:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.17 1997/09/12 04:07:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -305,12 +305,11 @@ ExecEvalVar(Var *variable, ExprContext *econtext, bool *isNull)
 		return (Datum) tempSlot;
 	}
 
-	result = (Datum)
-		heap_getattr(heapTuple, /* tuple containing attribute */
-					 buffer,	/* buffer associated with tuple */
-					 attnum,	/* attribute number of desired attribute */
-					 tuple_type,/* tuple descriptor of tuple */
-					 isNull);	/* return: is attribute null? */
+	result = heap_getattr(heapTuple, /* tuple containing attribute */
+						  buffer,	/* buffer associated with tuple */
+						  attnum,	/* attribute number of desired attribute */
+					 	  tuple_type,/* tuple descriptor of tuple */
+						  isNull);	/* return: is attribute null? */
 
 	/* ----------------
 	 *	return null if att is null
@@ -530,12 +529,11 @@ GetAttributeByNum(TupleTableSlot *slot,
 		return (char *) NULL;
 	}
 
-	retval = (Datum)
-		heap_getattr(slot->val,
-					 slot->ttc_buffer,
-					 attrno,
-					 slot->ttc_tupleDescriptor,
-					 isNull);
+	retval = heap_getattr(slot->val,
+						  slot->ttc_buffer,
+						  attrno,
+						  slot->ttc_tupleDescriptor,
+						  isNull);
 	if (*isNull)
 		return (char *) NULL;
 	return (char *) retval;
@@ -595,12 +593,11 @@ GetAttributeByName(TupleTableSlot *slot, char *attname, bool *isNull)
 	if (attrno == InvalidAttrNumber)
 		elog(WARN, "GetAttributeByName: attribute %s not found", attname);
 
-	retval = (Datum)
-		heap_getattr(slot->val,
-					 slot->ttc_buffer,
-					 attrno,
-					 tupdesc,
-					 isNull);
+	retval = heap_getattr(slot->val,
+						  slot->ttc_buffer,
+						  attrno,
+						  tupdesc,
+						  isNull);
 	if (*isNull)
 		return (char *) NULL;
 	return (char *) retval;
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index 500a6eaa99a..54aa08f53ea 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.10 1997/09/08 21:43:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.11 1997/09/12 04:07:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -83,11 +83,7 @@ ProjectAttribute(TupleDesc TD,
 	AttrNumber	attrno = attrVar->varattno;
 
 
-	val = PointerGetDatum(heap_getattr(tup,
-									   InvalidBuffer,
-									   attrno,
-									   TD,
-									   isnullP));
+	val = heap_getattr(tup, InvalidBuffer, attrno, TD, isnullP);
 	if (*isnullP)
 		return (Datum) NULL;
 
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 7d7550ab433..0acb1c58b13 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -638,7 +638,7 @@ aggGetAttr(TupleTableSlot *slot,
 		return (Datum) tempSlot;
 	}
 
-	result = (Datum)
+	result = 
 		heap_getattr(heapTuple, /* tuple containing attribute */
 					 buffer,	/* buffer associated with tuple */
 					 attnum,	/* attribute number of desired attribute */
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index 3a86ef089dc..4fb42e429f9 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -13,7 +13,7 @@
  *	  columns. (ie. tuples from the same group are consecutive)
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.9 1997/09/08 21:43:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.10 1997/09/12 04:07:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -388,8 +388,8 @@ sameGroup(TupleTableSlot *oldslot,
 {
 	bool		isNull1,
 				isNull2;
-	char	   *attr1,
-			   *attr2;
+	Datum		attr1,
+			    attr2;
 	char	   *val1,
 			   *val2;
 	int			i;
diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index 84879aa0914..74ed561d411 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.10 1997/09/08 21:43:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.11 1997/09/12 04:07:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -182,8 +182,8 @@ ExecUnique(Unique *node)
 			 */
 			bool		isNull1,
 						isNull2;
-			char	   *attr1,
-					   *attr2;
+			Datum		attr1,
+						attr2;
 			char	   *val1,
 					   *val2;
 
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 790b60ee85d..cf71b3a5fda 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -319,7 +319,7 @@ SPI_fname(TupleDesc tupdesc, int fnumber)
 char	   *
 SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber)
 {
-	char	   *val;
+	Datum		val;
 	bool		isnull;
 	Oid			foutoid;
 
@@ -346,10 +346,10 @@ SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber)
 	return (fmgr(foutoid, val, gettypelem(tupdesc->attrs[fnumber - 1]->atttypid)));
 }
 
-char	   *
+Datum
 SPI_getbinval(HeapTuple tuple, TupleDesc tupdesc, int fnumber, bool * isnull)
 {
-	char	   *val;
+	Datum	val;
 
 	*isnull = true;
 	SPI_result = 0;