Commit7bed6df

committed

Check only live tuples for OID validity, to avoid issues after ALTER

TABLE. Per recent discussion.

1 parent1ecd035 commit7bed6dfCopy full SHA for 7bed6df

File tree

+18

-18

lines changed

+18

-18

lines changed

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.273 2004/02/10 03:42:43 tgl Exp $`
	`16`	`+ * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.274 2004/02/12 05:39:55 tgl Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -1178,6 +1178,14 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,`
`1178`	`1178`	`Assert(tuple.t_data->t_infomask&HEAP_XMIN_COMMITTED);`
`1179`	`1179`	`pgchanged= true;`
`1180`	`1180`	`}`
	`1181`	`+`
	`1182`	`+/*`
	`1183`	`+ * Other checks...`
	`1184`	`+ */`
	`1185`	`+if (onerel->rd_rel->relhasoids&&`
	`1186`	`+!OidIsValid(HeapTupleGetOid(&tuple)))`
	`1187`	`+elog(WARNING,"relation \"%s\" TID %u/%u: OID is invalid",`
	`1188`	`+relname,blkno,offnum);`
`1181`	`1189`	`break;`
`1182`	`1190`	`caseHEAPTUPLE_RECENTLY_DEAD:`
`1183`	`1191`
`@@ -1244,14 +1252,6 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,`
`1244`	`1252`	`if (sv_infomask!=tuple.t_data->t_infomask)`
`1245`	`1253`	`pgchanged= true;`
`1246`	`1254`
`1247`		`-/*`
`1248`		`- * Other checks...`
`1249`		`- */`
`1250`		`-if (onerel->rd_rel->relhasoids&&`
`1251`		`-!OidIsValid(HeapTupleGetOid(&tuple)))`
`1252`		`-elog(WARNING,"relation \"%s\" TID %u/%u: OID is invalid",`
`1253`		`-relname,blkno,offnum);`
`1254`		`-`
`1255`	`1255`	`if (tupgone)`
`1256`	`1256`	`{`
`1257`	`1257`	`ItemIdlpp;`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`*`
`32`	`32`	`*`
`33`	`33`	`* IDENTIFICATION`
`34`		`- * $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.37 2004/02/10 03:42:44 tgl Exp $`
	`34`	`+ * $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.38 2004/02/12 05:39:55 tgl Exp $`
`35`	`35`	`*`
`36`	`36`	`*-------------------------------------------------------------------------`
`37`	`37`	`*/`
`@@ -336,6 +336,14 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,`
`336`	`336`	`Assert(tuple.t_data->t_infomask&HEAP_XMIN_COMMITTED);`
`337`	`337`	`pgchanged= true;`
`338`	`338`	`}`
	`339`	`+`
	`340`	`+/*`
	`341`	`+ * Other checks...`
	`342`	`+ */`
	`343`	`+if (onerel->rd_rel->relhasoids&&`
	`344`	`+!OidIsValid(HeapTupleGetOid(&tuple)))`
	`345`	`+elog(WARNING,"relation \"%s\" TID %u/%u: OID is invalid",`
	`346`	`+relname,blkno,offnum);`
`339`	`347`	`break;`
`340`	`348`	`caseHEAPTUPLE_RECENTLY_DEAD:`
`341`	`349`
`@@ -360,14 +368,6 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,`
`360`	`368`	`if (sv_infomask!=tuple.t_data->t_infomask)`
`361`	`369`	`pgchanged= true;`
`362`	`370`
`363`		`-/*`
`364`		`- * Other checks...`
`365`		`- */`
`366`		`-if (onerel->rd_rel->relhasoids&&`
`367`		`-!OidIsValid(HeapTupleGetOid(&tuple)))`
`368`		`-elog(WARNING,"relation \"%s\" TID %u/%u: OID is invalid",`
`369`		`-relname,blkno,offnum);`
`370`		`-`
`371`	`371`	`if (tupgone)`
`372`	`372`	`{`
`373`	`373`	`lazy_record_dead_tuple(vacrelstats,&(tuple.t_self));`

Comments

(0)