Remove 2x unnecessary index on reviewsegment, remove reference to prior code implementation in comment in event.py

This commit is contained in:
Greg 2026-05-18 14:16:43 -07:00
parent 7b55c4b758
commit 9fa345f192
2 changed files with 16 additions and 26 deletions

View File

@ -411,22 +411,20 @@ def events_explore(
)
# Single query: per-label COUNT and top-N ranking by start_time computed
# via window functions in a CTE, then filtered to rn <= limit. Replaces
# the previous loop that issued 2 queries per distinct label.
event_count = (
fn.COUNT(Event.id).over(partition_by=[Event.label]).alias("event_count")
)
rn = (
fn.ROW_NUMBER()
.over(partition_by=[Event.label], order_by=[Event.start_time.desc()])
.alias("rn")
)
# via window functions in a CTE, then filtered to rn <= limit
event_count = fn.COUNT(Event.id).over(partition_by=[Event.label]).alias("event_count")
rn = fn.ROW_NUMBER().over(
partition_by=[Event.label], order_by=[Event.start_time.desc()]
).alias("rn")
base_query = Event.select(
*explore_columns,
event_count,
rn,
).where(Event.camera << allowed_cameras)
base_query = (
Event.select(
*explore_columns,
event_count,
rn,
)
.where(Event.camera << allowed_cameras)
)
ranked = base_query.cte("ranked")
query = (
Event.select(
@ -484,7 +482,9 @@ def events_explore(
"false_positive": event.false_positive,
"box": event.box,
"data": {
k: v for k, v in (event.data or {}).items() if k in allowed_data_keys
k: v
for k, v in (event.data or {}).items()
if k in allowed_data_keys
},
"event_count": event.event_count,
}

View File

@ -21,17 +21,7 @@ def migrate(migrator, database, fake=False, **kwargs):
'CREATE INDEX IF NOT EXISTS "event_camera_start_time" '
'ON "event" ("camera", "start_time" DESC)'
)
migrator.sql(
'CREATE INDEX IF NOT EXISTS "reviewsegment_camera_start_time" '
'ON "reviewsegment" ("camera", "start_time" DESC)'
)
migrator.sql(
'CREATE INDEX IF NOT EXISTS "reviewsegment_end_time" '
'ON "reviewsegment" ("end_time")'
)
def rollback(migrator, database, fake=False, **kwargs):
migrator.sql('DROP INDEX IF EXISTS "event_camera_start_time"')
migrator.sql('DROP INDEX IF EXISTS "reviewsegment_camera_start_time"')
migrator.sql('DROP INDEX IF EXISTS "reviewsegment_end_time"')