Commitfe8f15d

committed

Adjust pg_upgrade error message, array freeing, and add error check.

1 parentf5fc1de commitfe8f15dCopy full SHA for fe8f15d

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -362,8 +362,6 @@ check_new_db_is_empty(void)`
`362`	`362`	`}`
`363`	`363`	`}`
`364`	`364`
`365`		`-free_db_and_rel_infos(&new_cluster.dbarr);`
`366`		`-`
`367`	`365`	`if (found)`
`368`	`366`	`pg_log(PG_FATAL,"New cluster is not empty; exiting\n");`
`369`	`367`	`}`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,12 @@ create_rel_filename_map(const char old_data, const char new_data,`
`104`	`104`	`/* new_relfilenode will match old and new pg_class.oid */`
`105`	`105`	`map->new_relfilenode=new_rel->relfilenode;`
`106`	`106`
	`107`	`+if (strcmp(old_rel->nspname,new_rel->nspname)!=0\|\|`
	`108`	`+strcmp(old_rel->relname,new_rel->relname)!=0)`
	`109`	`+pg_log(PG_FATAL,"mismatch of relation id: database \"%s\", old rel %s.%s, new rel %s.%s\n",`
	`110`	`+old_db,old_rel->nspname,old_rel->relname,`
	`111`	`+new_rel->nspname,new_rel->relname);`
	`112`	`+`
`107`	`113`	`/* used only for logging and error reporing, old/new are identical */`
`108`	`114`	`snprintf(map->nspname,sizeof(map->nspname),"%s",old_rel->nspname);`
`109`	`115`	`snprintf(map->relname,sizeof(map->relname),"%s",old_rel->relname);`
`@@ -141,6 +147,9 @@ get_db_and_rel_infos(ClusterInfo *cluster)`
`141`	`147`	`{`
`142`	`148`	`intdbnum;`
`143`	`149`
	`150`	`+if (cluster->dbarr)`
	`151`	`+free_db_and_rel_infos(cluster->dbarr);`
	`152`	`+`
`144`	`153`	`get_db_infos(cluster);`
`145`	`154`
`146`	`155`	`for (dbnum=0;dbnum<cluster->dbarr.ndbs;dbnum++)`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,6 @@ create_new_objects(void)`
`286`	`286`	`check_ok();`
`287`	`287`
`288`	`288`	`/* regenerate now that we have objects in the databases */`
`289`		`-free_db_and_rel_infos(&new_cluster.dbarr);`
`290`	`289`	`get_db_and_rel_infos(&new_cluster);`
`291`	`290`
`292`	`291`	`uninstall_support_functions_from_new_cluster();`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ transfer_all_new_dbs(DbInfoArr *old_db_arr,`
`49`	`49`	`pageCnvCtx*pageConverter=NULL;`
`50`	`50`
`51`	`51`	`if (strcmp(old_db->db_name,new_db->db_name)!=0)`
`52`		`-pg_log(PG_FATAL,"old and new databases haveadifferent names: old \"%s\", new \"%s\"\n",`
	`52`	`+pg_log(PG_FATAL,"old and new databases have different names: old \"%s\", new \"%s\"\n",`
`53`	`53`	`old_db->db_name,new_db->db_name);`
`54`	`54`
`55`	`55`	`n_maps=0;`

Comments

(0)