Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6e4d45b

Browse files
committed
Fix dumping of matviews with indirect dependencies on primary keys.
Commit 62215de turns out to have been not quite on-the-mark. When we are forced to postpone dumping of a materialized view into the dump's post-data section (because it depends on a unique index that isn't created till that section), we may also have to postpone dumping other matviews that depend on said matview. The previous fix didn't reliably work for such cases: it'd break the dependency loops properly, producing a workable object ordering, but it didn't necessarily mark all the matviews as "postponed_def". This led to harmless bleating about "archive items not in correct section order", as reported by Tom Cassidy in bug #15602. Less harmlessly, selective-restore options such as --section might misbehave due to the matview dump objects not being properly labeled. The right way to fix it is to consider that each pre-data dependency we break amounts to moving the no-longer-dependent object into post-data, and hence we should mark that object if it's a matview. Back-patch to all supported versions, since the issue's been there since matviews were introduced. Discussion: https://postgr.es/m/15602-e895445f73dc450b@postgresql.org
1 parent f602cf4 commit 6e4d45b

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

src/bin/pg_dump/pg_dump_sort.c

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -755,19 +755,26 @@ repairViewRuleMultiLoop(DumpableObject *viewobj,
755755
*
756756
* Note that the "next object" is not necessarily the matview itself;
757757
* it could be the matview's rowtype, for example. We may come through here
758-
* several times while removing all the pre-data linkages.
758+
* several times while removing all the pre-data linkages. In particular,
759+
* if there are other matviews that depend on the one with the circularity
760+
* problem, we'll come through here for each such matview and mark them all
761+
* as postponed. (This works because all MVs have pre-data dependencies
762+
* to begin with, so each of them will get visited.)
759763
*/
760764
static void
761-
repairMatViewBoundaryMultiLoop(DumpableObject *matviewobj,
762-
DumpableObject *boundaryobj,
765+
repairMatViewBoundaryMultiLoop(DumpableObject *boundaryobj,
763766
DumpableObject *nextobj)
764767
{
765-
TableInfo *matviewinfo = (TableInfo *) matviewobj;
766-
767768
/* remove boundary's dependency on object after it in loop */
768769
removeObjectDependency(boundaryobj, nextobj->dumpId);
769-
/* mark matview as postponed into post-data section */
770-
matviewinfo->postponed_def = true;
770+
/* if that object is a matview, mark it as postponed into post-data */
771+
if (nextobj->objType == DO_TABLE)
772+
{
773+
TableInfo *nextinfo = (TableInfo *) nextobj;
774+
775+
if (nextinfo->relkind == RELKIND_MATVIEW)
776+
nextinfo->postponed_def = true;
777+
}
771778
}
772779

773780
/*
@@ -956,8 +963,7 @@ repairDependencyLoop(DumpableObject **loop,
956963
DumpableObject *nextobj;
957964

958965
nextobj = (j < nLoop - 1) ? loop[j + 1] : loop[0];
959-
repairMatViewBoundaryMultiLoop(loop[i], loop[j],
960-
nextobj);
966+
repairMatViewBoundaryMultiLoop(loop[j], nextobj);
961967
return;
962968
}
963969
}

0 commit comments

Comments
 (0)