From 7971539020a344dce3a8b3b9b93ff4f10e2f823a Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 19 Aug 1998 02:04:17 +0000
Subject: 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;

---
 src/backend/commands/cluster.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/backend/commands/cluster.c')

diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index b31ee63e201..6f291cf7a38 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.27 1998/08/06 05:12:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.28 1998/08/19 02:01:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -128,7 +128,7 @@ cluster(char oldrelname[], char oldindexname[])
 		elog(ERROR, "cluster: unknown relation: \"%s\"",
 			 oldrelname);
 	}
-	OIDOldHeap = OldHeap->rd_id;/* Get OID for the index scan	*/
+	OIDOldHeap = RelationGetRelid(OldHeap);/* Get OID for the index scan	*/
 
 	OldIndex = index_openr(oldindexname);		/* Open old index relation	*/
 	if (!RelationIsValid(OldIndex))
@@ -136,7 +136,7 @@ cluster(char oldrelname[], char oldindexname[])
 		elog(ERROR, "cluster: unknown index: \"%s\"",
 			 oldindexname);
 	}
-	OIDOldIndex = OldIndex->rd_id;		/* OID for the index scan		  */
+	OIDOldIndex = RelationGetRelid(OldIndex);		/* OID for the index scan		  */
 
 	heap_close(OldHeap);
 	index_close(OldIndex);
@@ -150,7 +150,7 @@ cluster(char oldrelname[], char oldindexname[])
 	 * with a pg_vlock.
 	 */
 	NewHeap = copy_heap(OIDOldHeap);
-	OIDNewHeap = NewHeap->rd_id;
+	OIDNewHeap = RelationGetRelid(NewHeap);
 	strcpy(NewHeapName, NewHeap->rd_rel->relname.data);
 
 
@@ -257,7 +257,7 @@ copy_index(Oid OIDOldIndex, Oid OIDNewHeap)
 	 */
 	Old_pg_index_Tuple =
 		SearchSysCacheTuple(INDEXRELID,
-							ObjectIdGetDatum(OldIndex->rd_id),
+							ObjectIdGetDatum(RelationGetRelid(OldIndex)),
 							0, 0, 0);
 
 	Assert(Old_pg_index_Tuple);
@@ -265,7 +265,7 @@ copy_index(Oid OIDOldIndex, Oid OIDNewHeap)
 
 	Old_pg_index_relation_Tuple =
 		SearchSysCacheTuple(RELOID,
-							ObjectIdGetDatum(OldIndex->rd_id),
+							ObjectIdGetDatum(RelationGetRelid(OldIndex)),
 							0, 0, 0);
 
 	Assert(Old_pg_index_relation_Tuple);
-- 
cgit v1.2.3