mirror of
https://github.com/scottlamb/moonfire-nvr.git
synced 2024-12-26 07:05:56 -05:00
use SQLite3 "extra synchronous" pragma
See https://github.com/scottlamb/moonfire-nvr/issues/84#issuecomment-640862000 https://www.sqlite.org/pragma.html#pragma_synchronous
This commit is contained in:
parent
74fe33ec36
commit
6b5359b7cb
24
db/db.rs
24
db/db.rs
@ -1841,13 +1841,25 @@ impl LockedDatabase {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Sets pragmas for full database integrity.
|
||||||
|
pub(crate) fn set_integrity_pragmas(conn: &mut rusqlite::Connection) -> Result<(), Error> {
|
||||||
|
// Enforce foreign keys. This is on by default with --features=bundled (as rusqlite
|
||||||
|
// compiles the SQLite3 amalgamation with -DSQLITE_DEFAULT_FOREIGN_KEYS=1). Ensure it's
|
||||||
|
// always on. Note that our foreign keys are immediate rather than deferred, so we have to
|
||||||
|
// be careful about the order of operations during the upgrade.
|
||||||
|
conn.execute("pragma foreign_keys = on", params![])?;
|
||||||
|
|
||||||
|
// Make the database actually durable.
|
||||||
|
conn.execute("pragma fullfsync = on", params![])?;
|
||||||
|
conn.execute("pragma synchronous = 3", params![])?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
/// Initializes a database.
|
/// Initializes a database.
|
||||||
/// Note this doesn't set journal options, so that it can be used on in-memory databases for
|
/// Note this doesn't set journal options, so that it can be used on in-memory databases for
|
||||||
/// test code.
|
/// test code.
|
||||||
pub fn init(conn: &mut rusqlite::Connection) -> Result<(), Error> {
|
pub fn init(conn: &mut rusqlite::Connection) -> Result<(), Error> {
|
||||||
conn.execute("pragma foreign_keys = on", params![])?;
|
set_integrity_pragmas(conn)?;
|
||||||
conn.execute("pragma fullfsync = on", params![])?;
|
|
||||||
conn.execute("pragma synchronous = 2", params![])?;
|
|
||||||
let tx = conn.transaction()?;
|
let tx = conn.transaction()?;
|
||||||
tx.execute_batch(include_str!("schema.sql"))?;
|
tx.execute_batch(include_str!("schema.sql"))?;
|
||||||
{
|
{
|
||||||
@ -1906,11 +1918,9 @@ fn operation() -> &'static str { "database operation" }
|
|||||||
|
|
||||||
impl<C: Clocks + Clone> Database<C> {
|
impl<C: Clocks + Clone> Database<C> {
|
||||||
/// Creates the database from a caller-supplied SQLite connection.
|
/// Creates the database from a caller-supplied SQLite connection.
|
||||||
pub fn new(clocks: C, conn: rusqlite::Connection,
|
pub fn new(clocks: C, mut conn: rusqlite::Connection,
|
||||||
read_write: bool) -> Result<Database<C>, Error> {
|
read_write: bool) -> Result<Database<C>, Error> {
|
||||||
conn.execute("pragma foreign_keys = on", params![])?;
|
set_integrity_pragmas(&mut conn)?;
|
||||||
conn.execute("pragma fullfsync = on", params![])?;
|
|
||||||
conn.execute("pragma synchronous = 2", params![])?;
|
|
||||||
{
|
{
|
||||||
let ver = get_schema_version(&conn)?.ok_or_else(|| format_err!(
|
let ver = get_schema_version(&conn)?.ok_or_else(|| format_err!(
|
||||||
"no such table: version. \
|
"no such table: version. \
|
||||||
|
@ -103,16 +103,7 @@ fn upgrade(args: &Args, target_ver: i32, conn: &mut rusqlite::Connection) -> Res
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn run(args: &Args, conn: &mut rusqlite::Connection) -> Result<(), Error> {
|
pub fn run(args: &Args, conn: &mut rusqlite::Connection) -> Result<(), Error> {
|
||||||
// Enforce foreign keys. This is on by default with --features=bundled (as rusqlite
|
db::set_integrity_pragmas(conn)?;
|
||||||
// compiles the SQLite3 amalgamation with -DSQLITE_DEFAULT_FOREIGN_KEYS=1). Ensure it's
|
|
||||||
// always on. Note that our foreign keys are immediate rather than deferred, so we have to
|
|
||||||
// be careful about the order of operations during the upgrade.
|
|
||||||
conn.execute("pragma foreign_keys = on", params![])?;
|
|
||||||
|
|
||||||
// Make the database actually durable.
|
|
||||||
conn.execute("pragma fullfsync = on", params![])?;
|
|
||||||
conn.execute("pragma synchronous = 2", params![])?;
|
|
||||||
|
|
||||||
upgrade(args, db::EXPECTED_VERSION, conn)?;
|
upgrade(args, db::EXPECTED_VERSION, conn)?;
|
||||||
|
|
||||||
// WAL is the preferred journal mode for normal operation; it reduces the number of syncs
|
// WAL is the preferred journal mode for normal operation; it reduces the number of syncs
|
||||||
|
Loading…
Reference in New Issue
Block a user