🗂 Add a couple of missing covering indexes (#501)

Author: hardbyte

alembic/versions/056b595a6a00_add_covering_indexes.py

@@ -0,0 +1,63 @@
+"""Add covering indexes
+
+Revision ID: 056b595a6a00
+Revises: 156d8781d7b8
+Create Date: 2024-07-27 10:09:23.909935
+
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "056b595a6a00"
+down_revision = "156d8781d7b8"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_index(
+        "ix_events_service",
+        "events",
+        ["service_account_id"],
+        unique=False,
+        postgresql_where=sa.text("service_account_id IS NOT NULL"),
+    )
+    op.create_index(
+        "ix_labelset_service_account_id",
+        "labelsets",
+        ["labelled_by_sa_id"],
+        unique=False,
+        postgresql_where=sa.text("labelled_by_sa_id IS NOT NULL"),
+    )
+    op.create_index(
+        "ix_labelset_user_id",
+        "labelsets",
+        ["labelled_by_user_id"],
+        unique=False,
+        postgresql_where=sa.text("labelled_by_user_id IS NOT NULL"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(
+        "ix_labelset_user_id",
+        table_name="labelsets",
+        postgresql_where=sa.text("labelled_by_user_id IS NOT NULL"),
+    )
+    op.drop_index(
+        "ix_labelset_service_account_id",
+        table_name="labelsets",
+        postgresql_where=sa.text("labelled_by_sa_id IS NOT NULL"),
+    )
+    op.drop_index(
+        "ix_events_service",
+        table_name="events",
+        postgresql_where=sa.text("service_account_id IS NOT NULL"),
+    )
+    # ### end Alembic commands ###

app/models/event.py

@@ -65,14 +65,6 @@ def description(self):
         "User", back_populates="events", foreign_keys=[user_id]
     )
 
-    # Partial indexes for school and user events
-
-    __table_args__ = (
-        Index("ix_events_school", "school_id", postgresql_where=school_id.is_not(None)),
-        Index("ix_events_user", "user_id", postgresql_where=user_id.is_not(None)),
-        # Index("ix_events_info_work_id", "info", postgresql_where=info.has.is_not(None)),
-    )
-
     service_account_id: Mapped[Optional[uuid.UUID]] = mapped_column(
         ForeignKey("service_accounts.id", name="fk_event_service_account"),
         nullable=True,
@@ -81,6 +73,18 @@ def description(self):
         "ServiceAccount", foreign_keys=[service_account_id], back_populates="events"
     )
 
+    # Partial covering indexes for school, user, and service account foreign relations
+    __table_args__ = (
+        Index("ix_events_school", "school_id", postgresql_where=school_id.is_not(None)),
+        Index("ix_events_user", "user_id", postgresql_where=user_id.is_not(None)),
+        Index(
+            "ix_events_service",
+            "service_account_id",
+            postgresql_where=service_account_id.is_not(None),
+        ),
+        # Index("ix_events_info_work_id", "info", postgresql_where=info.has.is_not(None)),
+    )
+
     def __repr__(self):
         return f"<Event {self.title} - {self.description}>"
 

app/models/labelset.py

@@ -133,6 +133,20 @@ class LabelSet(Base):
     checked: Mapped[bool] = mapped_column(Boolean(), nullable=True)
     checked_at: Mapped[datetime] = mapped_column(DateTime, nullable=True)
 
+    # Partial covering indexes for labeller foreign relations
+    __table_args__ = (
+        Index(
+            "ix_labelset_user_id",
+            "labelled_by_user_id",
+            postgresql_where=labelled_by_user_id.is_not(None),
+        ),
+        Index(
+            "ix_labelset_service_account_id",
+            "labelled_by_sa_id",
+            postgresql_where=labelled_by_sa_id.is_not(None),
+        ),
+    )
+
     def __repr__(self):
         return f"<LabelSet id={self.id} - '{self.work.title}' ages: {self.min_age}-{self.max_age} >"