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;

Author: bmomjian

src/backend/access/common/heaptuple.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.38 1998/06/15 19:27:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.39 1998/08/19 02:00:53 momjian Exp $
  *
  * NOTES
  *	  The old interface functions have been converted to macros
@@ -736,13 +736,6 @@ heap_copytuple(HeapTuple tuple)
 	if (!HeapTupleIsValid(tuple))
 		return (NULL);
 
-	/* XXX For now, just prevent an undetectable executor related error */
-	if (tuple->t_len > MAXTUPLEN)
-	{
-		elog(ERROR, "palloctup: cannot handle length %d tuples",
-			 tuple->t_len);
-	}
-
 	newTuple = (HeapTuple) palloc(tuple->t_len);
 	memmove((char *) newTuple, (char *) tuple, (int) tuple->t_len);
 	return (newTuple);
@@ -863,11 +856,11 @@ heap_formtuple(TupleDesc tupleDescriptor,
  *		heap_modifytuple
  *
  *		forms a new tuple from an old tuple and a set of replacement values.
+ *		returns a new palloc'ed tuple.
  * ----------------
  */
 HeapTuple
 heap_modifytuple(HeapTuple tuple,
-				 Buffer buffer,
 				 Relation relation,
 				 Datum replValue[],
 				 char replNull[],
@@ -879,34 +872,18 @@ heap_modifytuple(HeapTuple tuple,
 	char	   *nulls;
 	bool		isNull;
 	HeapTuple	newTuple;
-	int			madecopy;
 	uint8		infomask;
 
 	/* ----------------
 	 *	sanity checks
 	 * ----------------
 	 */
 	Assert(HeapTupleIsValid(tuple));
-	Assert(BufferIsValid(buffer) || RelationIsValid(relation));
-	Assert(HeapTupleIsValid(tuple));
+	Assert(RelationIsValid(relation));
 	Assert(PointerIsValid(replValue));
 	Assert(PointerIsValid(replNull));
 	Assert(PointerIsValid(repl));
 
-	/* ----------------
-	 *	if we're pointing to a disk page, then first
-	 *	make a copy of our tuple so that all the attributes
-	 *	are available.	XXX this is inefficient -cim
-	 * ----------------
-	 */
-	madecopy = 0;
-	if (BufferIsValid(buffer) == true)
-	{
-		relation = (Relation) BufferGetRelation(buffer);
-		tuple = heap_copytuple(tuple);
-		madecopy = 1;
-	}
-
 	numberOfAttributes = RelationGetRelationTupleForm(relation)->relnatts;
 
 	/* ----------------
@@ -933,10 +910,7 @@ heap_modifytuple(HeapTuple tuple,
 
 		}
 		else if (repl[attoff] != 'r')
-		{
 			elog(ERROR, "heap_modifytuple: repl is \\%3d", repl[attoff]);
-
-		}
 		else
 		{						/* == 'r' */
 			value[attoff] = replValue[attoff];
@@ -961,18 +935,8 @@ heap_modifytuple(HeapTuple tuple,
 			(char *) &tuple->t_oid,
 			((char *) &tuple->t_hoff - (char *) &tuple->t_oid));		/* XXX */
 	newTuple->t_infomask = infomask;
-	newTuple->t_natts = numberOfAttributes;		/* fix t_natts just in
-												 * case */
-
-	/* ----------------
-	 *	if we made a copy of the tuple, then free it.
-	 * ----------------
-	 */
-	if (madecopy)
-		pfree(tuple);
-
-	return
-		newTuple;
+	newTuple->t_natts = numberOfAttributes;		/* fix t_natts just in case */
+	return newTuple;
 }
 
 /* ----------------------------------------------------------------

src/backend/access/common/printtup.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.31 1998/07/26 04:30:16 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.32 1998/08/19 02:00:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,8 +46,7 @@ typtoout(Oid type)
 									0, 0, 0);
 
 	if (HeapTupleIsValid(typeTuple))
-		return ((Oid)
-				((TypeTupleForm) GETSTRUCT(typeTuple))->typoutput);
+		return ((Oid) ((TypeTupleForm) GETSTRUCT(typeTuple))->typoutput);
 
 	elog(ERROR, "typtoout: Cache lookup of type %d failed", type);
 	return (InvalidOid);
@@ -63,8 +62,7 @@ gettypelem(Oid type)
 									0, 0, 0);
 
 	if (HeapTupleIsValid(typeTuple))
-		return ((Oid)
-				((TypeTupleForm) GETSTRUCT(typeTuple))->typelem);
+		return ((Oid) ((TypeTupleForm) GETSTRUCT(typeTuple))->typelem);
 
 	elog(ERROR, "typtoout: Cache lookup of type %d failed", type);
 	return (InvalidOid);

src/backend/access/common/tupdesc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.41 1998/07/12 21:29:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.42 1998/08/19 02:00:56 momjian Exp $
  *
  * NOTES
  *	  some of the executor utility code such as "ExecTypeFromTL" should be
@@ -327,7 +327,8 @@ TupleDescInitEntry(TupleDesc desc,
 	 *	-cim 6/14/90
 	 * ----------------
 	 */
-	tuple = SearchSysCacheTuple(TYPOID, ObjectIdGetDatum(typeid),
+	tuple = SearchSysCacheTuple(TYPOID,
+								ObjectIdGetDatum(typeid),
 								0, 0, 0);
 	if (!HeapTupleIsValid(tuple))
 	{

src/backend/access/gist/gist.c

@@ -87,7 +87,6 @@ gistbuild(Relation heap,
 		  PredInfo *predInfo)
 {
 	HeapScanDesc scan;
-	Buffer		buffer;
 	AttrNumber	i;
 	HeapTuple	htup;
 	IndexTuple	itup;
@@ -112,14 +111,15 @@ gistbuild(Relation heap,
 			   *oldPred;
 	GISTSTATE	giststate;
 	GISTENTRY	tmpcentry;
+	Buffer		buffer = InvalidBuffer;
 	bool	   *compvec;
 
 	/* GiSTs only know how to do stupid locking now */
 	RelationSetLockForWrite(index);
 
-	setheapoverride(TRUE);		/* so we can see the new pg_index tuple */
+	setheapoverride(true);		/* so we can see the new pg_index tuple */
 	initGISTstate(&giststate, index);
-	setheapoverride(FALSE);
+	setheapoverride(false);
 
 	pred = predInfo->pred;
 	oldPred = predInfo->oldPred;
@@ -170,15 +170,13 @@ gistbuild(Relation heap,
 		econtext = NULL;
 	}
 #endif							/* OMIT_PARTIAL_INDEX */
-	scan = heap_beginscan(heap, 0, SnapshotNow, 0, (ScanKey) NULL);
-	htup = heap_getnext(scan, 0, &buffer);
-
 	/* int the tuples as we insert them */
 	nh = ni = 0;
 
-	for (; HeapTupleIsValid(htup); htup = heap_getnext(scan, 0, &buffer))
-	{
+	scan = heap_beginscan(heap, 0, SnapshotNow, 0, (ScanKey) NULL);
 
+	while (HeapTupleIsValid(htup = heap_getnext(scan, 0)))
+	{
 		nh++;
 
 		/*
@@ -240,8 +238,7 @@ gistbuild(Relation heap,
 									  attoff,
 									  attnum,
 									  finfo,
-									  &attnull,
-									  buffer);
+									  &attnull);
 			nulls[attoff] = (attnull ? 'n' : ' ');
 		}
 
@@ -302,8 +299,8 @@ gistbuild(Relation heap,
 	 * flushed.  We close them to guarantee that they will be.
 	 */
 
-	hrelid = heap->rd_id;
-	irelid = index->rd_id;
+	hrelid = RelationGetRelid(heap);
+	irelid = RelationGetRelid(index);
 	heap_close(heap);
 	index_close(index);
 
@@ -1165,11 +1162,13 @@ initGISTstate(GISTSTATE *giststate, Relation index)
 	fmgr_info(equal_proc, &giststate->equalFn);
 
 	/* see if key type is different from type of attribute being indexed */
-	htup = SearchSysCacheTuple(INDEXRELID, ObjectIdGetDatum(index->rd_id),
+	htup = SearchSysCacheTuple(INDEXRELID,
+							   ObjectIdGetDatum(RelationGetRelid(index)),
 							   0, 0, 0);
 	itupform = (IndexTupleForm) GETSTRUCT(htup);
 	if (!HeapTupleIsValid(htup))
-		elog(ERROR, "initGISTstate: index %d not found", index->rd_id);
+		elog(ERROR, "initGISTstate: index %d not found",
+		RelationGetRelid(index));
 	giststate->haskeytype = itupform->indhaskeytype;
 	if (giststate->haskeytype)
 	{

src/backend/access/gist/gistscan.c

@@ -284,12 +284,12 @@ gistdropscan(IndexScanDesc s)
 }
 
 void
-gistadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum)
+gistadjscans(Relation rel, int op, BlockNumber blkno, OffsetNumber offnum)
 {
 	GISTScanList l;
 	Oid			relid;
 
-	relid = r->rd_id;
+	relid = RelationGetRelid(rel);
 	for (l = GISTScans; l != (GISTScanList) NULL; l = l->gsl_next)
 	{
 		if (l->gsl_scan->relation->rd_id == relid)

src/backend/access/hash/hash.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.19 1998/07/27 19:37:35 vadim Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.20 1998/08/19 02:01:00 momjian Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -53,7 +53,6 @@ hashbuild(Relation heap,
 		  PredInfo *predInfo)
 {
 	HeapScanDesc hscan;
-	Buffer		buffer;
 	HeapTuple	htup;
 	IndexTuple	itup;
 	TupleDesc	htupdesc,
@@ -65,6 +64,7 @@ hashbuild(Relation heap,
 				nitups;
 	int			i;
 	HashItem	hitem;
+	Buffer		buffer = InvalidBuffer;
 
 #ifndef OMIT_PARTIAL_INDEX
 	ExprContext *econtext;
@@ -120,14 +120,13 @@ hashbuild(Relation heap,
 	}
 #endif							/* OMIT_PARTIAL_INDEX */
 
-	/* start a heap scan */
-	hscan = heap_beginscan(heap, 0, SnapshotNow, 0, (ScanKey) NULL);
-	htup = heap_getnext(hscan, 0, &buffer);
-
 	/* build the index */
 	nhtups = nitups = 0;
 
-	for (; HeapTupleIsValid(htup); htup = heap_getnext(hscan, 0, &buffer))
+	/* start a heap scan */
+	hscan = heap_beginscan(heap, 0, SnapshotNow, 0, (ScanKey) NULL);
+
+	while (HeapTupleIsValid(htup = heap_getnext(hscan, 0)))
 	{
 
 		nhtups++;
@@ -193,8 +192,7 @@ hashbuild(Relation heap,
 											attoff,
 											attnum,
 											finfo,
-											&attnull,
-											buffer);
+											&attnull);
 			nulls[attoff] = (attnull ? 'n' : ' ');
 		}
 
@@ -248,8 +246,8 @@ hashbuild(Relation heap,
 	 */
 	if (IsNormalProcessingMode())
 	{
-		hrelid = heap->rd_id;
-		irelid = index->rd_id;
+		hrelid = RelationGetRelid(heap);
+		irelid = RelationGetRelid(index);
 		heap_close(heap);
 		index_close(index);
 		UpdateStats(hrelid, nhtups, true);

src/backend/access/hash/hashfunc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.9 1998/04/26 04:05:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.10 1998/08/19 02:01:02 momjian Exp $
  *
  * NOTES
  *	  These functions are stored in pg_amproc.	For each operator class
@@ -133,6 +133,18 @@ hashoid(Oid key)
 	return ((uint32) ~key);
 }
 
+uint32
+hashoid8(Oid key[])
+{
+	int i;
+	uint32 result = 0;
+
+	for (i=0; i < 8; i++)
+		result = result ^ (~(uint32)key[i]);
+	return result;
+}
+
+
 #define PRIME1			37
 #define PRIME2			1048583
 

src/backend/access/hash/hashscan.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.14 1998/06/15 19:27:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.15 1998/08/19 02:01:04 momjian Exp $
  *
  * NOTES
  *	  Because we can be doing an index scan on a relation while we
@@ -90,7 +90,7 @@ _hash_adjscans(Relation rel, ItemPointer tid)
 	HashScanList l;
 	Oid			relid;
 
-	relid = rel->rd_id;
+	relid = RelationGetRelid(rel);
 	for (l = HashScans; l != (HashScanList) NULL; l = l->hashsl_next)
 	{
 		if (relid == l->hashsl_scan->relation->rd_id)