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

Commit b8de846

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 ed1bb25 commit b8de846

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
@@ -849,19 +849,26 @@ repairViewRuleMultiLoop(DumpableObject *viewobj,
849849
*
850850
* Note that the "next object" is not necessarily the matview itself;
851851
* it could be the matview's rowtype, for example. We may come through here
852-
* several times while removing all the pre-data linkages.
852+
* several times while removing all the pre-data linkages. In particular,
853+
* if there are other matviews that depend on the one with the circularity
854+
* problem, we'll come through here for each such matview and mark them all
855+
* as postponed. (This works because all MVs have pre-data dependencies
856+
* to begin with, so each of them will get visited.)
853857
*/
854858
static void
855-
repairMatViewBoundaryMultiLoop(DumpableObject *matviewobj,
856-
DumpableObject *boundaryobj,
859+
repairMatViewBoundaryMultiLoop(DumpableObject *boundaryobj,
857860
DumpableObject *nextobj)
858861
{
859-
TableInfo *matviewinfo = (TableInfo *) matviewobj;
860-
861862
/* remove boundary's dependency on object after it in loop */
862863
removeObjectDependency(boundaryobj, nextobj->dumpId);
863-
/* mark matview as postponed into post-data section */
864-
matviewinfo->postponed_def = true;
864+
/* if that object is a matview, mark it as postponed into post-data */
865+
if (nextobj->objType == DO_TABLE)
866+
{
867+
TableInfo *nextinfo = (TableInfo *) nextobj;
868+
869+
if (nextinfo->relkind == RELKIND_MATVIEW)
870+
nextinfo->postponed_def = true;
871+
}
865872
}
866873

867874
/*
@@ -1050,8 +1057,7 @@ repairDependencyLoop(DumpableObject **loop,
10501057
DumpableObject *nextobj;
10511058

10521059
nextobj = (j < nLoop - 1) ? loop[j + 1] : loop[0];
1053-
repairMatViewBoundaryMultiLoop(loop[i], loop[j],
1054-
nextobj);
1060+
repairMatViewBoundaryMultiLoop(loop[j], nextobj);
10551061
return;
10561062
}
10571063
}

0 commit comments

Comments
 (0)