MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-01-14 00:05:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

more sanity checking for delete_oldest_recordings

Browse Source
This commit is contained in:
Scott Lamb 2018-02-23 14:05:07 -08:00
parent 8d9939603e
commit 81e1ec97b3
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db/db.rs
View File

@ -826,8 +826,13 @@ impl LockedDatabase {
None => bail!("stream {} has no directory!", stream_id), None => bail!("stream {} has no directory!", stream_id),
Some(d) => d, Some(d) => d,
}; };
let start = CompositeId::new(stream_id, 0);
let end = CompositeId(l.id.0 + 1); let end = CompositeId(l.id.0 + 1);
raw::delete_recordings(&tx, dir, CompositeId::new(stream_id, 0) .. end)?; let n = raw::delete_recordings(&tx, dir, start .. end)? as usize;
if n != s.to_delete.len() {
bail!("Found {} rows in {} .. {}, expected {}: {:?}",
n, start, end, s.to_delete.len(), &s.to_delete);
}
} }
} }
} }

18
db/raw.rs
View File

@ -122,9 +122,11 @@ pub(crate) fn insert_recording(tx: &rusqlite::Transaction, o: &db::Open, id: Com
/// Tranfers the given recording range from the `recording` and `recording_playback` tables to the /// Tranfers the given recording range from the `recording` and `recording_playback` tables to the
/// `garbage` table. `sample_file_dir_id` is assumed to be correct. /// `garbage` table. `sample_file_dir_id` is assumed to be correct.
///
/// Returns the number of recordings which were deleted.
pub(crate) fn delete_recordings(tx: &rusqlite::Transaction, sample_file_dir_id: i32, pub(crate) fn delete_recordings(tx: &rusqlite::Transaction, sample_file_dir_id: i32,
ids: Range<CompositeId>) ids: Range<CompositeId>)
-> Result<(), Error> { -> Result<i32, Error> {
let mut insert = tx.prepare_cached(r#" let mut insert = tx.prepare_cached(r#"
insert into garbage (sample_file_dir_id, composite_id) insert into garbage (sample_file_dir_id, composite_id)
select select
@ -148,7 +150,7 @@ pub(crate) fn delete_recordings(tx: &rusqlite::Transaction, sample_file_dir_id:
:start <= composite_id and :start <= composite_id and
composite_id < :end composite_id < :end
"#)?; "#)?;
insert.execute_named(&[ let n = insert.execute_named(&[
(":sample_file_dir_id", &sample_file_dir_id), (":sample_file_dir_id", &sample_file_dir_id),
(":start", &ids.start.0), (":start", &ids.start.0),
(":end", &ids.end.0), (":end", &ids.end.0),
@ -157,9 +159,15 @@ pub(crate) fn delete_recordings(tx: &rusqlite::Transaction, sample_file_dir_id:
(":start", &ids.start.0), (":start", &ids.start.0),
(":end", &ids.end.0), (":end", &ids.end.0),
]; ];
del1.execute_named(p)?; let n1 = del1.execute_named(p)?;
del2.execute_named(p)?; if n1 != n {
Ok(()) bail!("inserted {} rows but deleted {} recording rows!", n, n1);
}
let n2 = del2.execute_named(p)?;
if n2 != n {
bail!("deleted {} recording rows but {} recording_playback rows!", n, n2);
}
Ok(n)
} }
/// Marks the given sample files as deleted. This shouldn't be called until the files have /// Marks the given sample files as deleted. This shouldn't be called until the files have