From 4494412f0ce4e77b9727cb310cef0aa9dc42c0b4 Mon Sep 17 00:00:00 2001 From: John Westcott IV Date: Fri, 28 Apr 2023 11:27:01 -0400 Subject: [PATCH] Replacing depricated index_togeather with new indexes --- awx/main/migrations/0185_djanog_indexes.py | 102 +++++++++++++++++++++ awx/main/models/events.py | 38 ++++---- awx/main/models/rbac.py | 10 +- 3 files changed, 126 insertions(+), 24 deletions(-) create mode 100644 awx/main/migrations/0185_djanog_indexes.py diff --git a/awx/main/migrations/0185_djanog_indexes.py b/awx/main/migrations/0185_djanog_indexes.py new file mode 100644 index 0000000000..38ce084606 --- /dev/null +++ b/awx/main/migrations/0185_djanog_indexes.py @@ -0,0 +1,102 @@ +# Generated by Django 4.2 on 2023-04-28 19:21 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ('main', '0184_django_upgrade'), + ] + + operations = [ + migrations.RenameIndex( + model_name='adhoccommandevent', + new_name='main_adhocc_ad_hoc__a57777_idx', + old_fields=('ad_hoc_command', 'job_created', 'counter'), + ), + migrations.RenameIndex( + model_name='adhoccommandevent', + new_name='main_adhocc_ad_hoc__e72142_idx', + old_fields=('ad_hoc_command', 'job_created', 'event'), + ), + migrations.RenameIndex( + model_name='adhoccommandevent', + new_name='main_adhocc_ad_hoc__1e4d24_idx', + old_fields=('ad_hoc_command', 'job_created', 'uuid'), + ), + migrations.RenameIndex( + model_name='inventoryupdateevent', + new_name='main_invent_invento_f72b21_idx', + old_fields=('inventory_update', 'job_created', 'uuid'), + ), + migrations.RenameIndex( + model_name='inventoryupdateevent', + new_name='main_invent_invento_364dcb_idx', + old_fields=('inventory_update', 'job_created', 'counter'), + ), + migrations.RenameIndex( + model_name='jobevent', + new_name='main_jobeve_job_id_51c382_idx', + old_fields=('job', 'job_created', 'counter'), + ), + migrations.RenameIndex( + model_name='jobevent', + new_name='main_jobeve_job_id_0ddc6b_idx', + old_fields=('job', 'job_created', 'event'), + ), + migrations.RenameIndex( + model_name='jobevent', + new_name='main_jobeve_job_id_40a56d_idx', + old_fields=('job', 'job_created', 'parent_uuid'), + ), + migrations.RenameIndex( + model_name='jobevent', + new_name='main_jobeve_job_id_3c4a4a_idx', + old_fields=('job', 'job_created', 'uuid'), + ), + migrations.RenameIndex( + model_name='projectupdateevent', + new_name='main_projec_project_c44b7c_idx', + old_fields=('project_update', 'job_created', 'event'), + ), + migrations.RenameIndex( + model_name='projectupdateevent', + new_name='main_projec_project_449bbd_idx', + old_fields=('project_update', 'job_created', 'uuid'), + ), + migrations.RenameIndex( + model_name='projectupdateevent', + new_name='main_projec_project_69559a_idx', + old_fields=('project_update', 'job_created', 'counter'), + ), + migrations.RenameIndex( + model_name='role', + new_name='main_rbac_r_content_979bdd_idx', + old_fields=('content_type', 'object_id'), + ), + migrations.RenameIndex( + model_name='roleancestorentry', + new_name='main_rbac_r_ancesto_22b9f0_idx', + old_fields=('ancestor', 'content_type_id', 'object_id'), + ), + migrations.RenameIndex( + model_name='roleancestorentry', + new_name='main_rbac_r_ancesto_b44606_idx', + old_fields=('ancestor', 'content_type_id', 'role_field'), + ), + migrations.RenameIndex( + model_name='roleancestorentry', + new_name='main_rbac_r_ancesto_c87b87_idx', + old_fields=('ancestor', 'descendent'), + ), + migrations.RenameIndex( + model_name='systemjobevent', + new_name='main_system_system__e39825_idx', + old_fields=('system_job', 'job_created', 'uuid'), + ), + migrations.RenameIndex( + model_name='systemjobevent', + new_name='main_system_system__73537a_idx', + old_fields=('system_job', 'job_created', 'counter'), + ), + ] diff --git a/awx/main/models/events.py b/awx/main/models/events.py index c28c5de89b..b18a8ce5a2 100644 --- a/awx/main/models/events.py +++ b/awx/main/models/events.py @@ -470,11 +470,11 @@ class JobEvent(BasePlaybookEvent): class Meta: app_label = 'main' ordering = ('pk',) - index_together = [ - ('job', 'job_created', 'event'), - ('job', 'job_created', 'uuid'), - ('job', 'job_created', 'parent_uuid'), - ('job', 'job_created', 'counter'), + indexes = [ + models.Index(fields=['job', 'job_created', 'event']), + models.Index(fields=['job', 'job_created', 'uuid']), + models.Index(fields=['job', 'job_created', 'parent_uuid']), + models.Index(fields=['job', 'job_created', 'counter']), ] id = models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID') @@ -632,10 +632,10 @@ class ProjectUpdateEvent(BasePlaybookEvent): class Meta: app_label = 'main' ordering = ('pk',) - index_together = [ - ('project_update', 'job_created', 'event'), - ('project_update', 'job_created', 'uuid'), - ('project_update', 'job_created', 'counter'), + indexes = [ + models.Index(fields=['project_update', 'job_created', 'event']), + models.Index(fields=['project_update', 'job_created', 'uuid']), + models.Index(fields=['project_update', 'job_created', 'counter']), ] id = models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID') @@ -770,10 +770,10 @@ class AdHocCommandEvent(BaseCommandEvent): class Meta: app_label = 'main' ordering = ('-pk',) - index_together = [ - ('ad_hoc_command', 'job_created', 'event'), - ('ad_hoc_command', 'job_created', 'uuid'), - ('ad_hoc_command', 'job_created', 'counter'), + indexes = [ + models.Index(fields=['ad_hoc_command', 'job_created', 'event']), + models.Index(fields=['ad_hoc_command', 'job_created', 'uuid']), + models.Index(fields=['ad_hoc_command', 'job_created', 'counter']), ] EVENT_TYPES = [ @@ -875,9 +875,9 @@ class InventoryUpdateEvent(BaseCommandEvent): class Meta: app_label = 'main' ordering = ('-pk',) - index_together = [ - ('inventory_update', 'job_created', 'uuid'), - ('inventory_update', 'job_created', 'counter'), + indexes = [ + models.Index(fields=['inventory_update', 'job_created', 'uuid']), + models.Index(fields=['inventory_update', 'job_created', 'counter']), ] id = models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID') @@ -920,9 +920,9 @@ class SystemJobEvent(BaseCommandEvent): class Meta: app_label = 'main' ordering = ('-pk',) - index_together = [ - ('system_job', 'job_created', 'uuid'), - ('system_job', 'job_created', 'counter'), + indexes = [ + models.Index(fields=['system_job', 'job_created', 'uuid']), + models.Index(fields=['system_job', 'job_created', 'counter']), ] id = models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID') diff --git a/awx/main/models/rbac.py b/awx/main/models/rbac.py index 8f54cc3e43..5febf88eb2 100644 --- a/awx/main/models/rbac.py +++ b/awx/main/models/rbac.py @@ -141,7 +141,7 @@ class Role(models.Model): app_label = 'main' verbose_name_plural = _('roles') db_table = 'main_rbac_roles' - index_together = [("content_type", "object_id")] + indexes = [models.Index(fields=["content_type", "object_id"])] ordering = ("content_type", "object_id") role_field = models.TextField(null=False) @@ -447,10 +447,10 @@ class RoleAncestorEntry(models.Model): app_label = 'main' verbose_name_plural = _('role_ancestors') db_table = 'main_rbac_role_ancestors' - index_together = [ - ("ancestor", "content_type_id", "object_id"), # used by get_roles_on_resource - ("ancestor", "content_type_id", "role_field"), # used by accessible_objects - ("ancestor", "descendent"), # used by rebuild_role_ancestor_list in the NOT EXISTS clauses. + indexes = [ + models.Index(fields=["ancestor", "content_type_id", "object_id"]), # used by get_roles_on_resource + models.Index(fields=["ancestor", "content_type_id", "role_field"]), # used by accessible_objects + models.Index(fields=["ancestor", "descendent"]), # used by rebuild_role_ancestor_list in the NOT EXISTS clauses. ] descendent = models.ForeignKey(Role, null=False, on_delete=models.CASCADE, related_name='+')