bound recording overlap queries by segment length

Clip, export, review and recording deletion, debug replay, motion search, and audio transcription found overlapping recordings with an OR clause that gave SQLite no start_time range, so every call read the camera's whole recording history (30 to 300 ms on a 30 day database). The classification and review description point lookups did the same whenever the timestamp had no recording. A shared recording_overlap helper now adds a start_time lower bound of MAX_SEGMENT_DURATION before the range, which drops no rows because segments are always shorter than that.
This commit is contained in:
Josh Hawkins
2026-10-15 17:32:36 -05:00
parent d69a41a948
commit 3cd4c9c55c
12 changed files with 65 additions and 81 deletions
+3 -12
View File
@@ -80,6 +80,7 @@ from frigate.record.export import (
validate_ffmpeg_args, validate_ffmpeg_args,
) )
from frigate.util.path import sanitize_contained_path from frigate.util.path import sanitize_contained_path
from frigate.util.recording_coverage import recording_overlap
from frigate.util.time import is_current_hour from frigate.util.time import is_current_hour
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -177,15 +178,7 @@ def _validate_export_source(
) -> str | None: ) -> str | None:
if playback_source == PlaybackSourceEnum.recordings: if playback_source == PlaybackSourceEnum.recordings:
query = Recordings.select().where( query = Recordings.select().where(
( recording_overlap(start_time, end_time) & (Recordings.camera == camera_name)
Recordings.start_time.between(start_time, end_time)
| Recordings.end_time.between(start_time, end_time)
| (
(start_time > Recordings.start_time)
& (end_time < Recordings.end_time)
)
)
& (Recordings.camera == camera_name)
) )
# a pinned export reads only that stream, so the other stream's # a pinned export reads only that stream, so the other stream's
@@ -250,9 +243,7 @@ def _get_item_recording_export_errors(
query = Recordings.select(Recordings.start_time, Recordings.end_time).where( query = Recordings.select(Recordings.start_time, Recordings.end_time).where(
Recordings.camera == camera_name, Recordings.camera == camera_name,
Recordings.start_time.between(min_start, max_end) recording_overlap(min_start, max_end),
| Recordings.end_time.between(min_start, max_end)
| ((min_start > Recordings.start_time) & (max_end < Recordings.end_time)),
) )
# a pinned batch reads only that stream, so the other stream's # a pinned batch reads only that stream, so the other stream's
+5 -21
View File
@@ -42,7 +42,6 @@ from frigate.config.camera.snapshots import SnapshotsConfig
from frigate.const import ( from frigate.const import (
CACHE_DIR, CACHE_DIR,
INSTALL_DIR, INSTALL_DIR,
MAX_SEGMENT_DURATION,
PREVIEW_FRAME_TYPE, PREVIEW_FRAME_TYPE,
STREAM_TYPE_MAIN, STREAM_TYPE_MAIN,
STREAM_TYPE_SUB, STREAM_TYPE_SUB,
@@ -63,6 +62,7 @@ from frigate.util.recording_coverage import (
build_spans, build_spans,
null_audio_glitches, null_audio_glitches,
plan_clip, plan_clip,
recording_overlap,
resolve_coverage, resolve_coverage,
) )
from frigate.util.time import get_normalized_tz_name from frigate.util.time import get_normalized_tz_name
@@ -348,11 +348,7 @@ async def get_snapshot_from_recording(
Recordings.path, Recordings.path,
Recordings.start_time, Recordings.start_time,
) )
.where( .where(recording_overlap(frame_time, frame_time))
(frame_time >= Recordings.start_time)
& (frame_time <= Recordings.end_time)
& (Recordings.start_time >= frame_time - MAX_SEGMENT_DURATION)
)
.where(Recordings.camera == camera_name) .where(Recordings.camera == camera_name)
.order_by(Recordings.stream_type.asc(), Recordings.start_time.desc()) .order_by(Recordings.stream_type.asc(), Recordings.start_time.desc())
.limit(1) .limit(1)
@@ -368,11 +364,7 @@ async def get_snapshot_from_recording(
Recordings.path, Recordings.path,
Recordings.start_time, Recordings.start_time,
) )
.where( .where(recording_overlap(frame_time, frame_time))
(frame_time >= Recordings.start_time)
& (frame_time <= Recordings.end_time)
& (Recordings.start_time >= frame_time - MAX_SEGMENT_DURATION)
)
.where(Recordings.camera == camera_name) .where(Recordings.camera == camera_name)
.order_by(Recordings.stream_type.asc(), Recordings.start_time.desc()) .order_by(Recordings.stream_type.asc(), Recordings.start_time.desc())
.limit(1) .limit(1)
@@ -435,11 +427,7 @@ async def submit_recording_snapshot_to_plus(
Recordings.path, Recordings.path,
Recordings.start_time, Recordings.start_time,
) )
.where( .where(recording_overlap(frame_time, frame_time))
(frame_time >= Recordings.start_time)
& (frame_time <= Recordings.end_time)
& (Recordings.start_time >= frame_time - MAX_SEGMENT_DURATION)
)
.where(Recordings.camera == camera_name) .where(Recordings.camera == camera_name)
.order_by(Recordings.stream_type.asc(), Recordings.start_time.desc()) .order_by(Recordings.stream_type.asc(), Recordings.start_time.desc())
.limit(1) .limit(1)
@@ -553,11 +541,7 @@ async def recording_clip(
Recordings.start_time, Recordings.start_time,
Recordings.end_time, Recordings.end_time,
) )
.where( .where(recording_overlap(start_ts, end_ts))
(Recordings.start_time.between(start_ts, end_ts))
| (Recordings.end_time.between(start_ts, end_ts))
| ((start_ts > Recordings.start_time) & (end_ts < Recordings.end_time))
)
.where(Recordings.camera == camera_name) .where(Recordings.camera == camera_name)
.where(Recordings.stream_type == stream_type) .where(Recordings.stream_type == stream_type)
.order_by(Recordings.start_time.asc()) .order_by(Recordings.start_time.asc())
+2 -5
View File
@@ -36,6 +36,7 @@ from frigate.util.recording_coverage import (
coverage_spans, coverage_spans,
known_video_codecs, known_video_codecs,
realized_timelines, realized_timelines,
recording_overlap,
resolve_coverage, resolve_coverage,
stream_media_summary, stream_media_summary,
) )
@@ -537,11 +538,7 @@ async def delete_recordings(
# Build query to find overlapping recordings # Build query to find overlapping recordings
clauses = [ clauses = [
( recording_overlap(start, end),
Recordings.start_time.between(start, end)
| Recordings.end_time.between(start, end)
| ((start > Recordings.start_time) & (end < Recordings.end_time))
),
(Recordings.camera << camera_list), (Recordings.camera << camera_list),
] ]
+2 -8
View File
@@ -37,6 +37,7 @@ from frigate.const import STREAM_TYPE_MAIN
from frigate.embeddings import EmbeddingsContext from frigate.embeddings import EmbeddingsContext
from frigate.models import Recordings, ReviewSegment, UserReviewStatus from frigate.models import Recordings, ReviewSegment, UserReviewStatus
from frigate.review.types import SeverityEnum from frigate.review.types import SeverityEnum
from frigate.util.recording_coverage import recording_overlap
from frigate.util.time import get_dst_transitions from frigate.util.time import get_dst_transitions
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -585,14 +586,7 @@ def delete_reviews(body: ReviewModifyMultipleBody):
camera_name = review["camera"] camera_name = review["camera"]
recordings = ( recordings = (
Recordings.select(Recordings.id, Recordings.path) Recordings.select(Recordings.id, Recordings.path)
.where( .where(recording_overlap(start_time, end_time))
Recordings.start_time.between(start_time, end_time)
| Recordings.end_time.between(start_time, end_time)
| (
(start_time > Recordings.start_time)
& (end_time < Recordings.end_time)
)
)
.where(Recordings.camera == camera_name) .where(Recordings.camera == camera_name)
.dicts() .dicts()
.iterator() .iterator()
@@ -37,6 +37,7 @@ from frigate.genai.manager import GenAIClientManager
from frigate.models import Recordings, ReviewSegment from frigate.models import Recordings, ReviewSegment
from frigate.util.builtin import EventsPerSecond, InferenceSpeed from frigate.util.builtin import EventsPerSecond, InferenceSpeed
from frigate.util.image import get_image_from_recording from frigate.util.image import get_image_from_recording
from frigate.util.recording_coverage import recording_overlap
from ..post.api import PostProcessorApi from ..post.api import PostProcessorApi
from ..types import DataProcessorMetrics from ..types import DataProcessorMetrics
@@ -592,7 +593,7 @@ class ReviewDescriptionProcessor(PostProcessorApi):
Recordings.path, Recordings.path,
Recordings.start_time, Recordings.start_time,
) )
.where((ts >= Recordings.start_time) & (ts <= Recordings.end_time)) .where(recording_overlap(ts, ts))
.where(Recordings.camera == camera) .where(Recordings.camera == camera)
.where(Recordings.stream_type == STREAM_TYPE_MAIN) .where(Recordings.stream_type == STREAM_TYPE_MAIN)
.order_by(Recordings.start_time.desc()) .order_by(Recordings.start_time.desc())
+2 -5
View File
@@ -27,6 +27,7 @@ from frigate.jobs.manager import job_is_running, set_current_job
from frigate.models import Export, Recordings from frigate.models import Export, Recordings
from frigate.types import JobStatusTypesEnum from frigate.types import JobStatusTypesEnum
from frigate.util.ffmpeg import run_ffmpeg_with_progress from frigate.util.ffmpeg import run_ffmpeg_with_progress
from frigate.util.recording_coverage import recording_overlap
if TYPE_CHECKING: if TYPE_CHECKING:
from frigate.debug_replay import DebugReplayManager from frigate.debug_replay import DebugReplayManager
@@ -104,11 +105,7 @@ def query_recordings(source_camera: str, start_ts: float, end_ts: float) -> Mode
Recordings.start_time, Recordings.start_time,
Recordings.end_time, Recordings.end_time,
) )
.where( .where(recording_overlap(start_ts, end_ts))
Recordings.start_time.between(start_ts, end_ts)
| Recordings.end_time.between(start_ts, end_ts)
| ((start_ts > Recordings.start_time) & (end_ts < Recordings.end_time))
)
.where(Recordings.camera == source_camera) .where(Recordings.camera == source_camera)
.order_by(Recordings.start_time.asc()) .order_by(Recordings.start_time.asc())
) )
+2 -14
View File
@@ -35,6 +35,7 @@ from frigate.jobs.motion_search_decode import (
) )
from frigate.models import Recordings from frigate.models import Recordings
from frigate.types import JobStatusTypesEnum from frigate.types import JobStatusTypesEnum
from frigate.util.recording_coverage import recording_overlap
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -469,20 +470,7 @@ class MotionSearchRunner(threading.Thread):
recordings = list( recordings = list(
Recordings.select() Recordings.select()
.where( .where(
( recording_overlap(self.job.start_time_range, self.job.end_time_range)
Recordings.start_time.between(
self.job.start_time_range, self.job.end_time_range
)
)
| (
Recordings.end_time.between(
self.job.start_time_range, self.job.end_time_range
)
)
| (
(self.job.start_time_range > Recordings.start_time)
& (self.job.end_time_range < Recordings.end_time)
)
) )
.where(Recordings.camera == camera_name) .where(Recordings.camera == camera_name)
.where(Recordings.stream_type == STREAM_TYPE_MAIN) .where(Recordings.stream_type == STREAM_TYPE_MAIN)
+2 -8
View File
@@ -45,6 +45,7 @@ from frigate.util.recording_coverage import (
known_video_codecs, known_video_codecs,
null_audio_glitches, null_audio_glitches,
realized_timeline, realized_timeline,
recording_overlap,
resolve_coverage, resolve_coverage,
stream_media_summary, stream_media_summary,
) )
@@ -773,14 +774,7 @@ class RecordingExporter(threading.Thread):
Recordings.start_time, Recordings.start_time,
Recordings.end_time, Recordings.end_time,
) )
.where( .where(recording_overlap(self.start_time, self.end_time))
Recordings.start_time.between(self.start_time, self.end_time)
| Recordings.end_time.between(self.start_time, self.end_time)
| (
(self.start_time > Recordings.start_time)
& (self.end_time < Recordings.end_time)
)
)
.where( .where(
(Recordings.camera == self.camera) (Recordings.camera == self.camera)
& (Recordings.stream_type == stream_type) & (Recordings.stream_type == stream_type)
+28
View File
@@ -16,6 +16,7 @@ from frigate.util.recording_coverage import (
null_audio_glitches, null_audio_glitches,
plan_clip, plan_clip,
realized_timeline, realized_timeline,
recording_overlap,
resolve_coverage, resolve_coverage,
stream_media_summary, stream_media_summary,
) )
@@ -276,6 +277,33 @@ class TestRecordingCoverage(CoverageDbTestCase):
assert plan.duration_ms == 0 assert plan.duration_ms == 0
class TestRecordingOverlap(CoverageDbTestCase):
def test_matches_unbounded_overlap(self):
spans = [(1000, 1010), (1010, 1020), (1100, 1100 + MAX_SEGMENT_DURATION - 0.5)]
for i, (start, end) in enumerate(spans):
self._insert(f"r{i}", start, end, "main")
probes = [995, 1000, 1005, 1010, 1015, 1020, 1050, 1100, 1650, 1699.5, 1700]
for after in probes:
for before in probes:
if before < after:
continue
with self.subTest(after=after, before=before):
unbounded = Recordings.select(Recordings.id).where(
Recordings.start_time.between(after, before)
| Recordings.end_time.between(after, before)
| (
(after > Recordings.start_time)
& (before < Recordings.end_time)
)
)
bounded = Recordings.select(Recordings.id).where(
recording_overlap(after, before)
)
self.assertEqual({r.id for r in bounded}, {r.id for r in unbounded})
class TestVodManifestPolicy(CoverageDbTestCase): class TestVodManifestPolicy(CoverageDbTestCase):
"""Discontinuity policy of the vod mapping builder.""" """Discontinuity policy of the vod mapping builder."""
+2 -5
View File
@@ -19,6 +19,7 @@ from frigate.const import (
STREAM_TYPE_SUB, STREAM_TYPE_SUB,
) )
from frigate.models import Recordings from frigate.models import Recordings
from frigate.util.recording_coverage import recording_overlap
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -67,11 +68,7 @@ def _get_recordings_for_range(
Recordings.start_time, Recordings.start_time,
Recordings.end_time, Recordings.end_time,
) )
.where( .where(recording_overlap(start_ts, end_ts))
(Recordings.start_time.between(start_ts, end_ts))
| (Recordings.end_time.between(start_ts, end_ts))
| ((start_ts > Recordings.start_time) & (end_ts < Recordings.end_time))
)
.where(Recordings.camera == camera_name) .where(Recordings.camera == camera_name)
.where(Recordings.stream_type == stream_type) .where(Recordings.stream_type == stream_type)
.order_by(Recordings.start_time.asc()) .order_by(Recordings.start_time.asc())
+2 -2
View File
@@ -32,6 +32,7 @@ from frigate.util.image import (
relative_box_to_absolute, relative_box_to_absolute,
) )
from frigate.util.process import FrigateProcess from frigate.util.process import FrigateProcess
from frigate.util.recording_coverage import recording_overlap
BATCH_SIZE = 16 BATCH_SIZE = 16
EPOCHS = 50 EPOCHS = 50
@@ -553,8 +554,7 @@ def _extract_keyframes(
recording = ( recording = (
Recordings.select() Recordings.select()
.where( .where(
(timestamp >= Recordings.start_time) recording_overlap(timestamp, timestamp)
& (timestamp <= Recordings.end_time)
& (Recordings.camera == camera) & (Recordings.camera == camera)
& (Recordings.stream_type == STREAM_TYPE_MAIN) & (Recordings.stream_type == STREAM_TYPE_MAIN)
) )
+13
View File
@@ -23,6 +23,19 @@ class CoverageInterval:
sub: Any | None sub: Any | None
def recording_overlap(after: float, before: float) -> Any:
"""Match recordings overlapping [after, before] as a bounded index range.
Segments never reach MAX_SEGMENT_DURATION, so the start_time lower bound
drops no rows and keeps SQLite from walking the camera's whole history.
"""
return (
(Recordings.start_time <= before)
& (Recordings.end_time >= after)
& (Recordings.start_time >= after - MAX_SEGMENT_DURATION)
)
def _rows_query(camera: str, after: float, before: float, stream_type: str) -> Any: def _rows_query(camera: str, after: float, before: float, stream_type: str) -> Any:
return ( return (
Recordings.select( Recordings.select(