Skip to content

P
Postgres FD Implementation
Commit e72d7d85 authored by Tom Lane's avatar Tom Lane
Browse files
Options

Handle extension members when first setting object dump flags in pg_dump. 

pg_dump's original approach to handling extension member objects was to
run around and clear (or set) their dump flags rather late in its data
collection process.  Unfortunately, quite a lot of code expects those flags
to be valid before that; which was an entirely reasonable expectation
before we added extensions.  In particular, this explains Karsten Hilbert's
recent report of pg_upgrade failing on a database in which an extension
has been installed into the pg_catalog schema.  Its objects are initially
marked as not-to-be-dumped on the strength of their schema, and later we
change them to must-dump because we're doing a binary upgrade of their
extension; but we've already skipped essential tasks like making associated
DO_SHELL_TYPE objects.

To fix, collect extension membership data first, and incorporate it in the
initial setting of the dump flags, so that those are once again correct
from the get-go.  This has the undesirable side effect of slightly
lengthening the time taken before pg_dump acquires table locks, but testing
suggests that the increase in that window is not very much.

Along the way, get rid of ugly special-case logic for deciding whether
to dump procedural languages, FDWs, and foreign servers; dump decisions
for those are now correct up-front, too.

In 9.3 and up, this also fixes erroneous logic about when to dump event
triggers (basically, they were *always* dumped before).  In 9.5 and up,
transform objects had that problem too.

