Ensure attcacheoff is written out as -1 when writing pg_attribute

tglsfdc · tglsfdc · commit 9315ff55492b · 2001-01-01T21:33:31.000Z
tuples for a relation.  Needed to prevent Assert failure in CLUSTER.
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.155 2000/12/27 23:59:11 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.156 2001/01/01 21:33:31 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -590,8 +590,11 @@ AddNewAttributeTuples(Oid new_rel_oid,
 	dpp = tupdesc->attrs;
 	for (i = 0; i < natts; i++)
 	{
+		/* Fill in the correct relation OID */
 		(*dpp)->attrelid = new_rel_oid;
+		/* Make sure these are OK, too */
 		(*dpp)->attdispersion = 0;
+		(*dpp)->attcacheoff = -1;
 
 		tup = heap_addheader(Natts_pg_attribute,
 							 ATTRIBUTE_TUPLE_SIZE,
@@ -613,8 +616,12 @@ AddNewAttributeTuples(Oid new_rel_oid,
 	dpp = HeapAtt;
 	for (i = 0; i < -1 - FirstLowInvalidHeapAttributeNumber; i++)
 	{
+		/* Fill in the correct relation OID */
+		/* HACK: we are writing on static data here */
 		(*dpp)->attrelid = new_rel_oid;
-		/* (*dpp)->attdispersion = 0;	   unneeded */
+		/* Unneeded since they should be OK in the constant data anyway */
+		/* (*dpp)->attdispersion = 0; */
+		/* (*dpp)->attcacheoff = -1; */
 
 		tup = heap_addheader(Natts_pg_attribute,
 							 ATTRIBUTE_TUPLE_SIZE,

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.155 2000/12/27 23:59:11 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.156 2001/01/01 21:33:31 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* INTERFACE ROUTINES`
`@@ -590,8 +590,11 @@ AddNewAttributeTuples(Oid new_rel_oid,`
`590`	`590`	`dpp = tupdesc->attrs;`
`591`	`591`	`for (i = 0; i < natts; i++)`
`592`	`592`	`{`
	`593`	`+ /* Fill in the correct relation OID */`
`593`	`594`	`(*dpp)->attrelid = new_rel_oid;`
	`595`	`+ /* Make sure these are OK, too */`
`594`	`596`	`(*dpp)->attdispersion = 0;`
	`597`	`+ (*dpp)->attcacheoff = -1;`
`595`	`598`
`596`	`599`	`tup = heap_addheader(Natts_pg_attribute,`
`597`	`600`	`ATTRIBUTE_TUPLE_SIZE,`
`@@ -613,8 +616,12 @@ AddNewAttributeTuples(Oid new_rel_oid,`
`613`	`616`	`dpp = HeapAtt;`
`614`	`617`	`for (i = 0; i < -1 - FirstLowInvalidHeapAttributeNumber; i++)`
`615`	`618`	`{`
	`619`	`+ /* Fill in the correct relation OID */`
	`620`	`+ /* HACK: we are writing on static data here */`
`616`	`621`	`(*dpp)->attrelid = new_rel_oid;`
`617`		`- /* (dpp)->attdispersion = 0; unneeded /`
	`622`	`+ /* Unneeded since they should be OK in the constant data anyway */`
	`623`	`+ /* (dpp)->attdispersion = 0; /`
	`624`	`+ /* (dpp)->attcacheoff = -1; /`
`618`	`625`
`619`	`626`	`tup = heap_addheader(Natts_pg_attribute,`
`620`	`627`	`ATTRIBUTE_TUPLE_SIZE,`