From efdd3f918a015d9e7ce8aafa4a17fe98033222c5 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Mon, 29 Jun 2020 15:25:16 +0900 Subject: [PATCH 2/3] Refactor dependency handling when creating extension Extensions mostly use the same type of dependencies when creating them, so refactor the code to register all dependencies at once, and insert them in batches. --- src/backend/commands/extension.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index 472e69fdaf..5159e18cbf 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -1783,6 +1783,7 @@ InsertExtensionTuple(const char *extName, Oid extOwner, HeapTuple tuple; ObjectAddress myself; ObjectAddress nsp; + ObjectAddresses *refobjs; ListCell *lc; /* @@ -1825,27 +1826,25 @@ InsertExtensionTuple(const char *extName, Oid extOwner, */ recordDependencyOnOwner(ExtensionRelationId, extensionOid, extOwner); - myself.classId = ExtensionRelationId; - myself.objectId = extensionOid; - myself.objectSubId = 0; + refobjs = new_object_addresses(); - nsp.classId = NamespaceRelationId; - nsp.objectId = schemaOid; - nsp.objectSubId = 0; + ObjectAddressSet(myself, ExtensionRelationId, extensionOid); - recordDependencyOn(&myself, &nsp, DEPENDENCY_NORMAL); + ObjectAddressSet(nsp, NamespaceRelationId, schemaOid); + add_exact_object_address(&nsp, refobjs); foreach(lc, requiredExtensions) { Oid reqext = lfirst_oid(lc); ObjectAddress otherext; - otherext.classId = ExtensionRelationId; - otherext.objectId = reqext; - otherext.objectSubId = 0; - - recordDependencyOn(&myself, &otherext, DEPENDENCY_NORMAL); + ObjectAddressSet(otherext, ExtensionRelationId, reqext); + add_exact_object_address(&otherext, refobjs); } + + record_object_address_dependencies(&myself, refobjs, DEPENDENCY_NORMAL); + free_object_addresses(refobjs); + /* Post creation hook for new extension */ InvokeObjectPostCreateHook(ExtensionRelationId, extensionOid, 0); -- 2.27.0