replaced set_collection_deferred_fields with using only()

Author: Funi1234

pulp_ansible/app/galaxy/v3/views.py

@@ -80,7 +80,7 @@
 
 from pulp_ansible.app.tasks.deletion import delete_collection_version, delete_collection
 
-from pulp_ansible.app.utils import filter_content_for_repo_version, set_collection_deferred_fields
+from pulp_ansible.app.utils import filter_content_for_repo_version
 
 DOMAIN_ENABLED = settings.DOMAIN_ENABLED
 
@@ -446,15 +446,9 @@ def destroy(self, request: Request, *args, **kwargs) -> Response:
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # Defer loading large JSON fields to prevent memory exhaustion
-        set_collection_deferred_fields(
-            ["contents", "docs_blob", "manifest", "files", "dependencies"]
-        )
-
         repositories = set()
-        for version in collection.versions.all():
-            for repo in version.repositories.all():
-                repositories.add(repo)
+        for version in collection.versions.only("pk"):
+            repositories.update(version.repositories.only("pk"))
 
         async_result = dispatch(
             delete_collection,
@@ -469,9 +463,9 @@ def get_collection_dependents(parent):
     """Given a parent collection, return a list of collection versions that depend on it."""
     key = f"{parent.namespace}.{parent.name}"
     return list(
-        CollectionVersion.objects.exclude(collection=parent).filter(
-            dependencies__has_key=key, pulp_domain=get_domain()
-        )
+        CollectionVersion.objects.exclude(collection=parent)
+        .filter(dependencies__has_key=key, pulp_domain=get_domain())
+        .only("namespace", "name", "version")
     )
 
 

pulp_ansible/app/tasks/deletion.py

@@ -17,7 +17,6 @@
 from collections import defaultdict
 
 from pulp_ansible.app.models import Collection, CollectionVersion
-from pulp_ansible.app.utils import set_collection_deferred_fields
 from pulpcore.plugin.tasking import add_and_remove, orphan_cleanup
 
 log = logging.getLogger(__name__)
@@ -33,7 +32,7 @@ def _remove_collection_version_from_repos(collection_versions):
     """Remove CollectionVersions from latest RepositoryVersion of each repo."""
     repos_with_collections_to_delete = defaultdict(list)
     for collection_version in collection_versions:
-        for repo in collection_version.repositories.all():
+        for repo in collection_version.repositories.only("pk"):
             repos_with_collections_to_delete[repo].append(collection_version.pk)
     for repo, collections in repos_with_collections_to_delete.items():
         add_and_remove(repo.pk, add_content_units=[], remove_content_units=collections)
@@ -72,11 +71,8 @@ def delete_collection(collection_pk):
     2. Run orphan_cleanup to delete the CollectionVersions
     3. Delete Collection
     """
-    # Defer loading large JSON fields to prevent memory exhaustion
-    set_collection_deferred_fields(["contents", "docs_blob", "manifest", "files", "dependencies"])
-
     collection = Collection.objects.get(pk=collection_pk)
-    versions = collection.versions.all()
+    versions = collection.versions.only("pk")
     _remove_collection_version_from_repos(versions)
     version_pks = versions.values_list("pk", flat=True)