NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commit183d3cf

committed

Rethink order of operations for dumping extension member objects.

My original idea of doing extension member identification duringgetDependencies() didn't work correctly: we have to mark member tables asnot-to-be-dumped rather earlier than that, else their subsidiary objectslike indexes get dumped anyway. Rearrange code to mark them early enough.

1 parent5bc178b commit183d3cfCopy full SHA for 183d3cf

File tree

3 files changed

+190

-88

lines changed

src/bin/pg_dump

3 files changed

+190

-88

lines changed

`‎src/bin/pg_dump/common.c‎`

Lines changed: 23 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,12 +79,12 @@ TableInfo *`
`79`	`79`	`getSchemaData(int*numTablesPtr)`
`80`	`80`	`{`
`81`	`81`	`NamespaceInfo*nsinfo;`
	`82`	`+ExtensionInfo*extinfo;`
`82`	`83`	`AggInfo*agginfo;`
`83`	`84`	`InhInfo*inhinfo;`
`84`	`85`	`RuleInfo*ruleinfo;`
`85`	`86`	`ProcLangInfo*proclanginfo;`
`86`	`87`	`CastInfo*castinfo;`
`87`		`-ExtensionInfo*extinfo;`
`88`	`88`	`OpclassInfo*opcinfo;`
`89`	`89`	`OpfamilyInfo*opfinfo;`
`90`	`90`	`ConvInfo*convinfo;`
`@@ -96,12 +96,12 @@ getSchemaData(int *numTablesPtr)`
`96`	`96`	`ForeignServerInfo*srvinfo;`
`97`	`97`	`DefaultACLInfo*daclinfo;`
`98`	`98`	`intnumNamespaces;`
	`99`	`+intnumExtensions;`
`99`	`100`	`intnumAggregates;`
`100`	`101`	`intnumInherits;`
`101`	`102`	`intnumRules;`
`102`	`103`	`intnumProcLangs;`
`103`	`104`	`intnumCasts;`
`104`		`-intnumExtensions;`
`105`	`105`	`intnumOpclasses;`
`106`	`106`	`intnumOpfamilies;`
`107`	`107`	`intnumConversions;`
`@@ -117,6 +117,10 @@ getSchemaData(int *numTablesPtr)`
`117`	`117`	`write_msg(NULL,"reading schemas\n");`
`118`	`118`	`nsinfo=getNamespaces(&numNamespaces);`
`119`	`119`
	`120`	`+if (g_verbose)`
	`121`	`+write_msg(NULL,"reading extensions\n");`
	`122`	`+extinfo=getExtensions(&numExtensions);`
	`123`	`+`
`120`	`124`	`if (g_verbose)`
`121`	`125`	`write_msg(NULL,"reading user-defined functions\n");`
`122`	`126`	`funinfo=getFuncs(&numFuncs);`
`@@ -146,6 +150,10 @@ getSchemaData(int *numTablesPtr)`
`146`	`150`	`write_msg(NULL,"reading user-defined operator classes\n");`
`147`	`151`	`opcinfo=getOpclasses(&numOpclasses);`
`148`	`152`
	`153`	`+if (g_verbose)`
	`154`	`+write_msg(NULL,"reading user-defined operator families\n");`
	`155`	`+opfinfo=getOpfamilies(&numOpfamilies);`
	`156`	`+`
`149`	`157`	`if (g_verbose)`
`150`	`158`	`write_msg(NULL,"reading user-defined text search parsers\n");`
`151`	`159`	`prsinfo=getTSParsers(&numTSParsers);`
`@@ -174,14 +182,14 @@ getSchemaData(int *numTablesPtr)`
`174`	`182`	`write_msg(NULL,"reading default privileges\n");`
`175`	`183`	`daclinfo=getDefaultACLs(&numDefaultACLs);`
`176`	`184`
`177`		`-if (g_verbose)`
`178`		`-write_msg(NULL,"reading user-defined operator families\n");`
`179`		`-opfinfo=getOpfamilies(&numOpfamilies);`
`180`		`-`
`181`	`185`	`if (g_verbose)`
`182`	`186`	`write_msg(NULL,"reading user-defined conversions\n");`
`183`	`187`	`convinfo=getConversions(&numConversions);`
`184`	`188`
	`189`	`+if (g_verbose)`
	`190`	`+write_msg(NULL,"reading type casts\n");`
	`191`	`+castinfo=getCasts(&numCasts);`
	`192`	`+`
`185`	`193`	`if (g_verbose)`
`186`	`194`	`write_msg(NULL,"reading user-defined tables\n");`
`187`	`195`	`tblinfo=getTables(&numTables);`
`@@ -195,14 +203,14 @@ getSchemaData(int *numTablesPtr)`
`195`	`203`	`write_msg(NULL,"reading rewrite rules\n");`
`196`	`204`	`ruleinfo=getRules(&numRules);`
`197`	`205`
	`206`	`+/*`
	`207`	`+ * Identify extension member objects and mark them as not to be dumped.`
	`208`	`+ * This must happen after reading all objects that can be direct members`
	`209`	`+ * of extensions, but before we begin to process table subsidiary objects.`
	`210`	`+ */`
`198`	`211`	`if (g_verbose)`
`199`		`-write_msg(NULL,"reading type casts\n");`
`200`		`-castinfo=getCasts(&numCasts);`
`201`		`-`
`202`		`-/* this must be after getTables */`
`203`		`-if (g_verbose)`
`204`		`-write_msg(NULL,"reading extensions\n");`
`205`		`-extinfo=getExtensions(&numExtensions);`
	`212`	`+write_msg(NULL,"finding extension members\n");`
	`213`	`+getExtensionMembership(extinfo,numExtensions);`
`206`	`214`
`207`	`215`	`/* Link tables to parents, mark parents of target tables interesting */`
`208`	`216`	`if (g_verbose)`
`@@ -525,9 +533,9 @@ findObjectByDumpId(DumpId dumpId)`
`525`	`533`	`* Returns NULL for unknown ID`
`526`	`534`	`*`
`527`	`535`	`* We use binary search in a sorted list that is built on first call.`
`528`		`- * If AssignDumpId() and findObjectByCatalogId() calls were intermixed,`
	`536`	`+ * If AssignDumpId() and findObjectByCatalogId() calls werefreelyintermixed,`
`529`	`537`	`* the code would work, but possibly be very slow.In the current usage`
`530`		`- * pattern that does not happen, indeed weonly need tobuild the listonce.`
	`538`	`+ * pattern that does not happen, indeed we build the listat most twice.`
`531`	`539`	`*/`
`532`	`540`	`DumpableObject*`
`533`	`541`	`findObjectByCatalogId(CatalogIdcatalogId)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit183d3cf

File tree

3 files changed

3 files changed

`‎src/bin/pg_dump/common.c‎`

0 commit comments