Since this problem came in with extensions, back-patch to all supported
versions.
parent 5b5fea2a
Show whitespace changes
Inline Side-by-side
Showing with 358 additions and 189 deletions
src/bin/pg_dump/common.c
View file @ e72d7d85
...@@ -40,30 +40,30 @@ static int numCatalogIds = 0; ...@@ -40,30 +40,30 @@ static int numCatalogIds = 0;
/* /*
* These variables are static to avoid the notational cruft of having to pass * These variables are static to avoid the notational cruft of having to pass
* them into findTableByOid() and friends. For each of these arrays, we * them into findTableByOid() and friends. For each of these arrays, we build
* build a sorted-by-OID index array immediately after it's built, and then * a sorted-by-OID index array immediately after the objects are fetched,
* we use binary search in findTableByOid() and friends. (qsort'ing the base * and then we use binary search in findTableByOid() and friends. (qsort'ing
* arrays themselves would be simpler, but it doesn't work because pg_dump.c * the object arrays themselves would be simpler, but it doesn't work because
* may have already established pointers between items.) * pg_dump.c may have already established pointers between items.)
*/ */
static TableInfo *tblinfo;
static TypeInfo *typinfo;
static FuncInfo *funinfo;
static OprInfo *oprinfo;
static NamespaceInfo *nspinfo;
static int numTables;
static int numTypes;
static int numFuncs;
static int numOperators;
static int numCollations;
static int numNamespaces;
static DumpableObject **tblinfoindex; static DumpableObject **tblinfoindex;
static DumpableObject **typinfoindex; static DumpableObject **typinfoindex;
static DumpableObject **funinfoindex; static DumpableObject **funinfoindex;
static DumpableObject **oprinfoindex; static DumpableObject **oprinfoindex;
static DumpableObject **collinfoindex; static DumpableObject **collinfoindex;
static DumpableObject **nspinfoindex; static DumpableObject **nspinfoindex;
static DumpableObject **extinfoindex;
static int numTables;
static int numTypes;
static int numFuncs;
static int numOperators;
static int numCollations;
static int numNamespaces;
static int numExtensions;
/* This is an array of object identities, not actual DumpableObjects */
static ExtensionMemberId *extmembers;
static int numextmembers;
static void flagInhTables(TableInfo *tbinfo, int numTables, static void flagInhTables(TableInfo *tbinfo, int numTables,
InhInfo *inhinfo, int numInherits); InhInfo *inhinfo, int numInherits);
...@@ -71,6 +71,7 @@ static void flagInhAttrs(DumpOptions *dopt, TableInfo *tblinfo, int numTables); ...@@ -71,6 +71,7 @@ static void flagInhAttrs(DumpOptions *dopt, TableInfo *tblinfo, int numTables);
static DumpableObject **buildIndexArray(void *objArray, int numObjs, static DumpableObject **buildIndexArray(void *objArray, int numObjs,
Size objSize); Size objSize);
static int DOCatalogIdCompare(const void *p1, const void *p2); static int DOCatalogIdCompare(const void *p1, const void *p2);
static int ExtensionMemberIdCompare(const void *p1, const void *p2);
static void findParentsByOid(TableInfo *self, static void findParentsByOid(TableInfo *self,
InhInfo *inhinfo, int numInherits); InhInfo *inhinfo, int numInherits);
static int strInArray(const char *pattern, char **arr, int arr_size); static int strInArray(const char *pattern, char **arr, int arr_size);
...@@ -83,10 +84,14 @@ static int strInArray(const char *pattern, char **arr, int arr_size); ...@@ -83,10 +84,14 @@ static int strInArray(const char *pattern, char **arr, int arr_size);
TableInfo * TableInfo *
getSchemaData(Archive *fout, int *numTablesPtr) getSchemaData(Archive *fout, int *numTablesPtr)
{ {
TableInfo *tblinfo;
TypeInfo *typinfo;
FuncInfo *funinfo;
OprInfo *oprinfo;
CollInfo *collinfo;
NamespaceInfo *nspinfo;
ExtensionInfo *extinfo; ExtensionInfo *extinfo;
InhInfo *inhinfo; InhInfo *inhinfo;
CollInfo *collinfo;
int numExtensions;
int numAggregates; int numAggregates;
int numInherits; int numInherits;
int numRules; int numRules;
...@@ -105,6 +110,20 @@ getSchemaData(Archive *fout, int *numTablesPtr) ...@@ -105,6 +110,20 @@ getSchemaData(Archive *fout, int *numTablesPtr)
int numDefaultACLs; int numDefaultACLs;
int numEventTriggers; int numEventTriggers;
/*
* We must read extensions and extension membership info first, because
* extension membership needs to be consultable during decisions about
* whether other objects are to be dumped.
*/
if (g_verbose)
write_msg(NULL, "reading extensions\n");
extinfo = getExtensions(fout, &numExtensions);
extinfoindex = buildIndexArray(extinfo, numExtensions, sizeof(ExtensionInfo));
if (g_verbose)
write_msg(NULL, "identifying extension members\n");
getExtensionMembership(fout, extinfo, numExtensions);
if (g_verbose) if (g_verbose)
write_msg(NULL, "reading schemas\n"); write_msg(NULL, "reading schemas\n");
nspinfo = getNamespaces(fout, &numNamespaces); nspinfo = getNamespaces(fout, &numNamespaces);
...@@ -124,10 +143,6 @@ getSchemaData(Archive *fout, int *numTablesPtr) ...@@ -124,10 +143,6 @@ getSchemaData(Archive *fout, int *numTablesPtr)
/* Do this after we've built tblinfoindex */ /* Do this after we've built tblinfoindex */
getOwnedSeqs(fout, tblinfo, numTables); getOwnedSeqs(fout, tblinfo, numTables);
if (g_verbose)
write_msg(NULL, "reading extensions\n");
extinfo = getExtensions(fout, &numExtensions);
if (g_verbose) if (g_verbose)
write_msg(NULL, "reading user-defined functions\n"); write_msg(NULL, "reading user-defined functions\n");
funinfo = getFuncs(fout, &numFuncs); funinfo = getFuncs(fout, &numFuncs);
...@@ -214,14 +229,10 @@ getSchemaData(Archive *fout, int *numTablesPtr) ...@@ -214,14 +229,10 @@ getSchemaData(Archive *fout, int *numTablesPtr)
write_msg(NULL, "reading event triggers\n"); write_msg(NULL, "reading event triggers\n");
getEventTriggers(fout, &numEventTriggers); getEventTriggers(fout, &numEventTriggers);
/* /* Identify extension configuration tables that should be dumped */
* Identify extension member objects and mark them as not to be dumped.
* This must happen after reading all objects that can be direct members
* of extensions, but before we begin to process table subsidiary objects.
*/
if (g_verbose) if (g_verbose)
write_msg(NULL, "finding extension members\n"); write_msg(NULL, "finding extension tables\n");
getExtensionMembership(fout, extinfo, numExtensions); processExtensionTables(fout, extinfo, numExtensions);
/* Link tables to parents, mark parents of target tables interesting */ /* Link tables to parents, mark parents of target tables interesting */
if (g_verbose) if (g_verbose)
...@@ -764,6 +775,93 @@ findNamespaceByOid(Oid oid) ...@@ -764,6 +775,93 @@ findNamespaceByOid(Oid oid)
return (NamespaceInfo *) findObjectByOid(oid, nspinfoindex, numNamespaces); return (NamespaceInfo *) findObjectByOid(oid, nspinfoindex, numNamespaces);
} }
/*
* findExtensionByOid
* finds the entry (in extinfo) of the extension with the given oid
* returns NULL if not found
*/
ExtensionInfo *
findExtensionByOid(Oid oid)
{
return (ExtensionInfo *) findObjectByOid(oid, extinfoindex, numExtensions);
}
/*
* setExtensionMembership
* accept and save data about which objects belong to extensions
*/
void
setExtensionMembership(ExtensionMemberId *extmems, int nextmems)
{
/* Sort array in preparation for binary searches */
if (nextmems > 1)
qsort((void *) extmems, nextmems, sizeof(ExtensionMemberId),
ExtensionMemberIdCompare);
/* And save */
extmembers = extmems;
numextmembers = nextmems;
}
/*
* findOwningExtension
* return owning extension for specified catalog ID, or NULL if none
*/
ExtensionInfo *
findOwningExtension(CatalogId catalogId)
{
ExtensionMemberId *low;
ExtensionMemberId *high;
/*
* We could use bsearch() here, but the notational cruft of calling
* bsearch is nearly as bad as doing it ourselves; and the generalized
* bsearch function is noticeably slower as well.
*/
if (numextmembers <= 0)
return NULL;
low = extmembers;
high = extmembers + (numextmembers - 1);
while (low <= high)
{
ExtensionMemberId *middle;
int difference;
middle = low + (high - low) / 2;
/* comparison must match ExtensionMemberIdCompare, below */
difference = oidcmp(middle->catId.oid, catalogId.oid);
if (difference == 0)
difference = oidcmp(middle->catId.tableoid, catalogId.tableoid);
if (difference == 0)
return middle->ext;
else if (difference < 0)
low = middle + 1;
else
high = middle - 1;
}
return NULL;
}
/*
* qsort comparator for ExtensionMemberIds
*/
static int
ExtensionMemberIdCompare(const void *p1, const void *p2)
{
const ExtensionMemberId *obj1 = (const ExtensionMemberId *) p1;
const ExtensionMemberId *obj2 = (const ExtensionMemberId *) p2;
int cmpval;
/*
* Compare OID first since it's usually unique, whereas there will only be
* a few distinct values of tableoid.
*/
cmpval = oidcmp(obj1->catId.oid, obj2->catId.oid);
if (cmpval == 0)
cmpval = oidcmp(obj1->catId.tableoid, obj2->catId.tableoid);
return cmpval;
}
/* /*
* findParentsByOid * findParentsByOid
......
src/bin/pg_dump/pg_dump.c
View file @ e72d7d85
...@@ -1256,13 +1256,54 @@ expand_table_name_patterns(Archive *fout, ...@@ -1256,13 +1256,54 @@ expand_table_name_patterns(Archive *fout,
destroyPQExpBuffer(query); destroyPQExpBuffer(query);
} }
/*
* checkExtensionMembership
* Determine whether object is an extension member, and if so,
* record an appropriate dependency and set the object's dump flag.
*
* It's important to call this for each object that could be an extension
* member. Generally, we integrate this with determining the object's
* to-be-dumped-ness, since extension membership overrides other rules for that.
*
* Returns true if object is an extension member, else false.
*/
static bool
checkExtensionMembership(DumpableObject *dobj, DumpOptions *dopt)
{
ExtensionInfo *ext = findOwningExtension(dobj->catId);
if (ext == NULL)
return false;
dobj->ext_member = true;
/* Record dependency so that getDependencies needn't deal with that */
addObjectDependency(dobj, ext->dobj.dumpId);
/*
* Normally, mark the member object as not to be dumped. But in binary
* upgrades, we still dump the members individually, since the idea is to
* exactly reproduce the database contents rather than replace the
* extension contents with something different.
*/
if (!dopt->binary_upgrade)
dobj->dump = false;
else
dobj->dump = ext->dobj.dump;
return true;
}
/* /*
* selectDumpableNamespace: policy-setting subroutine * selectDumpableNamespace: policy-setting subroutine
* Mark a namespace as to be dumped or not * Mark a namespace as to be dumped or not
*/ */
static void static void
selectDumpableNamespace(NamespaceInfo *nsinfo) selectDumpableNamespace(NamespaceInfo *nsinfo, DumpOptions *dopt)
{ {
if (checkExtensionMembership(&nsinfo->dobj, dopt))
return; /* extension membership overrides all else */
/* /*
* If specific tables are being dumped, do not dump any complete * If specific tables are being dumped, do not dump any complete
* namespaces. If specific namespaces are being dumped, dump just those * namespaces. If specific namespaces are being dumped, dump just those
...@@ -1293,8 +1334,11 @@ selectDumpableNamespace(NamespaceInfo *nsinfo) ...@@ -1293,8 +1334,11 @@ selectDumpableNamespace(NamespaceInfo *nsinfo)
* Mark a table as to be dumped or not * Mark a table as to be dumped or not
*/ */
static void static void
selectDumpableTable(TableInfo *tbinfo) selectDumpableTable(TableInfo *tbinfo, DumpOptions *dopt)
{ {
if (checkExtensionMembership(&tbinfo->dobj, dopt))
return; /* extension membership overrides all else */
/* /*
* If specific tables are being dumped, dump just those tables; else, dump * If specific tables are being dumped, dump just those tables; else, dump
* according to the parent namespace's dump flag. * according to the parent namespace's dump flag.
...@@ -1328,7 +1372,7 @@ selectDumpableTable(TableInfo *tbinfo) ...@@ -1328,7 +1372,7 @@ selectDumpableTable(TableInfo *tbinfo)
* object (the table or base type). * object (the table or base type).
*/ */
static void static void
selectDumpableType(TypeInfo *tyinfo) selectDumpableType(TypeInfo *tyinfo, DumpOptions *dopt)
{ {
/* skip complex types, except for standalone composite types */ /* skip complex types, except for standalone composite types */
if (OidIsValid(tyinfo->typrelid) && if (OidIsValid(tyinfo->typrelid) &&
...@@ -1357,6 +1401,9 @@ selectDumpableType(TypeInfo *tyinfo) ...@@ -1357,6 +1401,9 @@ selectDumpableType(TypeInfo *tyinfo)
*/ */
} }
if (checkExtensionMembership(&tyinfo->dobj, dopt))
return; /* extension membership overrides all else */
/* dump only types in dumpable namespaces */ /* dump only types in dumpable namespaces */
if (!tyinfo->dobj.namespace->dobj.dump) if (!tyinfo->dobj.namespace->dobj.dump)
tyinfo->dobj.dump = false; tyinfo->dobj.dump = false;
...@@ -1373,8 +1420,10 @@ selectDumpableType(TypeInfo *tyinfo) ...@@ -1373,8 +1420,10 @@ selectDumpableType(TypeInfo *tyinfo)
* and aclsSkip are checked separately. * and aclsSkip are checked separately.
*/ */
static void static void
selectDumpableDefaultACL(DumpOptions *dopt, DefaultACLInfo *dinfo) selectDumpableDefaultACL(DefaultACLInfo *dinfo, DumpOptions *dopt)
{ {
/* Default ACLs can't be extension members */
if (dinfo->dobj.namespace) if (dinfo->dobj.namespace)
dinfo->dobj.dump = dinfo->dobj.namespace->dobj.dump; dinfo->dobj.dump = dinfo->dobj.namespace->dobj.dump;
else else
...@@ -1391,14 +1440,37 @@ selectDumpableDefaultACL(DumpOptions *dopt, DefaultACLInfo *dinfo) ...@@ -1391,14 +1440,37 @@ selectDumpableDefaultACL(DumpOptions *dopt, DefaultACLInfo *dinfo)
* OID is in the range reserved for initdb. * OID is in the range reserved for initdb.
*/ */
static void static void
selectDumpableCast(DumpOptions *dopt, CastInfo *cast) selectDumpableCast(CastInfo *cast, DumpOptions *dopt)
{ {
if (checkExtensionMembership(&cast->dobj, dopt))
return; /* extension membership overrides all else */
if (cast->dobj.catId.oid < (Oid) FirstNormalObjectId) if (cast->dobj.catId.oid < (Oid) FirstNormalObjectId)
cast->dobj.dump = false; cast->dobj.dump = false;
else else
cast->dobj.dump = dopt->include_everything; cast->dobj.dump = dopt->include_everything;
} }
/*
* selectDumpableProcLang: policy-setting subroutine
* Mark a procedural language as to be dumped or not
*
* Procedural languages do not belong to any particular namespace. To
* identify built-in languages, we must resort to checking whether the
* language's OID is in the range reserved for initdb.
*/
static void
selectDumpableProcLang(ProcLangInfo *plang, DumpOptions *dopt)
{
if (checkExtensionMembership(&plang->dobj, dopt))
return; /* extension membership overrides all else */
if (plang->dobj.catId.oid < (Oid) FirstNormalObjectId)
plang->dobj.dump = false;
else
plang->dobj.dump = dopt->include_everything;
}
/* /*
* selectDumpableExtension: policy-setting subroutine * selectDumpableExtension: policy-setting subroutine
* Mark an extension as to be dumped or not * Mark an extension as to be dumped or not
...@@ -1410,7 +1482,7 @@ selectDumpableCast(DumpOptions *dopt, CastInfo *cast) ...@@ -1410,7 +1482,7 @@ selectDumpableCast(DumpOptions *dopt, CastInfo *cast)
* such extensions by their having OIDs in the range reserved for initdb. * such extensions by their having OIDs in the range reserved for initdb.
*/ */
static void static void
selectDumpableExtension(DumpOptions *dopt, ExtensionInfo *extinfo) selectDumpableExtension(ExtensionInfo *extinfo, DumpOptions *dopt)
{ {
if (dopt->binary_upgrade && extinfo->dobj.catId.oid < (Oid) FirstNormalObjectId) if (dopt->binary_upgrade && extinfo->dobj.catId.oid < (Oid) FirstNormalObjectId)
extinfo->dobj.dump = false; extinfo->dobj.dump = false;
...@@ -1425,16 +1497,19 @@ selectDumpableExtension(DumpOptions *dopt, ExtensionInfo *extinfo) ...@@ -1425,16 +1497,19 @@ selectDumpableExtension(DumpOptions *dopt, ExtensionInfo *extinfo)
* Use this only for object types without a special-case routine above. * Use this only for object types without a special-case routine above.
*/ */
static void static void
selectDumpableObject(DumpableObject *dobj) selectDumpableObject(DumpableObject *dobj, DumpOptions *dopt)
{ {
if (checkExtensionMembership(dobj, dopt))
return; /* extension membership overrides all else */
/* /*
* Default policy is to dump if parent namespace is dumpable, or always * Default policy is to dump if parent namespace is dumpable, or for
* for non-namespace-associated items. * non-namespace-associated items, dump if we're dumping "everything".
*/ */
if (dobj->namespace) if (dobj->namespace)
dobj->dump = dobj->namespace->dobj.dump; dobj->dump = dobj->namespace->dobj.dump;
else else
dobj->dump = true; dobj->dump = dopt->include_everything;
} }
/* /*
...@@ -3261,6 +3336,7 @@ binary_upgrade_extension_member(PQExpBuffer upgrade_buffer, ...@@ -3261,6 +3336,7 @@ binary_upgrade_extension_member(PQExpBuffer upgrade_buffer,
NamespaceInfo * NamespaceInfo *
getNamespaces(Archive *fout, int *numNamespaces) getNamespaces(Archive *fout, int *numNamespaces)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -3288,7 +3364,7 @@ getNamespaces(Archive *fout, int *numNamespaces) ...@@ -3288,7 +3364,7 @@ getNamespaces(Archive *fout, int *numNamespaces)
nsinfo[0].rolname = pg_strdup(""); nsinfo[0].rolname = pg_strdup("");
nsinfo[0].nspacl = pg_strdup(""); nsinfo[0].nspacl = pg_strdup("");
selectDumpableNamespace(&nsinfo[0]); selectDumpableNamespace(&nsinfo[0], dopt);
nsinfo[1].dobj.objType = DO_NAMESPACE; nsinfo[1].dobj.objType = DO_NAMESPACE;
nsinfo[1].dobj.catId.tableoid = 0; nsinfo[1].dobj.catId.tableoid = 0;
...@@ -3298,7 +3374,7 @@ getNamespaces(Archive *fout, int *numNamespaces) ...@@ -3298,7 +3374,7 @@ getNamespaces(Archive *fout, int *numNamespaces)
nsinfo[1].rolname = pg_strdup(""); nsinfo[1].rolname = pg_strdup("");
nsinfo[1].nspacl = pg_strdup(""); nsinfo[1].nspacl = pg_strdup("");
selectDumpableNamespace(&nsinfo[1]); selectDumpableNamespace(&nsinfo[1], dopt);
*numNamespaces = 2; *numNamespaces = 2;
...@@ -3342,7 +3418,7 @@ getNamespaces(Archive *fout, int *numNamespaces) ...@@ -3342,7 +3418,7 @@ getNamespaces(Archive *fout, int *numNamespaces)
nsinfo[i].nspacl = pg_strdup(PQgetvalue(res, i, i_nspacl)); nsinfo[i].nspacl = pg_strdup(PQgetvalue(res, i, i_nspacl));
/* Decide whether to dump this namespace */ /* Decide whether to dump this namespace */
selectDumpableNamespace(&nsinfo[i]); selectDumpableNamespace(&nsinfo[i], dopt);
if (strlen(nsinfo[i].rolname) == 0) if (strlen(nsinfo[i].rolname) == 0)
write_msg(NULL, "WARNING: owner of schema \"%s\" appears to be invalid\n", write_msg(NULL, "WARNING: owner of schema \"%s\" appears to be invalid\n",
...@@ -3466,7 +3542,7 @@ getExtensions(Archive *fout, int *numExtensions) ...@@ -3466,7 +3542,7 @@ getExtensions(Archive *fout, int *numExtensions)
extinfo[i].extcondition = pg_strdup(PQgetvalue(res, i, i_extcondition)); extinfo[i].extcondition = pg_strdup(PQgetvalue(res, i, i_extcondition));
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableExtension(dopt, &(extinfo[i])); selectDumpableExtension(&(extinfo[i]), dopt);
} }
PQclear(res); PQclear(res);
...@@ -3490,6 +3566,7 @@ getExtensions(Archive *fout, int *numExtensions) ...@@ -3490,6 +3566,7 @@ getExtensions(Archive *fout, int *numExtensions)
TypeInfo * TypeInfo *
getTypes(Archive *fout, int *numTypes) getTypes(Archive *fout, int *numTypes)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -3656,7 +3733,7 @@ getTypes(Archive *fout, int *numTypes) ...@@ -3656,7 +3733,7 @@ getTypes(Archive *fout, int *numTypes)
tyinfo[i].isArray = false; tyinfo[i].isArray = false;
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableType(&tyinfo[i]); selectDumpableType(&tyinfo[i], dopt);
/* /*
* If it's a domain, fetch info about its constraints, if any * If it's a domain, fetch info about its constraints, if any
...@@ -3762,6 +3839,7 @@ getTypes(Archive *fout, int *numTypes) ...@@ -3762,6 +3839,7 @@ getTypes(Archive *fout, int *numTypes)
OprInfo * OprInfo *
getOperators(Archive *fout, int *numOprs) getOperators(Archive *fout, int *numOprs)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -3847,7 +3925,7 @@ getOperators(Archive *fout, int *numOprs) ...@@ -3847,7 +3925,7 @@ getOperators(Archive *fout, int *numOprs)
oprinfo[i].oprcode = atooid(PQgetvalue(res, i, i_oprcode)); oprinfo[i].oprcode = atooid(PQgetvalue(res, i, i_oprcode));
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableObject(&(oprinfo[i].dobj)); selectDumpableObject(&(oprinfo[i].dobj), dopt);
if (strlen(oprinfo[i].rolname) == 0) if (strlen(oprinfo[i].rolname) == 0)
write_msg(NULL, "WARNING: owner of operator \"%s\" appears to be invalid\n", write_msg(NULL, "WARNING: owner of operator \"%s\" appears to be invalid\n",
...@@ -3871,6 +3949,7 @@ getOperators(Archive *fout, int *numOprs) ...@@ -3871,6 +3949,7 @@ getOperators(Archive *fout, int *numOprs)
CollInfo * CollInfo *
getCollations(Archive *fout, int *numCollations) getCollations(Archive *fout, int *numCollations)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -3932,7 +4011,7 @@ getCollations(Archive *fout, int *numCollations) ...@@ -3932,7 +4011,7 @@ getCollations(Archive *fout, int *numCollations)
collinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname)); collinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableObject(&(collinfo[i].dobj)); selectDumpableObject(&(collinfo[i].dobj), dopt);
} }
PQclear(res); PQclear(res);
...@@ -3952,6 +4031,7 @@ getCollations(Archive *fout, int *numCollations) ...@@ -3952,6 +4031,7 @@ getCollations(Archive *fout, int *numCollations)
ConvInfo * ConvInfo *
getConversions(Archive *fout, int *numConversions) getConversions(Archive *fout, int *numConversions)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -4013,7 +4093,7 @@ getConversions(Archive *fout, int *numConversions) ...@@ -4013,7 +4093,7 @@ getConversions(Archive *fout, int *numConversions)
convinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname)); convinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableObject(&(convinfo[i].dobj)); selectDumpableObject(&(convinfo[i].dobj), dopt);
} }
PQclear(res); PQclear(res);
...@@ -4033,6 +4113,7 @@ getConversions(Archive *fout, int *numConversions) ...@@ -4033,6 +4113,7 @@ getConversions(Archive *fout, int *numConversions)
OpclassInfo * OpclassInfo *
getOpclasses(Archive *fout, int *numOpclasses) getOpclasses(Archive *fout, int *numOpclasses)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -4104,7 +4185,7 @@ getOpclasses(Archive *fout, int *numOpclasses) ...@@ -4104,7 +4185,7 @@ getOpclasses(Archive *fout, int *numOpclasses)
opcinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname)); opcinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableObject(&(opcinfo[i].dobj)); selectDumpableObject(&(opcinfo[i].dobj), dopt);
if (fout->remoteVersion >= 70300) if (fout->remoteVersion >= 70300)
{ {
...@@ -4131,6 +4212,7 @@ getOpclasses(Archive *fout, int *numOpclasses) ...@@ -4131,6 +4212,7 @@ getOpclasses(Archive *fout, int *numOpclasses)
OpfamilyInfo * OpfamilyInfo *
getOpfamilies(Archive *fout, int *numOpfamilies) getOpfamilies(Archive *fout, int *numOpfamilies)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -4192,7 +4274,7 @@ getOpfamilies(Archive *fout, int *numOpfamilies) ...@@ -4192,7 +4274,7 @@ getOpfamilies(Archive *fout, int *numOpfamilies)
opfinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname)); opfinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableObject(&(opfinfo[i].dobj)); selectDumpableObject(&(opfinfo[i].dobj), dopt);
if (fout->remoteVersion >= 70300) if (fout->remoteVersion >= 70300)
{ {
...@@ -4357,7 +4439,7 @@ getAggregates(Archive *fout, int *numAggs) ...@@ -4357,7 +4439,7 @@ getAggregates(Archive *fout, int *numAggs)
} }
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableObject(&(agginfo[i].aggfn.dobj)); selectDumpableObject(&(agginfo[i].aggfn.dobj), dopt);
} }
PQclear(res); PQclear(res);
...@@ -4515,7 +4597,7 @@ getFuncs(Archive *fout, int *numFuncs) ...@@ -4515,7 +4597,7 @@ getFuncs(Archive *fout, int *numFuncs)
} }
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableObject(&(finfo[i].dobj)); selectDumpableObject(&(finfo[i].dobj), dopt);
if (strlen(finfo[i].rolname) == 0) if (strlen(finfo[i].rolname) == 0)
write_msg(NULL, write_msg(NULL,
...@@ -5178,7 +5260,7 @@ getTables(Archive *fout, int *numTables) ...@@ -5178,7 +5260,7 @@ getTables(Archive *fout, int *numTables)
if (tblinfo[i].relkind == RELKIND_COMPOSITE_TYPE) if (tblinfo[i].relkind == RELKIND_COMPOSITE_TYPE)
tblinfo[i].dobj.dump = false; tblinfo[i].dobj.dump = false;
else else
selectDumpableTable(&tblinfo[i]); selectDumpableTable(&tblinfo[i], dopt);
tblinfo[i].interesting = tblinfo[i].dobj.dump; tblinfo[i].interesting = tblinfo[i].dobj.dump;
tblinfo[i].postponed_def = false; /* might get set during sort */ tblinfo[i].postponed_def = false; /* might get set during sort */
...@@ -6258,6 +6340,7 @@ getTriggers(Archive *fout, TableInfo tblinfo[], int numTables) ...@@ -6258,6 +6340,7 @@ getTriggers(Archive *fout, TableInfo tblinfo[], int numTables)
EventTriggerInfo * EventTriggerInfo *
getEventTriggers(Archive *fout, int *numEventTriggers) getEventTriggers(Archive *fout, int *numEventTriggers)
{ {
DumpOptions *dopt = fout->dopt;
int i; int i;
PQExpBuffer query; PQExpBuffer query;
PGresult *res; PGresult *res;
...@@ -6325,6 +6408,9 @@ getEventTriggers(Archive *fout, int *numEventTriggers) ...@@ -6325,6 +6408,9 @@ getEventTriggers(Archive *fout, int *numEventTriggers)
evtinfo[i].evttags = pg_strdup(PQgetvalue(res, i, i_evttags)); evtinfo[i].evttags = pg_strdup(PQgetvalue(res, i, i_evttags));
evtinfo[i].evtfname = pg_strdup(PQgetvalue(res, i, i_evtfname)); evtinfo[i].evtfname = pg_strdup(PQgetvalue(res, i, i_evtfname));
evtinfo[i].evtenabled = *(PQgetvalue(res, i, i_evtenabled)); evtinfo[i].evtenabled = *(PQgetvalue(res, i, i_evtenabled));
/* Decide whether we want to dump it */
selectDumpableObject(&(evtinfo[i].dobj), dopt);
} }
PQclear(res); PQclear(res);
...@@ -6346,6 +6432,7 @@ getEventTriggers(Archive *fout, int *numEventTriggers) ...@@ -6346,6 +6432,7 @@ getEventTriggers(Archive *fout, int *numEventTriggers)
ProcLangInfo * ProcLangInfo *
getProcLangs(Archive *fout, int *numProcLangs) getProcLangs(Archive *fout, int *numProcLangs)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -6479,6 +6566,9 @@ getProcLangs(Archive *fout, int *numProcLangs) ...@@ -6479,6 +6566,9 @@ getProcLangs(Archive *fout, int *numProcLangs)
planginfo[i].lanacl = pg_strdup(PQgetvalue(res, i, i_lanacl)); planginfo[i].lanacl = pg_strdup(PQgetvalue(res, i, i_lanacl));
planginfo[i].lanowner = pg_strdup(PQgetvalue(res, i, i_lanowner)); planginfo[i].lanowner = pg_strdup(PQgetvalue(res, i, i_lanowner));
/* Decide whether we want to dump it */
selectDumpableProcLang(&(planginfo[i]), dopt);
if (fout->remoteVersion < 70300) if (fout->remoteVersion < 70300)
{ {
/* /*
...@@ -6616,7 +6706,7 @@ getCasts(Archive *fout, int *numCasts) ...@@ -6616,7 +6706,7 @@ getCasts(Archive *fout, int *numCasts)
} }
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableCast(dopt, &(castinfo[i])); selectDumpableCast(&(castinfo[i]), dopt);
} }
PQclear(res); PQclear(res);
...@@ -6652,6 +6742,7 @@ get_language_name(Archive *fout, Oid langid) ...@@ -6652,6 +6742,7 @@ get_language_name(Archive *fout, Oid langid)
TransformInfo * TransformInfo *
getTransforms(Archive *fout, int *numTransforms) getTransforms(Archive *fout, int *numTransforms)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -6724,6 +6815,9 @@ getTransforms(Archive *fout, int *numTransforms) ...@@ -6724,6 +6815,9 @@ getTransforms(Archive *fout, int *numTransforms)
typeInfo->dobj.name, lanname); typeInfo->dobj.name, lanname);
transforminfo[i].dobj.name = namebuf.data; transforminfo[i].dobj.name = namebuf.data;
free(lanname); free(lanname);
/* Decide whether we want to dump it */
selectDumpableObject(&(transforminfo[i].dobj), dopt);
} }
PQclear(res); PQclear(res);
...@@ -7334,6 +7428,7 @@ shouldPrintColumn(DumpOptions *dopt, TableInfo *tbinfo, int colno) ...@@ -7334,6 +7428,7 @@ shouldPrintColumn(DumpOptions *dopt, TableInfo *tbinfo, int colno)
TSParserInfo * TSParserInfo *
getTSParsers(Archive *fout, int *numTSParsers) getTSParsers(Archive *fout, int *numTSParsers)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -7406,7 +7501,7 @@ getTSParsers(Archive *fout, int *numTSParsers) ...@@ -7406,7 +7501,7 @@ getTSParsers(Archive *fout, int *numTSParsers)
prsinfo[i].prslextype = atooid(PQgetvalue(res, i, i_prslextype)); prsinfo[i].prslextype = atooid(PQgetvalue(res, i, i_prslextype));
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableObject(&(prsinfo[i].dobj)); selectDumpableObject(&(prsinfo[i].dobj), dopt);
} }
PQclear(res); PQclear(res);
...@@ -7426,6 +7521,7 @@ getTSParsers(Archive *fout, int *numTSParsers) ...@@ -7426,6 +7521,7 @@ getTSParsers(Archive *fout, int *numTSParsers)
TSDictInfo * TSDictInfo *
getTSDictionaries(Archive *fout, int *numTSDicts) getTSDictionaries(Archive *fout, int *numTSDicts)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -7491,7 +7587,7 @@ getTSDictionaries(Archive *fout, int *numTSDicts) ...@@ -7491,7 +7587,7 @@ getTSDictionaries(Archive *fout, int *numTSDicts)
dictinfo[i].dictinitoption = pg_strdup(PQgetvalue(res, i, i_dictinitoption)); dictinfo[i].dictinitoption = pg_strdup(PQgetvalue(res, i, i_dictinitoption));
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableObject(&(dictinfo[i].dobj)); selectDumpableObject(&(dictinfo[i].dobj), dopt);
} }
PQclear(res); PQclear(res);
...@@ -7511,6 +7607,7 @@ getTSDictionaries(Archive *fout, int *numTSDicts) ...@@ -7511,6 +7607,7 @@ getTSDictionaries(Archive *fout, int *numTSDicts)
TSTemplateInfo * TSTemplateInfo *
getTSTemplates(Archive *fout, int *numTSTemplates) getTSTemplates(Archive *fout, int *numTSTemplates)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -7568,7 +7665,7 @@ getTSTemplates(Archive *fout, int *numTSTemplates) ...@@ -7568,7 +7665,7 @@ getTSTemplates(Archive *fout, int *numTSTemplates)
tmplinfo[i].tmpllexize = atooid(PQgetvalue(res, i, i_tmpllexize)); tmplinfo[i].tmpllexize = atooid(PQgetvalue(res, i, i_tmpllexize));
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableObject(&(tmplinfo[i].dobj)); selectDumpableObject(&(tmplinfo[i].dobj), dopt);
} }
PQclear(res); PQclear(res);
...@@ -7588,6 +7685,7 @@ getTSTemplates(Archive *fout, int *numTSTemplates) ...@@ -7588,6 +7685,7 @@ getTSTemplates(Archive *fout, int *numTSTemplates)
TSConfigInfo * TSConfigInfo *
getTSConfigurations(Archive *fout, int *numTSConfigs) getTSConfigurations(Archive *fout, int *numTSConfigs)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -7646,7 +7744,7 @@ getTSConfigurations(Archive *fout, int *numTSConfigs) ...@@ -7646,7 +7744,7 @@ getTSConfigurations(Archive *fout, int *numTSConfigs)
cfginfo[i].cfgparser = atooid(PQgetvalue(res, i, i_cfgparser)); cfginfo[i].cfgparser = atooid(PQgetvalue(res, i, i_cfgparser));
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableObject(&(cfginfo[i].dobj)); selectDumpableObject(&(cfginfo[i].dobj), dopt);
} }
PQclear(res); PQclear(res);
...@@ -7666,6 +7764,7 @@ getTSConfigurations(Archive *fout, int *numTSConfigs) ...@@ -7666,6 +7764,7 @@ getTSConfigurations(Archive *fout, int *numTSConfigs)
FdwInfo * FdwInfo *
getForeignDataWrappers(Archive *fout, int *numForeignDataWrappers) getForeignDataWrappers(Archive *fout, int *numForeignDataWrappers)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -7754,7 +7853,7 @@ getForeignDataWrappers(Archive *fout, int *numForeignDataWrappers) ...@@ -7754,7 +7853,7 @@ getForeignDataWrappers(Archive *fout, int *numForeignDataWrappers)
fdwinfo[i].fdwacl = pg_strdup(PQgetvalue(res, i, i_fdwacl)); fdwinfo[i].fdwacl = pg_strdup(PQgetvalue(res, i, i_fdwacl));
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableObject(&(fdwinfo[i].dobj)); selectDumpableObject(&(fdwinfo[i].dobj), dopt);
} }
PQclear(res); PQclear(res);
...@@ -7774,6 +7873,7 @@ getForeignDataWrappers(Archive *fout, int *numForeignDataWrappers) ...@@ -7774,6 +7873,7 @@ getForeignDataWrappers(Archive *fout, int *numForeignDataWrappers)
ForeignServerInfo * ForeignServerInfo *
getForeignServers(Archive *fout, int *numForeignServers) getForeignServers(Archive *fout, int *numForeignServers)
{ {
DumpOptions *dopt = fout->dopt;
PGresult *res; PGresult *res;
int ntups; int ntups;
int i; int i;
...@@ -7846,7 +7946,7 @@ getForeignServers(Archive *fout, int *numForeignServers) ...@@ -7846,7 +7946,7 @@ getForeignServers(Archive *fout, int *numForeignServers)
srvinfo[i].srvacl = pg_strdup(PQgetvalue(res, i, i_srvacl)); srvinfo[i].srvacl = pg_strdup(PQgetvalue(res, i, i_srvacl));
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableObject(&(srvinfo[i].dobj)); selectDumpableObject(&(srvinfo[i].dobj), dopt);
} }
PQclear(res); PQclear(res);
...@@ -7934,7 +8034,7 @@ getDefaultACLs(Archive *fout, int *numDefaultACLs) ...@@ -7934,7 +8034,7 @@ getDefaultACLs(Archive *fout, int *numDefaultACLs)
daclinfo[i].defaclacl = pg_strdup(PQgetvalue(res, i, i_defaclacl)); daclinfo[i].defaclacl = pg_strdup(PQgetvalue(res, i, i_defaclacl));
/* Decide whether we want to dump it */ /* Decide whether we want to dump it */
selectDumpableDefaultACL(dopt, &(daclinfo[i])); selectDumpableDefaultACL(&(daclinfo[i]), dopt);
} }
PQclear(res); PQclear(res);
...@@ -9898,32 +9998,6 @@ dumpShellType(Archive *fout, ShellTypeInfo *stinfo) ...@@ -9898,32 +9998,6 @@ dumpShellType(Archive *fout, ShellTypeInfo *stinfo)
destroyPQExpBuffer(q); destroyPQExpBuffer(q);
} }
/*
* Determine whether we want to dump definitions for procedural languages.
* Since the languages themselves don't have schemas, we can't rely on
* the normal schema-based selection mechanism. We choose to dump them
* whenever neither --schema nor --table was given. (Before 8.1, we used
* the dump flag of the PL's call handler function, but in 8.1 this will
* probably always be false since call handlers are created in pg_catalog.)
*
* For some backwards compatibility with the older behavior, we forcibly
* dump a PL if its handler function (and validator if any) are in a
* dumpable namespace. That case is not checked here.
*
* Also, if the PL belongs to an extension, we do not use this heuristic.
* That case isn't checked here either.
*/
static bool
shouldDumpProcLangs(DumpOptions *dopt)
{
if (!dopt->include_everything)
return false;
/* And they're schema not data */
if (dopt->dataOnly)
return false;
return true;
}
/* /*
* dumpProcLang * dumpProcLang
* writes out to fout the queries to recreate a user-defined * writes out to fout the queries to recreate a user-defined
...@@ -9975,25 +10049,13 @@ dumpProcLang(Archive *fout, ProcLangInfo *plang) ...@@ -9975,25 +10049,13 @@ dumpProcLang(Archive *fout, ProcLangInfo *plang)
/* /*
* If the functions are dumpable then emit a traditional CREATE LANGUAGE * If the functions are dumpable then emit a traditional CREATE LANGUAGE
* with parameters. Otherwise, dump only if shouldDumpProcLangs() says to * with parameters. Otherwise, we'll write a parameterless command, which
* dump it. * will rely on data from pg_pltemplate.
*
* However, for a language that belongs to an extension, we must not use
* the shouldDumpProcLangs heuristic, but just dump the language iff we're
* told to (via dobj.dump). Generally the support functions will belong
* to the same extension and so have the same dump flags ... if they
* don't, this might not work terribly nicely.
*/ */
useParams = (funcInfo != NULL && useParams = (funcInfo != NULL &&
(inlineInfo != NULL || !OidIsValid(plang->laninline)) && (inlineInfo != NULL || !OidIsValid(plang->laninline)) &&
(validatorInfo != NULL || !OidIsValid(plang->lanvalidator))); (validatorInfo != NULL || !OidIsValid(plang->lanvalidator)));
if (!plang->dobj.ext_member)
{
if (!useParams && !shouldDumpProcLangs(dopt))
return;
}
defqry = createPQExpBuffer(); defqry = createPQExpBuffer();
delqry = createPQExpBuffer(); delqry = createPQExpBuffer();
labelq = createPQExpBuffer(); labelq = createPQExpBuffer();
...@@ -13062,14 +13124,6 @@ dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo) ...@@ -13062,14 +13124,6 @@ dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo)
if (!fdwinfo->dobj.dump || dopt->dataOnly) if (!fdwinfo->dobj.dump || dopt->dataOnly)
return; return;
/*
* FDWs that belong to an extension are dumped based on their "dump"
* field. Otherwise omit them if we are only dumping some specific object.
*/
if (!fdwinfo->dobj.ext_member)
if (!dopt->include_everything)
return;
q = createPQExpBuffer(); q = createPQExpBuffer();
delq = createPQExpBuffer(); delq = createPQExpBuffer();
labelq = createPQExpBuffer(); labelq = createPQExpBuffer();
...@@ -13145,7 +13199,7 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo) ...@@ -13145,7 +13199,7 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
char *fdwname; char *fdwname;
/* Skip if not to be dumped */ /* Skip if not to be dumped */
if (!srvinfo->dobj.dump || dopt->dataOnly || !dopt->include_everything) if (!srvinfo->dobj.dump || dopt->dataOnly)
return; return;
q = createPQExpBuffer(); q = createPQExpBuffer();
...@@ -15695,50 +15749,27 @@ dumpRule(Archive *fout, RuleInfo *rinfo) ...@@ -15695,50 +15749,27 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
/* /*
* getExtensionMembership --- obtain extension membership data * getExtensionMembership --- obtain extension membership data
* *
* There are three main parts to this process: * We need to identify objects that are extension members as soon as they're
* * loaded, so that we can correctly determine whether they need to be dumped.
* 1. Identify objects which are members of extensions * Generally speaking, extension member objects will get marked as *not* to
* * be dumped, as they will be recreated by the single CREATE EXTENSION
* Generally speaking, this is to mark them as *not* being dumped, as most * command. However, in binary upgrade mode we still need to dump the members
* extension objects are created by the single CREATE EXTENSION command. * individually.
* The one exception is binary upgrades with pg_upgrade will still dump the
* non-table objects.
*
* 2. Identify and create dump records for extension configuration tables.
*
* Extensions can mark tables as "configuration", which means that the user
* is able and expected to modify those tables after the extension has been
* loaded. For these tables, we dump out only the data- the structure is
* expected to be handled at CREATE EXTENSION time, including any indexes or
* foreign keys, which brings us to-
*
* 3. Record FK dependencies between configuration tables.
*
* Due to the FKs being created at CREATE EXTENSION time and therefore before
* the data is loaded, we have to work out what the best order for reloading
* the data is, to avoid FK violations when the tables are restored. This is
* not perfect- we can't handle circular dependencies and if any exist they
* will cause an invalid dump to be produced (though at least all of the data
* is included for a user to manually restore). This is currently documented
* but perhaps we can provide a better solution in the future.
*/ */
void void
getExtensionMembership(Archive *fout, ExtensionInfo extinfo[], getExtensionMembership(Archive *fout, ExtensionInfo extinfo[],
int numExtensions) int numExtensions)
{ {
DumpOptions *dopt = fout->dopt;
PQExpBuffer query; PQExpBuffer query;
PGresult *res; PGresult *res;
int ntups, int ntups,
nextmembers,
i; i;
int i_classid, int i_classid,
i_objid, i_objid,
i_refclassid, i_refobjid;
i_refobjid, ExtensionMemberId *extmembers;
i_conrelid, ExtensionInfo *ext;
i_confrelid;
DumpableObject *dobj,
*refdobj;
/* Nothing to do if no extensions */ /* Nothing to do if no extensions */
if (numExtensions == 0) if (numExtensions == 0)
...@@ -15751,11 +15782,11 @@ getExtensionMembership(Archive *fout, ExtensionInfo extinfo[], ...@@ -15751,11 +15782,11 @@ getExtensionMembership(Archive *fout, ExtensionInfo extinfo[],
/* refclassid constraint is redundant but may speed the search */ /* refclassid constraint is redundant but may speed the search */
appendPQExpBufferStr(query, "SELECT " appendPQExpBufferStr(query, "SELECT "
"classid, objid, refclassid, refobjid " "classid, objid, refobjid "
"FROM pg_depend " "FROM pg_depend "
"WHERE refclassid = 'pg_extension'::regclass " "WHERE refclassid = 'pg_extension'::regclass "
"AND deptype = 'e' " "AND deptype = 'e' "
"ORDER BY 3,4"); "ORDER BY 3");
res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK); res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
...@@ -15763,76 +15794,94 @@ getExtensionMembership(Archive *fout, ExtensionInfo extinfo[], ...@@ -15763,76 +15794,94 @@ getExtensionMembership(Archive *fout, ExtensionInfo extinfo[],
i_classid = PQfnumber(res, "classid"); i_classid = PQfnumber(res, "classid");
i_objid = PQfnumber(res, "objid"); i_objid = PQfnumber(res, "objid");
i_refclassid = PQfnumber(res, "refclassid");
i_refobjid = PQfnumber(res, "refobjid"); i_refobjid = PQfnumber(res, "refobjid");
extmembers = (ExtensionMemberId *) pg_malloc(ntups * sizeof(ExtensionMemberId));
nextmembers = 0;
/* /*
* Accumulate data into extmembers[].
*
* Since we ordered the SELECT by referenced ID, we can expect that * Since we ordered the SELECT by referenced ID, we can expect that
* multiple entries for the same extension will appear together; this * multiple entries for the same extension will appear together; this
* saves on searches. * saves on searches.
*/ */
refdobj = NULL; ext = NULL;
for (i = 0; i < ntups; i++) for (i = 0; i < ntups; i++)
{ {
CatalogId objId; CatalogId objId;
CatalogId refobjId; Oid extId;
objId.tableoid = atooid(PQgetvalue(res, i, i_classid)); objId.tableoid = atooid(PQgetvalue(res, i, i_classid));
objId.oid = atooid(PQgetvalue(res, i, i_objid)); objId.oid = atooid(PQgetvalue(res, i, i_objid));
refobjId.tableoid = atooid(PQgetvalue(res, i, i_refclassid)); extId = atooid(PQgetvalue(res, i, i_refobjid));
refobjId.oid = atooid(PQgetvalue(res, i, i_refobjid));
if (refdobj == NULL || if (ext == NULL ||
refdobj->catId.tableoid != refobjId.tableoid || ext->dobj.catId.oid != extId)
refdobj->catId.oid != refobjId.oid) ext = findExtensionByOid(extId);
refdobj = findObjectByCatalogId(refobjId);
/* if (ext == NULL)
* Failure to find objects mentioned in pg_depend is not unexpected,
* since for example we don't collect info about TOAST tables.
*/
if (refdobj == NULL)
{ {
#ifdef NOT_USED /* shouldn't happen */
fprintf(stderr, "no referenced object %u %u\n", fprintf(stderr, "could not find referenced extension %u\n", extId);
refobjId.tableoid, refobjId.oid);
#endif
continue; continue;
} }
dobj = findObjectByCatalogId(objId); extmembers[nextmembers].catId = objId;
extmembers[nextmembers].ext = ext;
if (dobj == NULL) nextmembers++;
{
#ifdef NOT_USED
fprintf(stderr, "no referencing object %u %u\n",
objId.tableoid, objId.oid);
#endif
continue;
} }
/* Record dependency so that getDependencies needn't repeat this */ PQclear(res);
addObjectDependency(dobj, refdobj->dumpId);
dobj->ext_member = true; /* Remember the data for use later */
setExtensionMembership(extmembers, nextmembers);
/* destroyPQExpBuffer(query);
* Normally, mark the member object as not to be dumped. But in }
* binary upgrades, we still dump the members individually, since the
* idea is to exactly reproduce the database contents rather than /*
* replace the extension contents with something different. * processExtensionTables --- deal with extension configuration tables
*
* There are two parts to this process:
*
* 1. Identify and create dump records for extension configuration tables.
*
* Extensions can mark tables as "configuration", which means that the user
* is able and expected to modify those tables after the extension has been
* loaded. For these tables, we dump out only the data- the structure is
* expected to be handled at CREATE EXTENSION time, including any indexes or
* foreign keys, which brings us to-
*
* 2. Record FK dependencies between configuration tables.
*
* Due to the FKs being created at CREATE EXTENSION time and therefore before
* the data is loaded, we have to work out what the best order for reloading
* the data is, to avoid FK violations when the tables are restored. This is
* not perfect- we can't handle circular dependencies and if any exist they
* will cause an invalid dump to be produced (though at least all of the data
* is included for a user to manually restore). This is currently documented
* but perhaps we can provide a better solution in the future.
*/ */
if (!dopt->binary_upgrade) void
dobj->dump = false; processExtensionTables(Archive *fout, ExtensionInfo extinfo[],
else int numExtensions)
dobj->dump = refdobj->dump; {
} DumpOptions *dopt = fout->dopt;
PQExpBuffer query;
PGresult *res;
int ntups,
i;
int i_conrelid,
i_confrelid;
PQclear(res); /* Nothing to do if no extensions */
if (numExtensions == 0)
return;
/* /*
* Now identify extension configuration tables and create TableDataInfo * Identify extension configuration tables and create TableDataInfo
* objects for them, ensuring their data will be dumped even though the * objects for them, ensuring their data will be dumped even though the
* tables themselves won't be. * tables themselves won't be.
* *
...@@ -15920,11 +15969,17 @@ getExtensionMembership(Archive *fout, ExtensionInfo extinfo[], ...@@ -15920,11 +15969,17 @@ getExtensionMembership(Archive *fout, ExtensionInfo extinfo[],
/* /*
* Now that all the TableInfoData objects have been created for all the * Now that all the TableInfoData objects have been created for all the
* extensions, check their FK dependencies and register them to try and * extensions, check their FK dependencies and register them to try and
* dump the data out in an order which they can be restored in. * dump the data out in an order that they can be restored in.
* *
* Note that this is not a problem for user tables as their FKs are * Note that this is not a problem for user tables as their FKs are
* recreated after the data has been loaded. * recreated after the data has been loaded.
*/ */
/* Make sure we are in proper schema */
selectSourceSchema(fout, "pg_catalog");
query = createPQExpBuffer();
printfPQExpBuffer(query, printfPQExpBuffer(query,
"SELECT conrelid, confrelid " "SELECT conrelid, confrelid "
"FROM pg_constraint " "FROM pg_constraint "
......
src/bin/pg_dump/pg_dump.h
View file @ e72d7d85
...@@ -479,6 +479,16 @@ typedef struct _policyInfo ...@@ -479,6 +479,16 @@ typedef struct _policyInfo
char *polwithcheck; char *polwithcheck;
} PolicyInfo; } PolicyInfo;
/*
* We build an array of these with an entry for each object that is an
* extension member according to pg_depend.
*/
typedef struct _extensionMemberId
{
CatalogId catId; /* tableoid+oid of some member object */
ExtensionInfo *ext; /* owning extension */
} ExtensionMemberId;
/* global decls */ /* global decls */
extern bool force_quotes; /* double-quotes for identifiers flag */ extern bool force_quotes; /* double-quotes for identifiers flag */
extern bool g_verbose; /* verbose flag */ extern bool g_verbose; /* verbose flag */
...@@ -511,6 +521,10 @@ extern FuncInfo *findFuncByOid(Oid oid); ...@@ -511,6 +521,10 @@ extern FuncInfo *findFuncByOid(Oid oid);
extern OprInfo *findOprByOid(Oid oid); extern OprInfo *findOprByOid(Oid oid);
extern CollInfo *findCollationByOid(Oid oid); extern CollInfo *findCollationByOid(Oid oid);
extern NamespaceInfo *findNamespaceByOid(Oid oid); extern NamespaceInfo *findNamespaceByOid(Oid oid);
extern ExtensionInfo *findExtensionByOid(Oid oid);
extern void setExtensionMembership(ExtensionMemberId *extmems, int nextmems);
extern ExtensionInfo *findOwningExtension(CatalogId catalogId);
extern void simple_oid_list_append(SimpleOidList *list, Oid val); extern void simple_oid_list_append(SimpleOidList *list, Oid val);
extern bool simple_oid_list_member(SimpleOidList *list, Oid val); extern bool simple_oid_list_member(SimpleOidList *list, Oid val);
...@@ -559,6 +573,8 @@ extern ForeignServerInfo *getForeignServers(Archive *fout, ...@@ -559,6 +573,8 @@ extern ForeignServerInfo *getForeignServers(Archive *fout,
extern DefaultACLInfo *getDefaultACLs(Archive *fout, int *numDefaultACLs); extern DefaultACLInfo *getDefaultACLs(Archive *fout, int *numDefaultACLs);
extern void getExtensionMembership(Archive *fout, ExtensionInfo extinfo[], extern void getExtensionMembership(Archive *fout, ExtensionInfo extinfo[],
int numExtensions); int numExtensions);
extern void processExtensionTables(Archive *fout, ExtensionInfo extinfo[],
int numExtensions);
extern EventTriggerInfo *getEventTriggers(Archive *fout, int *numEventTriggers); extern EventTriggerInfo *getEventTriggers(Archive *fout, int *numEventTriggers);
extern void getPolicies(Archive *fout, TableInfo tblinfo[], int numTables); extern void getPolicies(Archive *fout, TableInfo tblinfo[], int numTables);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment