Commit5e59584

committed

In pg_upgrade, because toast table names can be mismatched with the heap

oid on 8.4, modify the toast name comparison test to only apply to old9.0+ servers. (The test was previously 8.4+.)Backpatch to 9.1.X.

1 parenta32dd16 commit5e59584Copy full SHA for 5e59584

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,15 @@ gen_db_file_maps(DbInfo old_db, DbInfo new_db,`
`57`	`57`	`old_db->db_name,old_rel->reloid,new_rel->reloid);`
`58`	`58`
`59`	`59`	`/*`
`60`		`- * In pre-8.4, TOAST table names change during CLUSTER; in >= 8.4`
`61`		`- * TOAST relation names always use heap table oids, hence we cannot`
`62`		`- * check relation names when upgrading from pre-8.4.`
	`60`	`+ * TOAST table names initially match the heap pg_class oid.`
	`61`	`+ * In pre-8.4, TOAST table names change during CLUSTER; in pre-9.0,`
	`62`	`+ * TOAST table names change during ALTER TABLE ALTER COLUMN SET TYPE.`
	`63`	`+ * In >= 9.0, TOAST relation names always use heap table oids, hence`
	`64`	`+ * we cannot check relation names when upgrading from pre-9.0.`
	`65`	`+ * Clusters upgraded to 9.0 will get matching TOAST names.`
`63`	`66`	`*/`
`64`	`67`	`if (strcmp(old_rel->nspname,new_rel->nspname)!=0\|\|`
`65`		`-((GET_MAJOR_VERSION(old_cluster.major_version) >=804\|\|`
	`68`	`+((GET_MAJOR_VERSION(old_cluster.major_version) >=900\|\|`
`66`	`69`	`strcmp(old_rel->nspname,"pg_toast")!=0)&&`
`67`	`70`	`strcmp(old_rel->relname,new_rel->relname)!=0))`
`68`	`71`	`pg_log(PG_FATAL,"Mismatch of relation names in database \"%s\": "`

Comments

(0)