more consistent use of iterators in select queries (#8258)

This commit is contained in:
Blake Blackshear
2023-10-21 11:53:33 -04:00
committed by GitHub
parent e13a176820
commit 9fc93c72a0
5 changed files with 78 additions and 43 deletions

View File

@@ -99,13 +99,19 @@ class StorageMaintainer(threading.Thread):
[b["bandwidth"] for b in self.camera_storage_stats.values()]
)
recordings: Recordings = Recordings.select(
Recordings.id,
Recordings.start_time,
Recordings.end_time,
Recordings.segment_size,
Recordings.path,
).order_by(Recordings.start_time.asc())
recordings: Recordings = (
Recordings.select(
Recordings.id,
Recordings.start_time,
Recordings.end_time,
Recordings.segment_size,
Recordings.path,
)
.order_by(Recordings.start_time.asc())
.namedtuples()
.iterator()
)
retained_events: Event = (
Event.select(
Event.start_time,
@@ -116,12 +122,12 @@ class StorageMaintainer(threading.Thread):
Event.has_clip,
)
.order_by(Event.start_time.asc())
.objects()
.namedtuples()
)
event_start = 0
deleted_recordings = set()
for recording in recordings.objects().iterator():
for recording in recordings:
# check if 1 hour of storage has been reclaimed
if deleted_segments_size > hourly_bandwidth:
break
@@ -162,13 +168,18 @@ class StorageMaintainer(threading.Thread):
logger.error(
f"Could not clear {hourly_bandwidth} MB, currently {deleted_segments_size} MB have been cleared. Retained recordings must be deleted."
)
recordings = Recordings.select(
Recordings.id,
Recordings.path,
Recordings.segment_size,
).order_by(Recordings.start_time.asc())
recordings = (
Recordings.select(
Recordings.id,
Recordings.path,
Recordings.segment_size,
)
.order_by(Recordings.start_time.asc())
.namedtuples()
.iterator()
)
for recording in recordings.objects().iterator():
for recording in recordings:
if deleted_segments_size > hourly_bandwidth:
break