Process Repeaters, Part 1

corehq/motech/repeaters/migrations/0016_add_indexes.py

@@ -12,49 +12,61 @@ class Migration(migrations.Migration):
         migrations.SeparateDatabaseAndState(
             state_operations=[
                 migrations.AlterField(
-                    model_name="repeatrecord",
-                    name="state",
-                    field=models.PositiveSmallIntegerField(
-                        choices=[
-                            (1, "Pending"),
-                            (2, "Failed"),
-                            (4, "Succeeded"),
-                            (8, "Cancelled"),
-                            (16, "Empty"),
-                            (32, "Invalid Payload"),
-                        ],
-                        db_index=True,
-                        default=1,
-                    ),
+                    model_name="repeater",
+                    name="is_deleted",
+                    field=models.BooleanField(default=False),
                 ),
                 migrations.AddIndex(
                     model_name="repeater",
                     index=models.Index(
-                        condition=models.Q(("is_deleted", False), ("is_paused", False)),
-                        fields=["next_attempt_at"],
-                        name="next_attempt_at_partial_idx",
+                        condition=models.Q(("is_deleted", False)),
+                        fields=["id"],
+                        name="is_deleted_partial_idx",
+                    ),
+                ),
+                migrations.AddIndex(
+                    model_name="repeatrecord",
+                    index=models.Index(
+                        condition=models.Q(("state__in", (1, 2))),
+                        fields=["repeater_id"],
+                        name="state_partial_idx",
                     ),
                 ),
             ],
 
             database_operations=[
+                # Drop `Repeater.id_deleted` index
                 migrations.RunSQL(
                     sql="""
-                    CREATE INDEX CONCURRENTLY "repeaters_repeatrecord_state_8055083b"
-                    ON "repeaters_repeatrecord" ("state");
+                    DROP INDEX CONCURRENTLY "repeaters_repeater_is_deleted_08441bf0";
                     """,
                     reverse_sql="""
-                    DROP INDEX CONCURRENTLY "repeaters_repeatrecord_state_8055083b";
+                    CREATE INDEX CONCURRENTLY "repeaters_repeater_is_deleted_08441bf0"
+                        ON "repeaters_repeater" ("is_deleted");
                     """
                 ),
+
+                # Replace with a partial index on `id_` column
+                migrations.RunSQL(
+                    sql="""
+                    CREATE INDEX CONCURRENTLY "is_deleted_partial_idx"
+                        ON "repeaters_repeater" ("id_")
+                        WHERE NOT "is_deleted";
+                    """,
+                    reverse_sql="""
+                    DROP INDEX CONCURRENTLY "is_deleted_partial_idx";
+                    """
+                ),
+
+                # Add partial index for RepeatRecord.state on `repeater_id`
                 migrations.RunSQL(
                     sql="""
-                    CREATE INDEX CONCURRENTLY "next_attempt_at_partial_idx"
-                    ON "repeaters_repeater" ("next_attempt_at")
-                    WHERE (NOT "is_deleted" AND NOT "is_paused");
+                    CREATE INDEX CONCURRENTLY "state_partial_idx"
+                        ON "repeaters_repeatrecord" ("repeater_id_")
+                        WHERE "state" IN (1, 2);
                     """,
                     reverse_sql="""
-                    DROP INDEX CONCURRENTLY "next_attempt_at_partial_idx";
+                    DROP INDEX CONCURRENTLY "state_partial_idx";
                     """
                 ),
             ]

corehq/motech/repeaters/models.py

@@ -288,7 +288,7 @@ class Repeater(RepeaterSuperProxy):
     max_workers = models.IntegerField(default=0)
     options = JSONField(default=dict)
     connection_settings_id = models.IntegerField(db_index=True)
-    is_deleted = models.BooleanField(default=False, db_index=True)
+    is_deleted = models.BooleanField(default=False)
     last_modified = models.DateTimeField(auto_now=True)
     date_created = models.DateTimeField(auto_now_add=True)
 
@@ -299,9 +299,9 @@ class Meta:
         db_table = 'repeaters_repeater'
         indexes = [
             models.Index(
-                fields=['next_attempt_at'],
-                condition=models.Q(("is_deleted", False), ("is_paused", False)),
-                name='next_attempt_at_partial_idx',
+                name='is_deleted_partial_idx',
+                fields=['id'],
+                condition=models.Q(is_deleted=False),
             ),
         ]
 
@@ -1037,7 +1037,6 @@ class RepeatRecord(models.Model):
     state = models.PositiveSmallIntegerField(
         choices=State.choices,
         default=State.Pending,
-        db_index=True,
     )
     registered_at = models.DateTimeField()
     next_check = models.DateTimeField(null=True, default=None)
@@ -1053,7 +1052,12 @@ class Meta:
                 name="next_check_not_null",
                 fields=["next_check"],
                 condition=models.Q(next_check__isnull=False),
-            )
+            ),
+            models.Index(
+                name="state_partial_idx",
+                fields=["repeater_id"],
+                condition=models.Q(state__in=(State.Pending, State.Fail)),
+            ),
         ]
         constraints = [
             models.CheckConstraint(