Fix pg_upgrade to properly upgrade a table that is stored in the cluster

default tablespace, but part of a database that is in a user-defined
tablespace.  Caused "file not found" error during upgrade.

Per bug report from Ants Aasma.

Backpatch to 9.1 and 9.0.

diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index 1f5b7ae70bff4f35705d48aba8f238320bd7bdff..02d3e0f52f0c5be88e63357fdc6b1dbb0efc0e81 100644 (file)
--- a/contrib/pg_upgrade/info.c
+++ b/contrib/pg_upgrade/info.c
@@ -306,6 +306,7 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
    int         i_relname = -1;
    int         i_oid = -1;
    int         i_relfilenode = -1;
+   int         i_reltablespace = -1;
    int         i_reltoastrelid = -1;
    char        query[QUERY_ALLOC];
 
@@ -320,7 +321,7 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
 
    snprintf(query, sizeof(query),
             "SELECT DISTINCT c.oid, n.nspname, c.relname, "
-            "  c.relfilenode, c.reltoastrelid, t.spclocation "
+            "  c.relfilenode, c.reltoastrelid, c.reltablespace, t.spclocation "
             "FROM pg_catalog.pg_class c JOIN "
             "      pg_catalog.pg_namespace n "
             "  ON c.relnamespace = n.oid "
@@ -339,7 +340,7 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
             "        ('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, "
+            "          c.reltoastrelid, c.reltablespace, t.spclocation, "
             "          n.nspname "
             "ORDER BY n.nspname, c.relname;",
             FirstNormalObjectId,
@@ -361,6 +362,7 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
    i_relname = PQfnumber(res, "relname");
    i_relfilenode = PQfnumber(res, "relfilenode");
    i_reltoastrelid = PQfnumber(res, "reltoastrelid");
+   i_reltablespace = PQfnumber(res, "reltablespace");
    i_spclocation = PQfnumber(res, "spclocation");
 
    for (relnum = 0; relnum < ntups; relnum++)
@@ -379,10 +381,13 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
        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 */
-       if (strlen(tblspace) == 0)
+       if (atooid(PQgetvalue(res, relnum, i_reltablespace)) != 0)
+           /* Might be "", meaning the cluster default location. */
+           tblspace = PQgetvalue(res, relnum, i_spclocation);
+       else
+           /* A zero reltablespace indicates the database tablespace. */
            tblspace = dbinfo->db_tblspace;
+
        strlcpy(curr->tablespace, tblspace, sizeof(curr->tablespace));
    }
    PQclear(res);

diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index 7a02fa1946b21fc8c373776124e005c00b4d0439..bfcabb390e0bcd8df0441d28052dd5175332f9e6 100644 (file)
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -69,7 +69,8 @@ typedef struct
    Oid         reloid;         /* relation oid              */
    Oid         relfilenode;    /* relation relfile node     */
    Oid         toastrelid;     /* oid of the toast relation */
-   char        tablespace[MAXPGPATH];  /* relations tablespace path */
+   /* relation tablespace path, or "" for the cluster default */
+   char        tablespace[MAXPGPATH];  
 } RelInfo;
 
 typedef struct