From 78e1782084c397f022aec45a0defd00a927e29b8 Mon Sep 17 00:00:00 2001
From: Blake Blackshear <blakeb@blakeshome.com>
Date: Sat, 30 Apr 2022 08:38:54 -0500
Subject: [PATCH] optimize query performance

---
 frigate/http.py                  | 19 +++++++++++++++-
 migrations/011_update_indexes.py | 39 ++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 migrations/011_update_indexes.py

diff --git a/frigate/http.py b/frigate/http.py
index 7261b4771..836566296 100644
--- a/frigate/http.py
+++ b/frigate/http.py
@@ -487,6 +487,21 @@ def events():
     clauses = []
     excluded_fields = []
 
+    selected_columns = [
+        Event.id,
+        Event.camera,
+        Event.label,
+        Event.zones,
+        Event.start_time,
+        Event.end_time,
+        Event.has_clip,
+        Event.has_snapshot,
+        Event.plus_id,
+        Event.retain_indefinitely,
+        Event.sub_label,
+        Event.top_score,
+    ]
+
     if camera != "all":
         clauses.append((Event.camera == camera))
 
@@ -510,12 +525,14 @@ def events():
 
     if not include_thumbnails:
         excluded_fields.append(Event.thumbnail)
+    else:
+        selected_columns.append(Event.thumbnail)
 
     if len(clauses) == 0:
         clauses.append((True))
 
     events = (
-        Event.select()
+        Event.select(*selected_columns)
         .where(reduce(operator.and_, clauses))
         .order_by(Event.start_time.desc())
         .limit(limit)
diff --git a/migrations/011_update_indexes.py b/migrations/011_update_indexes.py
new file mode 100644
index 000000000..ddb0ba9a6
--- /dev/null
+++ b/migrations/011_update_indexes.py
@@ -0,0 +1,39 @@
+"""Peewee migrations -- 011_update_indexes.py.
+
+Some examples (model - class or model name)::
+
+    > Model = migrator.orm['model_name']            # Return model in current state by name
+
+    > migrator.sql(sql)                             # Run custom SQL
+    > migrator.python(func, *args, **kwargs)        # Run python code
+    > migrator.create_model(Model)                  # Create a model (could be used as decorator)
+    > migrator.remove_model(model, cascade=True)    # Remove a model
+    > migrator.add_fields(model, **fields)          # Add fields to a model
+    > migrator.change_fields(model, **fields)       # Change fields
+    > migrator.remove_fields(model, *field_names, cascade=True)
+    > migrator.rename_field(model, old_field_name, new_field_name)
+    > migrator.rename_table(model, new_table_name)
+    > migrator.add_index(model, *col_names, unique=False)
+    > migrator.drop_index(model, *col_names)
+    > migrator.add_not_null(model, *field_names)
+    > migrator.drop_not_null(model, *field_names)
+    > migrator.add_default(model, field_name, default)
+
+"""
+import peewee as pw
+
+SQL = pw.SQL
+
+
+def migrate(migrator, database, fake=False, **kwargs):
+    migrator.sql(
+        'CREATE INDEX "event_start_time_end_time" ON "event" ("start_time" DESC, "end_time" DESC)'
+    )
+    migrator.sql("DROP INDEX recordings_start_time_end_time")
+    migrator.sql(
+        'CREATE INDEX "recordings_end_time_start_time" ON "recordings" ("end_time" DESC, "start_time" DESC)'
+    )
+
+
+def rollback(migrator, database, fake=False, **kwargs):
+    pass