mirror/trailbase
1
0
Fork 0
mirror of https://github.com/trailbaseio/trailbase.git synced 2025-12-30 14:19:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Avoid re-registration of graft. My bad

Browse Source
This commit is contained in:
Sebastian Jeltsch
2025-11-29 23:26:16 +01:00
parent c06e2747b6
commit 2854b9f10a
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
crates/extension/src/lib.rs
View File

@@ -51,8 +51,11 @@ fn graft_config(url: &url::Url) -> graft_kernel::setup::GraftConfig {
let path = PathBuf::from(url.path());
let data_dir = path.join("local");
if !data_dir.exists() {
if let Err(err) = std::fs::create_dir_all(&data_dir) {
log::error!("Failed to create {data_dir:?}: {err}");
let x = data_dir.join("journals");
if let Err(err) = std::fs::create_dir_all(&x) {
log::error!("Failed to create {x:?}: {err}");
} else {
log::info!("Created: {x:?}");
}
}
@@ -86,19 +89,30 @@ pub fn connect_sqlite(
}
#[allow(unused_mut)]
let mut is_graft = false;
let mut graft_tag: Option<PathBuf> = None;
#[cfg(feature = "graft")]
if let Some(ref path) = path {
// Expected someting like "file:///tmp/dir?vfs=graft".
// Expected something like "file:///tmp/dir?vfs=graft".
if let Ok(url) = url::Url::parse(&path.to_string_lossy()) {
if url.query_pairs().any(|(k, v)| {
return k == "vfs" && v == "graft";
}) {
graft_sqlite::register_static("graft", false, graft_config(&url))
.map_err(|err| Error::Other(format!("Failed to load Graft VGS: {err}").into()))?;
use std::sync::OnceLock;
is_graft = true;
static ONCE: OnceLock<Result<(), Error>> = OnceLock::new();
ONCE
.get_or_init(|| {
graft_sqlite::register_static("graft", false, graft_config(&url))
.map_err(|err| Error::Other(format!("Failed to load Graft VGS: {err}").into()))
})
.as_ref()
.map_err(|err| Error::Other(err.into()))?;
use base64::prelude::*;
let tag = BASE64_STANDARD.encode(url.path());
graft_tag = Some(PathBuf::from(format!("file:{tag}?vfs=graft")));
log::info!("Using graft tag: {graft_tag:?}");
}
}
}
@@ -112,14 +126,7 @@ pub fn connect_sqlite(
| OpenFlags::SQLITE_OPEN_NO_MUTEX
| OpenFlags::SQLITE_OPEN_URI;
rusqlite::Connection::open_with_flags(
if is_graft {
PathBuf::from("file:main?vfs=graft")
} else {
p
},
flags,
)?
rusqlite::Connection::open_with_flags(graft_tag.unwrap_or(p), flags)?
} else {
rusqlite::Connection::open_in_memory()?
},

3
crates/sqlite/benches/benchmark.rs
View File

@@ -51,7 +51,8 @@ impl<C: AsyncConnection> AsyncBenchmarkSetup<C> {
builder: impl AsyncFn(PathBuf) -> Result<C, BenchmarkError>,
) -> Result<Self, BenchmarkError> {
let tmp_dir = tempfile::TempDir::new().unwrap();
let fname = tmp_dir.path().join("main.sqlite");
let fname = tmp_dir.path().to_owned();
// let fname = tmp_dir.path().join("main.sqlite");
let conn = builder(fname.clone()).await?;
debug!("Set up: {fname:?}");