diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 74449df73d6dd69cdbc58ae2c7570c8eb991ca96..fc82be47937397d93f8fa55e13c1d2392129b3b1 100644
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -362,7 +362,7 @@ check_new_db_is_empty(void)
}
}
- dbarr_free(&new_cluster.dbarr);
+ free_db_and_rel_infos(&new_cluster.dbarr);
if (found)
pg_log(PG_FATAL, "New cluster is not empty; exiting\n");
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index c805a04e1246cbecb14714f5a47ae69eba405e32..c0412311d9efd1f69cbe8bbc16b9e7bc8484b121 100644
--- a/contrib/pg_upgrade/info.c
+++ b/contrib/pg_upgrade/info.c
@@ -12,15 +12,15 @@
#include "access/transam.h"
-static void get_db_infos(ClusterInfo *cluster);
-static void print_db_arr(ClusterInfo *cluster);
-static void print_rel_arr(RelInfoArr *arr);
-static void get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo);
-static void free_rel_arr(RelInfoArr *rel_arr);
static void create_rel_filename_map(const char *old_data, const char *new_data,
const DbInfo *old_db, const DbInfo *new_db,
const RelInfo *old_rel, const RelInfo *new_rel,
FileNameMap *map);
+static void get_db_infos(ClusterInfo *cluster);
+static void get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo);
+static void free_rel_infos(RelInfoArr *rel_arr);
+static void print_db_infos(DbInfoArr *dbinfo);
+static void print_rel_infos(RelInfoArr *arr);
/*
@@ -111,15 +111,15 @@ create_rel_filename_map(const char *old_data, const char *new_data,
void
-print_maps(FileNameMap *maps, int n, const char *dbName)
+print_maps(FileNameMap *maps, int n_maps, const char *db_name)
{
if (log_opts.debug)
{
int mapnum;
- pg_log(PG_DEBUG, "mappings for db %s:\n", dbName);
+ pg_log(PG_DEBUG, "mappings for db %s:\n", db_name);
- for (mapnum = 0; mapnum < n; mapnum++)
+ for (mapnum = 0; mapnum < n_maps; mapnum++)
pg_log(PG_DEBUG, "%s.%s: %u to %u\n",
maps[mapnum].nspname, maps[mapnum].relname,
maps[mapnum].old_relfilenode,
@@ -130,6 +130,30 @@ print_maps(FileNameMap *maps, int n, const char *dbName)
}
+/*
+ * get_db_and_rel_infos()
+ *
+ * higher level routine to generate dbinfos for the database running
+ * on the given "port". Assumes that server is already running.
+ */
+void
+get_db_and_rel_infos(ClusterInfo *cluster)
+{
+ int dbnum;
+
+ get_db_infos(cluster);
+
+ for (dbnum = 0; dbnum < cluster->dbarr.ndbs; dbnum++)
+ get_rel_infos(cluster, &cluster->dbarr.dbs[dbnum]);
+
+ if (log_opts.debug)
+ {
+ pg_log(PG_DEBUG, "%s databases\n", CLUSTER_NAME(cluster));
+ print_db_infos(&cluster->dbarr);
+ }
+}
+
+
/*
* get_db_infos()
*
@@ -144,9 +168,7 @@ get_db_infos(ClusterInfo *cluster)
int ntups;
int tupnum;
DbInfo *dbinfos;
- int i_datname;
- int i_oid;
- int i_spclocation;
+ int i_datname, i_oid, i_spclocation;
res = executeQueryOrDie(conn,
"SELECT d.oid, d.datname, t.spclocation "
@@ -182,27 +204,6 @@ get_db_infos(ClusterInfo *cluster)
}
-/*
- * get_db_and_rel_infos()
- *
- * higher level routine to generate dbinfos for the database running
- * on the given "port". Assumes that server is already running.
- */
-void
-get_db_and_rel_infos(ClusterInfo *cluster)
-{
- int dbnum;
-
- get_db_infos(cluster);
-
- for (dbnum = 0; dbnum < cluster->dbarr.ndbs; dbnum++)
- get_rel_infos(cluster, &cluster->dbarr.dbs[dbnum]);
-
- if (log_opts.debug)
- print_db_arr(cluster);
-}
-
-
/*
* get_rel_infos()
*
@@ -224,27 +225,20 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
int num_rels = 0;
char *nspname = NULL;
char *relname = NULL;
- int i_spclocation = -1;
- int i_nspname = -1;
- int i_relname = -1;
- int i_oid = -1;
- int i_relfilenode = -1;
- int i_reltoastrelid = -1;
+ int i_spclocation, i_nspname, i_relname, i_oid, i_relfilenode;
char query[QUERY_ALLOC];
/*
* pg_largeobject contains user data that does not appear in pg_dumpall
* --schema-only output, so we have to copy that system table heap and
- * index. Ideally we could just get the relfilenode from template1 but
- * pg_largeobject_loid_pn_index's relfilenode can change if the table was
- * reindexed so we get the relfilenode for each database and upgrade it as
- * a normal user table.
- * Order by tablespace so we can cache the directory contents efficiently.
+ * index. We could grab the pg_largeobject oids from template1, but
+ * it is easy to treat it as a normal table.
+ * Order by oid so we can join old/new structures efficiently.
*/
snprintf(query, sizeof(query),
- "SELECT DISTINCT c.oid, n.nspname, c.relname, "
- " c.relfilenode, c.reltoastrelid, t.spclocation "
+ "SELECT c.oid, n.nspname, c.relname, "
+ " c.relfilenode, t.spclocation "
"FROM pg_catalog.pg_class c JOIN "
" pg_catalog.pg_namespace n "
" ON c.relnamespace = n.oid "
@@ -256,10 +250,7 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
" n.nspname = 'pg_catalog' "
" AND relname IN "
" ('pg_largeobject', 'pg_largeobject_loid_pn_index'%s) )) "
- " AND relkind IN ('r','t', 'i'%s)"
- "GROUP BY c.oid, n.nspname, c.relname, c.relfilenode,"
- " c.reltoastrelid, t.spclocation, "
- " n.nspname "
+ " AND relkind IN ('r','t', 'i'%s) "
/* we preserve pg_class.oid so we sort by it to match old/new */
"ORDER BY 1;",
FirstNormalObjectId,
@@ -280,7 +271,6 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
i_nspname = PQfnumber(res, "nspname");
i_relname = PQfnumber(res, "relname");
i_relfilenode = PQfnumber(res, "relfilenode");
- i_reltoastrelid = PQfnumber(res, "reltoastrelid");
i_spclocation = PQfnumber(res, "spclocation");
for (relnum = 0; relnum < ntups; relnum++)
@@ -297,7 +287,6 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
strlcpy(curr->relname, relname, sizeof(curr->relname));
curr->relfilenode = atooid(PQgetvalue(res, relnum, i_relfilenode));
- curr->toastrelid = atooid(PQgetvalue(res, relnum, i_reltoastrelid));
tblspace = PQgetvalue(res, relnum, i_spclocation);
/* if no table tablespace, use the database tablespace */
@@ -314,43 +303,42 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
}
-static void
-free_rel_arr(RelInfoArr *rel_arr)
-{
- pg_free(rel_arr->rels);
- rel_arr->nrels = 0;
-}
-
-
void
-dbarr_free(DbInfoArr *db_arr)
+free_db_and_rel_infos(DbInfoArr *db_arr)
{
int dbnum;
for (dbnum = 0; dbnum < db_arr->ndbs; dbnum++)
- free_rel_arr(&db_arr->dbs[dbnum].rel_arr);
+ free_rel_infos(&db_arr->dbs[dbnum].rel_arr);
+ pg_free(db_arr->dbs);
db_arr->ndbs = 0;
}
static void
-print_db_arr(ClusterInfo *cluster)
+free_rel_infos(RelInfoArr *rel_arr)
{
- int dbnum;
+ pg_free(rel_arr->rels);
+ rel_arr->nrels = 0;
+}
- pg_log(PG_DEBUG, "%s databases\n", CLUSTER_NAME(cluster));
- for (dbnum = 0; dbnum < cluster->dbarr.ndbs; dbnum++)
+static void
+print_db_infos(DbInfoArr *db_arr)
+{
+ int dbnum;
+
+ for (dbnum = 0; dbnum < db_arr->ndbs; dbnum++)
{
- pg_log(PG_DEBUG, "Database: %s\n", cluster->dbarr.dbs[dbnum].db_name);
- print_rel_arr(&cluster->dbarr.dbs[dbnum].rel_arr);
+ pg_log(PG_DEBUG, "Database: %s\n", db_arr->dbs[dbnum].db_name);
+ print_rel_infos(&db_arr->dbs[dbnum].rel_arr);
pg_log(PG_DEBUG, "\n\n");
}
}
static void
-print_rel_arr(RelInfoArr *arr)
+print_rel_infos(RelInfoArr *arr)
{
int relnum;
diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c
index 485412d22ae7a5264f7b9e229726c66f8c427aea..294f58beaa6ccf833516a6d336f987265e2a00cd 100644
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -281,7 +281,7 @@ create_new_objects(void)
check_ok();
/* regenerate now that we have objects in the databases */
- dbarr_free(&new_cluster.dbarr);
+ free_db_and_rel_infos(&new_cluster.dbarr);
get_db_and_rel_infos(&new_cluster);
uninstall_support_functions_from_new_cluster();
@@ -428,8 +428,8 @@ cleanup(void)
pg_free(os_info.tablespaces[tblnum]);
pg_free(os_info.tablespaces);
- dbarr_free(&old_cluster.dbarr);
- dbarr_free(&new_cluster.dbarr);
+ free_db_and_rel_infos(&old_cluster.dbarr);
+ free_db_and_rel_infos(&new_cluster.dbarr);
pg_free(log_opts.filename);
pg_free(os_info.user);
pg_free(old_cluster.controldata.lc_collate);
diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index 18cbc1933ba6aab8defd5403d364b7ad54ca5b4e..446195273c1cf307e331c3822a421af8c3e62447 100644
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -69,7 +69,6 @@ typedef struct
char relname[NAMEDATALEN]; /* relation name */
Oid reloid; /* relation oid */
Oid relfilenode; /* relation relfile node */
- Oid toastrelid; /* oid of the toast relation */
char tablespace[MAXPGPATH]; /* relations tablespace path */
} RelInfo;
@@ -331,9 +330,9 @@ FileNameMap *gen_db_file_maps(DbInfo *old_db,
DbInfo *new_db, int *nmaps, const char *old_pgdata,
const char *new_pgdata);
void get_db_and_rel_infos(ClusterInfo *cluster);
-void dbarr_free(DbInfoArr *db_arr);
-void print_maps(FileNameMap *maps, int n,
- const char *dbName);
+void free_db_and_rel_infos(DbInfoArr *db_arr);
+void print_maps(FileNameMap *maps, int n,
+ const char *db_name);
/* option.c */