itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2026-03-13 17:27:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sqlite): set a busy timeout to handle SQLITE_BUSY

Browse Source
This commit is contained in:
Ryan Leckey 2020-06-10 01:02:41 -07:00
parent a2c55b9f31
commit 8359c01b76
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sqlx-core/src/sqlite/connection/establish.rs
View File

@ -3,8 +3,9 @@ use std::ptr::{null, null_mut};
use hashbrown::HashMap;
use libsqlite3_sys::{
sqlite3_extended_result_codes, sqlite3_open_v2, SQLITE_OK, SQLITE_OPEN_CREATE,
SQLITE_OPEN_MEMORY, SQLITE_OPEN_NOMUTEX, SQLITE_OPEN_PRIVATECACHE, SQLITE_OPEN_READWRITE,
sqlite3_busy_timeout, sqlite3_extended_result_codes, sqlite3_open_v2, SQLITE_OK,
SQLITE_OPEN_CREATE, SQLITE_OPEN_MEMORY, SQLITE_OPEN_NOMUTEX, SQLITE_OPEN_PRIVATECACHE,
SQLITE_OPEN_READWRITE,
};
use sqlx_rt::blocking;
@ -41,7 +42,7 @@ pub(super) async fn establish(options: &SqliteConnectOptions) -> Result<SqliteCo
let mut handle = null_mut();
// <https://www.sqlite.org/c3ref/open.html>
let status = unsafe {
let mut status = unsafe {
sqlite3_open_v2(
filename.as_bytes().as_ptr() as *const _,
&mut handle,
@ -56,6 +57,7 @@ pub(super) async fn establish(options: &SqliteConnectOptions) -> Result<SqliteCo
}
// SAFE: tested for NULL just above
// This allows any returns below to close this handle with RAII
let handle = unsafe { ConnectionHandle::new(handle) };
if status != SQLITE_OK {
@ -65,9 +67,20 @@ pub(super) async fn establish(options: &SqliteConnectOptions) -> Result<SqliteCo
// Enable extended result codes
// https://www.sqlite.org/c3ref/extended_result_codes.html
unsafe {
// NOTE: ignore the failure here
sqlite3_extended_result_codes(handle.0.as_ptr(), 1);
}
// Configure a busy timeout
// This causes SQLite to automatically sleep in increasing intervals until the time
// when there is something locked during [sqlite3_step]. This is sync. but we only
// run [sqlite3_step] in [blocking!] so its okay.
// TODO: Allow this timeout to be configured in SqliteOptions
status = unsafe { sqlite3_busy_timeout(handle.0.as_ptr(), 5000) };
if status != SQLITE_OK {
return Err(Error::Database(Box::new(SqliteError::new(handle.as_ptr()))));
}
Ok(handle)
})?;