From cc316ccc43c6e7c3b2d1631a5cdc48d57fa26344 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 26 Jan 2024 11:27:51 -0500 Subject: [PATCH v10 3/4] Move BLOBS METADATA TOC entries into SECTION_DATA. Commit c0d5be5d6 put the new BLOB metadata TOC entries into SECTION_PRE_DATA, which perhaps is defensible in some ways, but it's a rather odd choice considering that we go out of our way to treat blobs as data. Moreover, because parallel restore handles the PRE_DATA section serially, this means we're only getting part of the parallelism speedup we could hope for. Moving these entries into SECTION_DATA means that we can parallelize the lo_create calls not only the data loading when there are many blobs. The dependencies established by the previous patch ensure that we won't try to load data for a blob we've not yet created. --- src/bin/pg_dump/pg_dump.c | 4 ++-- src/bin/pg_dump/t/002_pg_dump.pl | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 0245b22ef0..77d745d55e 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -3738,7 +3738,7 @@ dumpLO(Archive *fout, const LoInfo *loinfo) ARCHIVE_OPTS(.tag = loinfo->dobj.name, .owner = loinfo->rolname, .description = "BLOB METADATA", - .section = SECTION_PRE_DATA, + .section = SECTION_DATA, .createStmt = cquery->data, .dropStmt = "-- dummy")); @@ -18612,12 +18612,12 @@ addBoundaryDependencies(DumpableObject **dobjs, int numObjs, case DO_FDW: case DO_FOREIGN_SERVER: case DO_TRANSFORM: - case DO_LARGE_OBJECT: /* Pre-data objects: must come before the pre-data boundary */ addObjectDependency(preDataBound, dobj->dumpId); break; case DO_TABLE_DATA: case DO_SEQUENCE_SET: + case DO_LARGE_OBJECT: case DO_LARGE_OBJECT_DATA: /* Data objects: must come between the boundaries */ addObjectDependency(dobj, preDataBound->dumpId); diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl index df11724e93..25b099395a 100644 --- a/src/bin/pg_dump/t/002_pg_dump.pl +++ b/src/bin/pg_dump/t/002_pg_dump.pl @@ -912,7 +912,7 @@ my %tests = ( column_inserts => 1, data_only => 1, inserts => 1, - section_pre_data => 1, + section_data => 1, test_schema_plus_large_objects => 1, }, unlike => { @@ -1325,7 +1325,7 @@ my %tests = ( column_inserts => 1, data_only => 1, inserts => 1, - section_pre_data => 1, + section_data => 1, test_schema_plus_large_objects => 1, }, unlike => { @@ -1533,7 +1533,7 @@ my %tests = ( column_inserts => 1, data_only => 1, inserts => 1, - section_pre_data => 1, + section_data => 1, test_schema_plus_large_objects => 1, }, unlike => { @@ -4278,7 +4278,7 @@ my %tests = ( column_inserts => 1, data_only => 1, inserts => 1, - section_pre_data => 1, + section_data => 1, test_schema_plus_large_objects => 1, binary_upgrade => 1, }, -- 2.39.3