heap_fetch requires buffer pointer, must be released; heap_getnext

no longer returns buffer pointer, can be gotten from scan;
	descriptor; bootstrap can create multi-key indexes;
pg_procname index now is multi-key index; oidint2, oidint4, oidname
are gone (must be removed from regression tests); use System Cache
rather than sequential scan in many places; heap_modifytuple no
longer takes buffer parameter; remove unused buffer parameter in
a few other functions; oid8 is not index-able; remove some use of
single-character variable names; cleanup Buffer variables usage
and scan descriptor looping; cleaned up allocation and freeing of
tuples; 18k lines of diff;

1 files changed, 9 insertions, 13 deletions

diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index e58bc39f5e4..3d5496c7e66 100644
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.14 1998/07/27 19:37:57 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.15 1998/08/19 02:02:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -59,7 +59,6 @@ ExecMaterial(Material *node)
 	HeapScanDesc currentScanDesc;
 	HeapTuple	heapTuple;
 	TupleTableSlot *slot;
-	Buffer		buffer;
 
 	/* ----------------
 	 *	get state info from node
@@ -162,10 +161,7 @@ ExecMaterial(Material *node)
 	 */
 	currentScanDesc = matstate->csstate.css_currentScanDesc;
 
-	heapTuple = heap_getnext(currentScanDesc,	/* scan desc */
-							 ScanDirectionIsBackward(dir),
-	/* bkwd flag */
-							 &buffer);	/* return: buffer */
+	heapTuple = heap_getnext(currentScanDesc, ScanDirectionIsBackward(dir));
 
 	/* ----------------
 	 *	put the tuple into the scan tuple slot and return the slot.
@@ -177,7 +173,7 @@ ExecMaterial(Material *node)
 
 	return ExecStoreTuple(heapTuple,	/* tuple to store */
 						  slot, /* slot to store in */
-						  buffer,		/* buffer for this tuple */
+						  currentScanDesc->rs_cbuf,	/* buffer for this tuple */
 						  false);		/* don't pfree this pointer */
 
 }
@@ -370,7 +366,7 @@ List							/* nothing of interest */
 ExecMaterialMarkPos(Material node)
 {
 	MaterialState matstate;
-	HeapScanDesc sdesc;
+	HeapScanDesc scan;
 
 	/* ----------------
 	 *	if we haven't materialized yet, just return NIL.
@@ -386,8 +382,8 @@ ExecMaterialMarkPos(Material node)
 	 *		they will never return positions for all I know -cim 10/16/89
 	 * ----------------
 	 */
-	sdesc = get_css_currentScanDesc((CommonScanState) matstate);
-	heap_markpos(sdesc);
+	scan = get_css_currentScanDesc((CommonScanState) matstate);
+	heap_markpos(scan);
 
 	return NIL;
 }
@@ -400,7 +396,7 @@ void
 ExecMaterialRestrPos(Material node)
 {
 	MaterialState matstate;
-	HeapScanDesc sdesc;
+	HeapScanDesc scan;
 
 	/* ----------------
 	 *	if we haven't materialized yet, just return.
@@ -414,8 +410,8 @@ ExecMaterialRestrPos(Material node)
 	 *	restore the scan to the previously marked position
 	 * ----------------
 	 */
-	sdesc = get_css_currentScanDesc((CommonScanState) matstate);
-	heap_restrpos(sdesc);
+	scan = get_css_currentScanDesc((CommonScanState) matstate);
+	heap_restrpos(scan);
 }
 
 #endif