zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Write to and read from the database in a transactional way

Browse Source 
Co-Authored-By: Kyle Caverly <kyle@zed.dev>
This commit is contained in:
Antonio Scandurra 2023-08-31 16:59:54 +02:00
parent 35440be98e
commit c763e728d1
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crates/semantic_index/src/db.rs
View File

@ -58,7 +58,8 @@ impl FromSql for Sha1 {
#[derive(Clone)]
pub struct VectorDatabase {
path: Arc<Path>,
transactions: smol::channel::Sender<Box<dyn 'static + Send + FnOnce(&rusqlite::Connection)>>,
transactions:
smol::channel::Sender<Box<dyn 'static + Send + FnOnce(&mut rusqlite::Connection)>>,
}
impl VectorDatabase {
@ -71,15 +72,16 @@ impl VectorDatabase {
fs.create_dir(db_directory).await?;
}
let (transactions_tx, transactions_rx) =
smol::channel::unbounded::<Box<dyn 'static + Send + FnOnce(&rusqlite::Connection)>>();
let (transactions_tx, transactions_rx) = smol::channel::unbounded::<
Box<dyn 'static + Send + FnOnce(&mut rusqlite::Connection)>,
>();
executor
.spawn({
let path = path.clone();
async move {
let connection = rusqlite::Connection::open(&path)?;
let mut connection = rusqlite::Connection::open(&path)?;
while let Ok(transaction) = transactions_rx.recv().await {
transaction(&connection);
transaction(&mut connection);
}
anyhow::Ok(())
@ -99,9 +101,9 @@ impl VectorDatabase {
&self.path
}
fn transact<F, T>(&self, transaction: F) -> impl Future<Output = Result<T>>
fn transact<F, T>(&self, f: F) -> impl Future<Output = Result<T>>
where
F: 'static + Send + FnOnce(&rusqlite::Connection) -> Result<T>,
F: 'static + Send + FnOnce(&rusqlite::Transaction) -> Result<T>,
T: 'static + Send,
{
let (tx, rx) = oneshot::channel();
@ -109,7 +111,14 @@ impl VectorDatabase {
async move {
if transactions
.send(Box::new(|connection| {
let result = transaction(connection);
let result = connection
.transaction()
.map_err(|err| anyhow!(err))
.and_then(|transaction| {
let result = f(&transaction)?;
transaction.commit()?;
Ok(result)
});
let _ = tx.send(result);
}))
.await