Commit9315ff5

committed

Ensure attcacheoff is written out as -1 when writing pg_attribute

tuples for a relation. Needed to prevent Assert failure in CLUSTER.

1 parent473763e commit9315ff5Copy full SHA for 9315ff5

File tree

-2

lines changed

-2

lines changed

Lines changed: 9 additions & 2 deletions

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,`

Comments

(0)