diff --git a/.gitignore b/.gitignore index c89e9b0..d8d934f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /.idea Cargo.lock db_path +bindings/python/target diff --git a/Cargo.toml b/Cargo.toml index fda0a5b..c9dfa9d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ crc32fast = "1" crossbeam-skiplist = "0.1" datafusion = { version = "42", optional = true } flume = { version = "0.11", features = ["async"] } -fusio = { package = "fusio", version = "0.3.1", features = [ +fusio = { package = "fusio", version = "0.3.3", features = [ "aws", "dyn", "fs", diff --git a/bindings/python/src/fs.rs b/bindings/python/src/fs.rs index b9b7f73..362b42f 100644 --- a/bindings/python/src/fs.rs +++ b/bindings/python/src/fs.rs @@ -43,6 +43,7 @@ pub enum FsOptions { region: Option, sign_payload: Option, checksum: Option, + endpoint: Option, }, } @@ -56,12 +57,14 @@ impl From for fusio_dispatch::FsOptions { region, sign_payload, checksum, + endpoint, } => fusio_dispatch::FsOptions::S3 { bucket, credential: credential.map(fusio::remotes::aws::AwsCredential::from), region, sign_payload, checksum, + endpoint, }, } } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 14404d0..55b253b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.80.0" +channel = "1.82" components = ["clippy", "rust-analyzer", "rustfmt"] diff --git a/src/inmem/mutable.rs b/src/inmem/mutable.rs index e5a1ea3..230baff 100644 --- a/src/inmem/mutable.rs +++ b/src/inmem/mutable.rs @@ -5,7 +5,7 @@ use crossbeam_skiplist::{ map::{Entry, Range}, SkipMap, }; -use fusio::{buffered::BufWriter, dynamic::DynFile, DynFs}; +use fusio::{buffered::BufWriter, DynFs, DynWrite}; use ulid::Ulid; use crate::{ @@ -37,7 +37,7 @@ where R: Record, { pub(crate) data: SkipMap, Option>, - wal: Option, R>>>, + wal: Option, R>>>, pub(crate) trigger: Arc + Send + Sync>>, } @@ -61,7 +61,7 @@ where ) .await?, option.wal_buffer_size, - )) as Box; + )) as Box; wal = Some(Mutex::new(WalFile::new(file, file_id))); }; diff --git a/src/wal/mod.rs b/src/wal/mod.rs index a982786..6f8589d 100644 --- a/src/wal/mod.rs +++ b/src/wal/mod.rs @@ -42,7 +42,7 @@ impl WalFile { impl WalFile where - F: Write + Unpin + Send, + F: Write + Send, R: Record, { pub(crate) async fn write<'r>(