From 59fa6558a9258719840e4d423c86313937156f95 Mon Sep 17 00:00:00 2001 From: Nathan Bossart Date: Mon, 5 May 2025 14:11:56 -0500 Subject: [PATCH v1 1/1] pg_upgrade: Use COPY for large object metadata. --- src/bin/pg_dump/pg_backup_archiver.c | 5 +++++ src/bin/pg_dump/pg_dump.c | 16 +++++++++++++++- src/bin/pg_dump/pg_dump_sort.c | 2 +- src/bin/pg_dump/t/002_pg_dump.pl | 4 +++- src/bin/pg_upgrade/dump.c | 9 +++++++++ src/bin/pg_upgrade/pg_upgrade.c | 9 +++++++++ 6 files changed, 42 insertions(+), 3 deletions(-) diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index afa42337b11..0d61155ec0a 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -2974,6 +2974,11 @@ _tocEntryRequired(TocEntry *te, teSection curSection, ArchiveHandle *AH) int res = REQ_SCHEMA | REQ_DATA; RestoreOptions *ropt = AH->public.ropt; + if (ropt->binary_upgrade && + strcmp(te->tag, "pg_largeobject_metadata") == 0 && + strcmp(te->namespace, "pg_catalog") == 0) + return REQ_DATA; + /* These items are treated specially */ if (strcmp(te->desc, "ENCODING") == 0 || strcmp(te->desc, "STDSTRINGS") == 0 || diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index e2e7975b34e..312e1010456 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -1083,6 +1083,20 @@ main(int argc, char **argv) if (!dopt.dumpData && dopt.sequence_data) getTableData(&dopt, tblinfo, numTables, RELKIND_SEQUENCE); + if (dopt.binary_upgrade) + { + for (int i = 0; i < numTables; i++) + { + if (tblinfo[i].relkind == RELKIND_RELATION && + strcmp(tblinfo[i].dobj.name, "pg_largeobject_metadata") == 0 && + strcmp(tblinfo[i].dobj.namespace->dobj.name, "pg_catalog") == 0) + { + makeTableDataInfo(&dopt, &(tblinfo[i])); + break; + } + } + } + /* * In binary-upgrade mode, we do not have to worry about the actual LO * data or the associated metadata that resides in the pg_largeobject and @@ -3925,7 +3939,7 @@ getLOs(Archive *fout) * pg_largeobject_metadata, after the dump is restored. */ if (dopt->binary_upgrade) - loinfo->dobj.dump &= ~DUMP_COMPONENT_DATA; + loinfo->dobj.dump &= ~(DUMP_COMPONENT_DATA | DUMP_COMPONENT_ACL | DUMP_COMPONENT_DEFINITION); /* * Create a "BLOBS" data item for the group, too. This is just a diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c index 0b0977788f1..538e7dcb493 100644 --- a/src/bin/pg_dump/pg_dump_sort.c +++ b/src/bin/pg_dump/pg_dump_sort.c @@ -76,10 +76,10 @@ enum dbObjectTypePriorities PRIO_TABLE_ATTACH, PRIO_DUMMY_TYPE, PRIO_ATTRDEF, - PRIO_LARGE_OBJECT, PRIO_PRE_DATA_BOUNDARY, /* boundary! */ PRIO_TABLE_DATA, PRIO_SEQUENCE_SET, + PRIO_LARGE_OBJECT, PRIO_LARGE_OBJECT_DATA, PRIO_STATISTICS_DATA_DATA, PRIO_POST_DATA_BOUNDARY, /* boundary! */ diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl index 55d892d9c16..2417f537ac1 100644 --- a/src/bin/pg_dump/t/002_pg_dump.pl +++ b/src/bin/pg_dump/t/002_pg_dump.pl @@ -1029,6 +1029,7 @@ my %tests = ( test_schema_plus_large_objects => 1, }, unlike => { + binary_upgrade => 1, no_large_objects => 1, no_owner => 1, schema_only => 1, @@ -1517,6 +1518,7 @@ my %tests = ( test_schema_plus_large_objects => 1, }, unlike => { + binary_upgrade => 1, schema_only => 1, schema_only_with_statistics => 1, no_large_objects => 1, @@ -4524,9 +4526,9 @@ my %tests = ( no_schema => 1, section_data => 1, test_schema_plus_large_objects => 1, - binary_upgrade => 1, }, unlike => { + binary_upgrade => 1, no_large_objects => 1, no_privs => 1, schema_only => 1, diff --git a/src/bin/pg_upgrade/dump.c b/src/bin/pg_upgrade/dump.c index 23cb08e8347..e5b73b7e7a0 100644 --- a/src/bin/pg_upgrade/dump.c +++ b/src/bin/pg_upgrade/dump.c @@ -15,6 +15,9 @@ void generate_old_dump(void) { + char *path = psprintf("%s/lo_shdep.out", realpath(log_opts.dumpdir, NULL)); + PQExpBuffer buf = createPQExpBuffer(); + PGconn *conn; int dbnum; prep_status("Creating dump of global objects"); @@ -70,5 +73,11 @@ generate_old_dump(void) ; end_progress_output(); + + conn = connectToServer(&old_cluster, "template1"); + appendStringLiteralConn(buf, path, conn); + PQclear(executeQueryOrDie(conn, "COPY (SELECT * FROM pg_shdepend WHERE classid = 'pg_largeobject'::regclass) TO %s", buf->data)); + destroyPQExpBuffer(buf); + PQfinish(conn); check_ok(); } diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c index 536e49d2616..7a6234d48c0 100644 --- a/src/bin/pg_upgrade/pg_upgrade.c +++ b/src/bin/pg_upgrade/pg_upgrade.c @@ -571,6 +571,8 @@ prepare_new_globals(void) static void create_new_objects(void) { + char *path = psprintf("%s/lo_shdep.out", realpath(log_opts.dumpdir, NULL)); + PQExpBuffer buf = createPQExpBuffer(); int dbnum; PGconn *conn_new_template1; @@ -688,6 +690,13 @@ create_new_objects(void) ; end_progress_output(); + + conn_new_template1 = connectToServer(&new_cluster, "template1"); + appendStringLiteralConn(buf, path, conn_new_template1); + PQclear(executeQueryOrDie(conn_new_template1, "COPY pg_shdepend FROM %s", buf->data)); + destroyPQExpBuffer(buf); + PQfinish(conn_new_template1); + check_ok(); /* -- 2.39.5 (Apple Git-154)