database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Cleanup ClusterInfo initialization in pg_upgrade

Browse Source
This commit is contained in:
Alvaro Herrera
2011-02-16 14:06:17 -03:00
parent 3a087369c0
commit b4a7e5980b
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/pg_upgrade/info.c
View File

@ -22,6 +22,12 @@ static void free_rel_infos(RelInfoArr *rel_arr);
static void print_db_infos(DbInfoArr *dbinfo); static void print_db_infos(DbInfoArr *dbinfo);
static void print_rel_infos(RelInfoArr *arr); static void print_rel_infos(RelInfoArr *arr);
void
initialize_cluster_info(ClusterInfo *cluster)
{
cluster->dbarr.ndbs = 0;
cluster->dbarr.dbs = NULL;
}
/* /*
* gen_db_file_maps() * gen_db_file_maps()

5
contrib/pg_upgrade/pg_upgrade.c
View File

@ -63,9 +63,10 @@ main(int argc, char **argv)
char *deletion_script_file_name = NULL; char *deletion_script_file_name = NULL;
bool live_check = false; bool live_check = false;
initialize_cluster_info(&old_cluster);
initialize_cluster_info(&new_cluster);
parseCommandLine(argc, argv); parseCommandLine(argc, argv);
old_cluster.dbarr.ndbs = 0;
new_cluster.dbarr.ndbs = 0;
output_check_banner(&live_check); output_check_banner(&live_check);

1
contrib/pg_upgrade/pg_upgrade.h
View File

@ -326,6 +326,7 @@ void check_loadable_libraries(void);
/* info.c */ /* info.c */
void initialize_cluster_info(ClusterInfo *cluster);
FileNameMap *gen_db_file_maps(DbInfo *old_db, FileNameMap *gen_db_file_maps(DbInfo *old_db,
DbInfo *new_db, int *nmaps, const char *old_pgdata, DbInfo *new_db, int *nmaps, const char *old_pgdata,
const char *new_pgdata); const char *new_pgdata);