Make the system-attributes loop in AddNewAttributeTuples depend on

tglsfdc · tglsfdc · commit ce0fb501d9be · 2008-10-14T23:27:40.000Z
lengthof(SysAtt) not FirstLowInvalidHeapAttributeNumber, for consistency with
the other uses of the SysAtt array, and to make it clearer that it doesn't
walk off the end of that array.
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.340 2008/09/30 10:52:12 heikki Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.341 2008/10/14 23:27:40 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -551,7 +551,7 @@ AddNewAttributeTuples(Oid new_rel_oid,
 	if (relkind != RELKIND_VIEW && relkind != RELKIND_COMPOSITE_TYPE)
 	{
 		dpp = SysAtt;
-		for (i = 0; i < -1 - FirstLowInvalidHeapAttributeNumber; i++)
+		for (i = 0; i < (int) lengthof(SysAtt); i++, dpp++)
 		{
 			if (tupdesc->tdhasoid ||
 				(*dpp)->attnum != ObjectIdAttributeNumber)
@@ -587,7 +587,6 @@ AddNewAttributeTuples(Oid new_rel_oid,
 
 				heap_freetuple(tup);
 			}
-			dpp++;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.340 2008/09/30 10:52:12 heikki Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.341 2008/10/14 23:27:40 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* INTERFACE ROUTINES`
`@@ -551,7 +551,7 @@ AddNewAttributeTuples(Oid new_rel_oid,`
`551`	`551`	`if (relkind != RELKIND_VIEW && relkind != RELKIND_COMPOSITE_TYPE)`
`552`	`552`	`{`
`553`	`553`	`dpp = SysAtt;`
`554`		`- for (i = 0; i < -1 - FirstLowInvalidHeapAttributeNumber; i++)`
	`554`	`+ for (i = 0; i < (int) lengthof(SysAtt); i++, dpp++)`
`555`	`555`	`{`
`556`	`556`	`if (tupdesc->tdhasoid \|\|`
`557`	`557`	`(*dpp)->attnum != ObjectIdAttributeNumber)`
`@@ -587,7 +587,6 @@ AddNewAttributeTuples(Oid new_rel_oid,`
`587`	`587`
`588`	`588`	`heap_freetuple(tup);`
`589`	`589`	`}`
`590`		`- dpp++;`
`591`	`590`	`}`
`592`	`591`	`}`
`593`	`592`