ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-03-26 15:26:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make possible to checkpoint a database from wal_hook

Browse Source
This commit is contained in:
gwenn 2024-11-10 15:40:57 +01:00
parent 6db7d47c36
commit cee97e9729
1 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/hooks/mod.rs
View File

@ -7,7 +7,7 @@ use std::ptr;
use crate::ffi; use crate::ffi;
use crate::{Connection, DatabaseName, InnerConnection}; use crate::{error, Connection, DatabaseName, InnerConnection, Result};
#[cfg(feature = "preupdate_hook")] #[cfg(feature = "preupdate_hook")]
pub use preupdate_hook::*; pub use preupdate_hook::*;
@ -389,23 +389,22 @@ impl Connection {
/// Calling `wal_hook` replaces any previously registered write-ahead log callback. /// Calling `wal_hook` replaces any previously registered write-ahead log callback.
/// Note that the `sqlite3_wal_autocheckpoint()` interface and the `wal_autocheckpoint` pragma /// Note that the `sqlite3_wal_autocheckpoint()` interface and the `wal_autocheckpoint` pragma
/// both invoke `sqlite3_wal_hook()` and will overwrite any prior `sqlite3_wal_hook()` settings. /// both invoke `sqlite3_wal_hook()` and will overwrite any prior `sqlite3_wal_hook()` settings.
pub fn wal_hook(&self, hook: Option<fn(DatabaseName<'_>, c_int) -> c_int>) { pub fn wal_hook(&self, hook: Option<fn(&Wal, c_int) -> Result<()>>) {
unsafe extern "C" fn wal_hook_callback( unsafe extern "C" fn wal_hook_callback(
client_data: *mut c_void, client_data: *mut c_void,
_db: *mut ffi::sqlite3, db: *mut ffi::sqlite3,
db_name: *const c_char, db_name: *const c_char,
pages: c_int, pages: c_int,
) -> c_int { ) -> c_int {
let hook_fn: fn(DatabaseName<'_>, c_int) -> c_int = std::mem::transmute(client_data); let hook_fn: fn(&Wal, c_int) -> Result<()> = std::mem::transmute(client_data);
c_int::from( let wal = Wal { db, db_name };
catch_unwind(|| { catch_unwind(|| match hook_fn(&wal, pages) {
hook_fn( Ok(_) => ffi::SQLITE_OK,
DatabaseName::from_cstr(std::ffi::CStr::from_ptr(db_name)), Err(e) => e
pages, .sqlite_error()
) .map_or(ffi::SQLITE_ERROR, |x| x.extended_code),
}) })
.unwrap_or_default(), .unwrap_or_default()
)
} }
let c = self.db.borrow_mut(); let c = self.db.borrow_mut();
match hook { match hook {
@ -442,6 +441,33 @@ impl Connection {
} }
} }
/// Write-Ahead Log
pub struct Wal {
db: *mut ffi::sqlite3,
db_name: *const c_char,
}
impl Wal {
/// Checkpoint a database
pub fn checkpoint(&self) -> Result<()> {
error::check(unsafe { ffi::sqlite3_wal_checkpoint(self.db, self.db_name) })
}
/// Checkpoint a database
pub fn checkpoint_v2(&self, mode: c_int) -> Result<(c_int, c_int)> {
let mut n_log = 0;
let mut n_ckpt = 0;
error::check(unsafe {
ffi::sqlite3_wal_checkpoint_v2(self.db, self.db_name, mode, &mut n_log, &mut n_ckpt)
})?;
Ok((n_log, n_ckpt))
}
/// Name of the database that was written to
pub fn name(&self) -> DatabaseName<'_> {
DatabaseName::from_cstr(unsafe { std::ffi::CStr::from_ptr(self.db_name) })
}
}
impl InnerConnection { impl InnerConnection {
#[inline] #[inline]
pub fn remove_hooks(&mut self) { pub fn remove_hooks(&mut self) {
@ -942,11 +968,11 @@ mod test {
assert_eq!(journal_mode, "wal"); assert_eq!(journal_mode, "wal");
static CALLED: AtomicBool = AtomicBool::new(false); static CALLED: AtomicBool = AtomicBool::new(false);
db.wal_hook(Some(|db_name, pages| { db.wal_hook(Some(|wal, pages| {
assert_eq!(db_name, DatabaseName::Main); assert_eq!(wal.name(), DatabaseName::Main);
assert!(pages > 0); assert!(pages > 0);
CALLED.swap(true, Ordering::Relaxed); CALLED.swap(true, Ordering::Relaxed);
crate::ffi::SQLITE_OK wal.checkpoint()
})); }));
db.execute_batch("CREATE TABLE x(c);")?; db.execute_batch("CREATE TABLE x(c);")?;
assert!(CALLED.load(Ordering::Relaxed)); assert!(CALLED.load(Ordering::Relaxed));