MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-04-03 11:20:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix error deleting a camera's last recordings

Browse Source 
I found this while bringing db.rs's test coverage up to the old
moonfire-db-test.cc. I mistakenly thought that in SQLite, an ungrouped
aggregate on a relation with no rows would return a row with a null result of
the aggregate. Instead, it returns no rows. In hindsight, this makes more
sense; it matches what grouped aggregates (have to) do.
This commit is contained in:
Scott Lamb 2016-11-30 10:41:25 -08:00
parent 0a7535536d
commit 32647e20f5
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/db.rs
View File

@ -622,12 +622,11 @@ impl<'a> Transaction<'a> {
// Recompute start and end times for each camera. // Recompute start and end times for each camera.
for (&camera_id, m) in &mut self.mods_by_camera { for (&camera_id, m) in &mut self.mods_by_camera {
// The minimum is straightforward, taking advantage of the start_time_90k index. // The minimum is straightforward, taking advantage of the start_time_90k index.
let min_start_opt: Option<i64> = let mut stmt = self.tx.prepare_cached(CAMERA_MIN_START_SQL)?;
self.tx.query_row_named(CAMERA_MIN_START_SQL, &[(":camera_id", &camera_id)], let mut rows = stmt.query_named(&[(":camera_id", &camera_id)])?;
|r| { r.get_checked(0) })??; let min_start = match rows.next() {
let min_start = match min_start_opt { Some(row) => recording::Time(row?.get_checked(0)?),
Some(min) => recording::Time(min), None => continue, // no data; leave m.range alone.
None => { continue; }, // no data; leave m.range alone.
}; };
// There was a minimum, so there should be a maximum too. Calculating it is less // There was a minimum, so there should be a maximum too. Calculating it is less
@ -1275,6 +1274,17 @@ mod tests {
assert_single_recording(&db, camera_uuid, &recording); assert_single_recording(&db, camera_uuid, &recording);
// Deleting a recording should succeed, update the min/max times, and re-reserve the uuid. // Deleting a recording should succeed, update the min/max times, and re-reserve the uuid.
// TODO {
let mut db = db.lock();
let mut v = Vec::new();
db.list_oldest_sample_files(camera_id, |r| { v.push(r); true }).unwrap();
assert_eq!(1, v.len());
let mut tx = db.tx().unwrap();
tx.delete_recordings(&v).unwrap();
tx.commit().unwrap();
}
assert_no_recordings(&db, camera_uuid);
assert_unsorted_eq(db.lock().list_reserved_sample_files().unwrap(),
vec![uuid_to_use, uuid_to_keep]);
} }
} }