diff options
Diffstat (limited to 'src/bin/pg_dump/pg_dump.c')
| -rw-r--r-- | src/bin/pg_dump/pg_dump.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index c871cb727d1..f317f0a681f 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -4804,15 +4804,15 @@ binary_upgrade_set_pg_class_oids(Archive *fout, { PQExpBuffer upgrade_query = createPQExpBuffer(); PGresult *upgrade_res; - Oid relfilenode; + RelFileNumber relfilenumber; Oid toast_oid; - Oid toast_relfilenode; + RelFileNumber toast_relfilenumber; char relkind; Oid toast_index_oid; - Oid toast_index_relfilenode; + RelFileNumber toast_index_relfilenumber; /* - * Preserve the OID and relfilenode of the table, table's index, table's + * Preserve the OID and relfilenumber of the table, table's index, table's * toast table and toast table's index if any. * * One complexity is that the current table definition might not require @@ -4835,16 +4835,16 @@ binary_upgrade_set_pg_class_oids(Archive *fout, relkind = *PQgetvalue(upgrade_res, 0, PQfnumber(upgrade_res, "relkind")); - relfilenode = atooid(PQgetvalue(upgrade_res, 0, - PQfnumber(upgrade_res, "relfilenode"))); + relfilenumber = atooid(PQgetvalue(upgrade_res, 0, + PQfnumber(upgrade_res, "relfilenode"))); toast_oid = atooid(PQgetvalue(upgrade_res, 0, PQfnumber(upgrade_res, "reltoastrelid"))); - toast_relfilenode = atooid(PQgetvalue(upgrade_res, 0, - PQfnumber(upgrade_res, "toast_relfilenode"))); + toast_relfilenumber = atooid(PQgetvalue(upgrade_res, 0, + PQfnumber(upgrade_res, "toast_relfilenode"))); toast_index_oid = atooid(PQgetvalue(upgrade_res, 0, PQfnumber(upgrade_res, "indexrelid"))); - toast_index_relfilenode = atooid(PQgetvalue(upgrade_res, 0, - PQfnumber(upgrade_res, "toast_index_relfilenode"))); + toast_index_relfilenumber = atooid(PQgetvalue(upgrade_res, 0, + PQfnumber(upgrade_res, "toast_index_relfilenode"))); appendPQExpBufferStr(upgrade_buffer, "\n-- For binary upgrade, must preserve pg_class oids and relfilenodes\n"); @@ -4857,13 +4857,13 @@ binary_upgrade_set_pg_class_oids(Archive *fout, /* * Not every relation has storage. Also, in a pre-v12 database, - * partitioned tables have a relfilenode, which should not be + * partitioned tables have a relfilenumber, which should not be * preserved when upgrading. */ - if (OidIsValid(relfilenode) && relkind != RELKIND_PARTITIONED_TABLE) + if (RelFileNumberIsValid(relfilenumber) && relkind != RELKIND_PARTITIONED_TABLE) appendPQExpBuffer(upgrade_buffer, "SELECT pg_catalog.binary_upgrade_set_next_heap_relfilenode('%u'::pg_catalog.oid);\n", - relfilenode); + relfilenumber); /* * In a pre-v12 database, partitioned tables might be marked as having @@ -4877,7 +4877,7 @@ binary_upgrade_set_pg_class_oids(Archive *fout, toast_oid); appendPQExpBuffer(upgrade_buffer, "SELECT pg_catalog.binary_upgrade_set_next_toast_relfilenode('%u'::pg_catalog.oid);\n", - toast_relfilenode); + toast_relfilenumber); /* every toast table has an index */ appendPQExpBuffer(upgrade_buffer, @@ -4885,20 +4885,20 @@ binary_upgrade_set_pg_class_oids(Archive *fout, toast_index_oid); appendPQExpBuffer(upgrade_buffer, "SELECT pg_catalog.binary_upgrade_set_next_index_relfilenode('%u'::pg_catalog.oid);\n", - toast_index_relfilenode); + toast_index_relfilenumber); } PQclear(upgrade_res); } else { - /* Preserve the OID and relfilenode of the index */ + /* Preserve the OID and relfilenumber of the index */ appendPQExpBuffer(upgrade_buffer, "SELECT pg_catalog.binary_upgrade_set_next_index_pg_class_oid('%u'::pg_catalog.oid);\n", pg_class_oid); appendPQExpBuffer(upgrade_buffer, "SELECT pg_catalog.binary_upgrade_set_next_index_relfilenode('%u'::pg_catalog.oid);\n", - relfilenode); + relfilenumber); } appendPQExpBufferChar(upgrade_buffer, '\n'); |