B tree indexing

py_backend/alembic/versions/0022_add_filtering_indexes.py

@@ -0,0 +1,47 @@
+"""add_filtering_indexes
+
+Revision ID: 0022
+Revises: 0021
+Create Date: 2024-12-19 12:00:00.000000
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0022'
+down_revision = '0021'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Indexes for images table - commonly filtered columns
+    # Note: ix_images_captured_at already exists from migration 0016, skip it here
+    op.execute("CREATE INDEX IF NOT EXISTS ix_images_source ON images(source)")
+    op.execute("CREATE INDEX IF NOT EXISTS ix_images_event_type ON images(event_type)")
+    op.execute("CREATE INDEX IF NOT EXISTS ix_images_image_type ON images(image_type)")
+    
+    # Indexes for captions table - filtered and ordered columns
+    op.execute("CREATE INDEX IF NOT EXISTS ix_captions_starred ON captions(starred)")
+    op.execute("CREATE INDEX IF NOT EXISTS ix_captions_created_at ON captions(created_at)")
+    
+    # Indexes for join tables - improve join performance
+    op.execute("CREATE INDEX IF NOT EXISTS ix_image_countries_image_id ON image_countries(image_id)")
+    op.execute("CREATE INDEX IF NOT EXISTS ix_image_countries_c_code ON image_countries(c_code)")
+    
+    # Index on Country.r_code for region filtering
+    op.execute("CREATE INDEX IF NOT EXISTS ix_countries_r_code ON countries(r_code)")
+
+
+def downgrade():
+    op.drop_index('ix_countries_r_code', table_name='countries', if_exists=True)
+    op.drop_index('ix_image_countries_c_code', table_name='image_countries', if_exists=True)
+    op.drop_index('ix_image_countries_image_id', table_name='image_countries', if_exists=True)
+    op.drop_index('ix_captions_created_at', table_name='captions', if_exists=True)
+    op.drop_index('ix_captions_starred', table_name='captions', if_exists=True)
+    op.drop_index('ix_images_image_type', table_name='images', if_exists=True)
+    op.drop_index('ix_images_event_type', table_name='images', if_exists=True)
+    op.drop_index('ix_images_source', table_name='images', if_exists=True)
+

py_backend/app/models.py

@@ -1,6 +1,6 @@
 from sqlalchemy import (
     Column, String, DateTime, SmallInteger, Table, ForeignKey, Boolean,
-    CheckConstraint, UniqueConstraint, Text, Integer
+    CheckConstraint, UniqueConstraint, Text, Integer, Index
 )
 from sqlalchemy.dialects.postgresql import UUID, TIMESTAMP, CHAR, JSONB
 from sqlalchemy.orm import relationship
@@ -22,6 +22,8 @@ image_countries = Table(
       ForeignKey("countries.c_code"),
       primary_key=True,
     ),
+    Index('ix_image_countries_image_id', 'image_id'),
+    Index('ix_image_countries_c_code', 'c_code'),
 )
 
 images_captions = Table(
@@ -121,6 +123,10 @@ class Images(Base):
         CheckConstraint('pitch_deg IS NULL OR (pitch_deg BETWEEN -90 AND 90)', name='chk_images_pitch_deg'),
         CheckConstraint('yaw_deg IS NULL OR (yaw_deg BETWEEN -180 AND 180)', name='chk_images_yaw_deg'),
         CheckConstraint('roll_deg IS NULL OR (roll_deg BETWEEN -180 AND 180)', name='chk_images_roll_deg'),
+        Index('ix_images_source', 'source'),
+        Index('ix_images_event_type', 'event_type'),
+        Index('ix_images_image_type', 'image_type'),
+        Index('ix_images_captured_at', 'captured_at'),
     )
 
     image_id    = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
@@ -159,6 +165,8 @@ class Captions(Base):
         CheckConstraint('accuracy IS NULL OR (accuracy BETWEEN 0 AND 100)', name='chk_captions_accuracy'),
         CheckConstraint('context IS NULL OR (context BETWEEN 0 AND 100)', name='chk_captions_context'),
         CheckConstraint('usability IS NULL OR (usability BETWEEN 0 AND 100)', name='chk_captions_usability'),
+        Index('ix_captions_starred', 'starred'),
+        Index('ix_captions_created_at', 'created_at'),
     )
 
     caption_id  = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)