New HeapTuple structure/interface.

4 files changed, 13 insertions, 16 deletions

diff --git a/src/backend/parser/gram.c b/src/backend/parser/gram.c
index 997c65e808c..efea1dc074d 100644
--- a/src/backend/parser/gram.c
+++ b/src/backend/parser/gram.c
@@ -229,7 +229,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.49 1998/11/22 10:48:45 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.50 1998/11/27 19:52:09 vadim Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index dc533d1dbd3..81b887e8a5f 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.30 1998/10/08 18:29:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.31 1998/11/27 19:52:13 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -516,7 +516,7 @@ func_get_candidates(char *funcname, int nargs)
 	Relation	heapRelation;
 	Relation	idesc;
 	ScanKeyData skey;
-	HeapTuple	tuple;
+	HeapTupleData	tuple;
 	IndexScanDesc sd;
 	RetrieveIndexResult indexRes;
 	Form_pg_proc pgProcP;
@@ -537,20 +537,17 @@ func_get_candidates(char *funcname, int nargs)
 
 	do
 	{
-		tuple = (HeapTuple) NULL;
-
 		indexRes = index_getnext(sd, ForwardScanDirection);
 		if (indexRes)
 		{
-			ItemPointer iptr;
 			Buffer		buffer;
 
-			iptr = &indexRes->heap_iptr;
-			tuple = heap_fetch(heapRelation, SnapshotNow, iptr, &buffer);
+			tuple.t_self = indexRes->heap_iptr;
+			heap_fetch(heapRelation, SnapshotNow, &tuple, &buffer);
 			pfree(indexRes);
-			if (HeapTupleIsValid(tuple))
+			if (tuple.t_data != NULL)
 			{
-				pgProcP = (Form_pg_proc) GETSTRUCT(tuple);
+				pgProcP = (Form_pg_proc) GETSTRUCT(&tuple);
 				if (pgProcP->pronargs == nargs)
 				{
 					current_candidate = (CandidateList)
@@ -884,7 +881,7 @@ func_get_detail(char *funcname,
 	else
 	{
 		pform = (Form_pg_proc) GETSTRUCT(ftup);
-		*funcid = ftup->t_oid;
+		*funcid = ftup->t_data->t_oid;
 		*rettype = pform->prorettype;
 		*retset = pform->proretset;
 
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index 7719e517ac1..f9e13f16042 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.20 1998/10/08 18:29:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.21 1998/11/27 19:52:14 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,7 +61,7 @@ any_ordering_op(int restype)
 Oid
 oprid(Operator op)
 {
-	return op->t_oid;
+	return op->t_data->t_oid;
 }
 
 
@@ -426,7 +426,7 @@ oper_exact(char *op, Oid arg1, Oid arg2, Node **ltree, Node **rtree, bool noWarn
 			Form_pg_operator opform;
 
 			opform = (Form_pg_operator) GETSTRUCT(tup);
-			if (opform->oprcom == tup->t_oid)
+			if (opform->oprcom == tup->t_data->t_oid)
 			{
 				if ((ltree != NULL) && (rtree != NULL))
 				{
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 4f0494318f4..c9034557662 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.17 1998/10/08 18:29:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.18 1998/11/27 19:52:14 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -96,7 +96,7 @@ typeTypeId(Type tp)
 {
 	if (tp == NULL)
 		elog(ERROR, "typeTypeId() called with NULL type struct");
-	return tp->t_oid;
+	return tp->t_data->t_oid;
 }
 
 /* given type (as type struct), return the length of type */