Skip to content

Rework locks with RAII guards #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Handy-caT merged 5 commits into from
Feb 9, 2026
Merged

Rework locks with RAII guards #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
916e362
some guard ideas
Handy-caT Feb 8, 2026
974b53f
WIP
Handy-caT Feb 8, 2026
0526f26
correction
Handy-caT Feb 9, 2026
a02fe80
corrections
Handy-caT Feb 9, 2026
9515b2f
bump
Handy-caT Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["codegen", "examples", "performance_measurement", "performance_measur

[package]
name = "worktable"
version = "0.8.22"
version = "0.8.23"
edition = "2024"
authors = ["Handy-caT"]
license = "MIT"
Expand All @@ -16,7 +16,7 @@ perf_measurements = ["dep:performance_measurement", "dep:performance_measurement
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
worktable_codegen = { path = "codegen", version = "=0.8.22" }
worktable_codegen = { path = "codegen", version = "=0.8.23" }

async-trait = "0.1.89"
eyre = "0.6.12"
Expand Down
2 changes: 1 addition & 1 deletion codegen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "worktable_codegen"
version = "0.8.22"
version = "0.8.23"
edition = "2024"
license = "MIT"
description = "WorkTable codegeneration crate"
Expand Down
14 changes: 6 additions & 8 deletions codegen/src/worktable/generator/queries/delete.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ impl Generator {
where #pk_ident: From<Pk>
{
let pk: #pk_ident = pk.into();
let lock = {
#full_row_lock
};
let op_lock = { #full_row_lock };
let _guard = LockGuard::new(
op_lock,
self.0.lock_manager.clone(),
pk.clone(),
);

#delete_logic

lock.unlock(); // Releases locks
self.0.lock_manager.remove_with_lock_check(&pk); // Removes locks

core::result::Result::Ok(())
}
}
Expand Down Expand Up @@ -113,8 +113,6 @@ impl Generator {
.ok_or(WorkTableError::NotFound) {
Ok(l) => l,
Err(e) => {
lock.unlock(); // Releases locks
self.0.lock_manager.remove_with_lock_check(&pk); // Removes locks
return Err(e);
}
};
Expand Down
12 changes: 6 additions & 6 deletions codegen/src/worktable/generator/queries/in_place.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,12 @@ impl Generator {
where #pk_type: From<Pk>
{
let pk: #pk_type = by.into();
let lock = {
#custom_lock
};
let op_lock = { #custom_lock };
let _guard = LockGuard::new(
op_lock,
self.0.lock_manager.clone(),
pk.clone(),
);
let link = self
.0
.primary_index.pk_map
Expand All @@ -125,9 +128,6 @@ impl Generator {
.map_err(WorkTableError::PagesError)?
};

lock.unlock();
self.0.lock_manager.remove_with_lock_check(&pk);

Ok(())
}
}
Expand Down
143 changes: 54 additions & 89 deletions codegen/src/worktable/generator/queries/update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,21 +64,21 @@ impl Generator {
} else {
quote! {
if true {
lock.unlock(); // Releases locks
let lock = {
#full_row_lock
};
drop(_guard);
let op_lock = { #full_row_lock };
let _guard = LockGuard::new(
op_lock,
self.0.lock_manager.clone(),
pk.clone(),
);
let row_old = self.0.data.select_non_ghosted(link)?;
if let Err(e) = self.reinsert(row_old, row).await {
self.0.update_state.remove(&pk);
lock.unlock();

return Err(e);
}

self.0.update_state.remove(&pk);
lock.unlock();
self.0.lock_manager.remove_with_lock_check(&pk); // Removes locks

return core::result::Result::Ok(());
}
Expand All @@ -88,25 +88,19 @@ impl Generator {
quote! {
pub async fn update(&self, row: #row_ident) -> core::result::Result<(), WorkTableError> {
let pk = row.get_primary_key();
let lock = {
#full_row_lock
};

let mut link: Link = match self.0
let op_lock = { #full_row_lock };
let _guard = LockGuard::new(
op_lock,
self.0.lock_manager.clone(),
pk.clone(),
);

let mut link: Link = self.0
.primary_index
.pk_map
.get(&pk)
.map(|v| v.get().value.into())
.ok_or(WorkTableError::NotFound)
{
Ok(l) => l,
Err(e) => {
lock.unlock();
self.0.lock_manager.remove_with_lock_check(&pk);

return Err(e);
}
};
.ok_or(WorkTableError::NotFound)?;

let row_old = self.0.data.select_non_ghosted(link)?;
self.0.update_state.insert(pk.clone(), row_old);
Expand All @@ -128,9 +122,6 @@ impl Generator {

self.0.update_state.remove(&pk);

lock.unlock(); // Releases locks
self.0.lock_manager.remove_with_lock_check(&pk); // Removes locks

#persist_call

core::result::Result::Ok(())
Expand Down Expand Up @@ -266,25 +257,23 @@ impl Generator {
let mut need_to_reinsert = true;
#(#fields_check)*
if need_to_reinsert {
lock.unlock();
let lock = {
#full_row_lock
};
drop(_guard);
let op_lock = { #full_row_lock };
let _guard = LockGuard::new(
op_lock,
self.0.lock_manager.clone(),
pk.clone(),
);

let row_old = self.0.select(pk.clone()).expect("should not be deleted by other thread");
let mut row_new = row_old.clone();
let pk = row_old.get_primary_key().clone();
#(#row_updates)*
if let Err(e) = self.reinsert(row_old, row_new).await {
self.0.update_state.remove(&pk);
lock.unlock();

return Err(e);
}

lock.unlock(); // Releases locks
self.0.lock_manager.remove_with_lock_check(&pk); // Removes locks

return core::result::Result::Ok(());
}
}
Expand Down Expand Up @@ -475,24 +464,19 @@ impl Generator {
where #pk_ident: From<Pk>
{
let pk = pk.into();
let lock = {
#custom_lock
};

let mut link: Link = match self.0
let op_lock = { #custom_lock };
let _guard = LockGuard::new(
op_lock,
self.0.lock_manager.clone(),
pk.clone(),
);

let mut link: Link = self.0
.primary_index
.pk_map
.get(&pk)
.map(|v| v.get().value.into())
.ok_or(WorkTableError::NotFound) {
Ok(l) => l,
Err(e) => {
lock.unlock();
self.0.lock_manager.remove_with_lock_check(&pk);

return Err(e);
}
};
.ok_or(WorkTableError::NotFound)?;

let mut bytes = rkyv::to_bytes::<rkyv::rancor::Error>(&row).map_err(|_| WorkTableError::SerializeError)?;
let mut archived_row = unsafe { rkyv::access_unchecked_mut::<<#query_ident as rkyv::Archive>::Archived>(&mut bytes[..]).unseal_unchecked() };
Expand All @@ -508,9 +492,6 @@ impl Generator {

#diff_process_remove

lock.unlock();
self.0.lock_manager.remove_with_lock_check(&pk);

#persist_call

core::result::Result::Ok(())
Expand Down Expand Up @@ -569,27 +550,24 @@ impl Generator {
let mut need_to_reinsert = true;
#(#fields_check)*
if need_to_reinsert {
let op_lock = locks.remove(&pk).expect("should not be deleted as links are unique");
op_lock.unlock();
let lock = {
#full_row_lock
};
let old_guard = guards.remove(&pk).expect("guard should exist for this pk");
drop(old_guard);

let op_lock = { #full_row_lock };
let _guard = LockGuard::new(
op_lock,
self.0.lock_manager.clone(),
pk.clone(),
);
let row_old = self.0.select(pk.clone()).expect("should not be deleted by other thread");
let mut row_new = row_old.clone();
#(#row_updates)*
if let Err(e) = self.reinsert(row_old, row_new).await {
self.0.update_state.remove(&pk);
lock.unlock();

return Err(e);
}

lock.unlock(); // Releases locks
self.0.lock_manager.remove_with_lock_check(&pk); // Removes locks

continue;
} else {
pk_to_unlock.insert(pk.clone(), locks.remove(&pk).expect("should not be deleted as links are unique"));
}
}
} else {
Expand All @@ -614,17 +592,14 @@ impl Generator {
pub async fn #method_ident(&self, row: #query_ident, by: #by_ident) -> core::result::Result<(), WorkTableError> {
let links: Vec<_> = self.0.indexes.#index.get(#by).map(|(_, l)| l.0).collect();

let mut locks = std::collections::HashMap::new();
let mut guards: std::collections::HashMap<_, _> = std::collections::HashMap::new();
for link in links.iter() {
let pk = self.0.data.select_non_ghosted(*link)?.get_primary_key().clone();
let op_lock = {
#custom_lock
};
locks.insert(pk, op_lock);
let op_lock = { #custom_lock };
guards.insert(pk.clone(), LockGuard::new(op_lock, self.0.lock_manager.clone(), pk.clone()));
}

let links: Vec<_> = self.0.indexes.#index.get(#by).map(|(_, l)| l.0).collect();
let mut pk_to_unlock: std::collections::HashMap<_, std::sync::Arc<Lock>> = std::collections::HashMap::new();
let op_id = OperationId::Multi(uuid::Uuid::now_v7());
for link in links.into_iter() {
let pk = self.0.data.select_non_ghosted(link)?.get_primary_key().clone();
Expand All @@ -649,10 +624,8 @@ impl Generator {
#diff_process_remove

#persist_call
}
for (pk, lock) in pk_to_unlock {
lock.unlock();
self.0.lock_manager.remove_with_lock_check(&pk);

guards.remove(&pk);
}
core::result::Result::Ok(())
}
Expand Down Expand Up @@ -719,23 +692,18 @@ impl Generator {

let pk = self.0.data.select_non_ghosted(link)?.get_primary_key().clone();

let lock = {
#custom_lock
};
let op_lock = { #custom_lock };
let _guard = LockGuard::new(
op_lock,
self.0.lock_manager.clone(),
pk.clone(),
);

let link = loop {
let link = match self.0.indexes.#index
let link = self.0.indexes.#index
.get(#by)
.map(|v| v.get().value.into())
.ok_or(WorkTableError::NotFound) {
Ok(l) => l,
Err(e) => {
lock.unlock();
self.0.lock_manager.remove_with_lock_check(&pk);

return Err(e);
}
};
.ok_or(WorkTableError::NotFound)?;

if let Err(e) = self.0.data.select_non_vacuumed(link) {
if e.is_vacuumed() {
Expand All @@ -760,9 +728,6 @@ impl Generator {

#diff_process_remove

lock.unlock();
self.0.lock_manager.remove_with_lock_check(&pk);

#persist_call

core::result::Result::Ok(())
Expand Down
3 changes: 2 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ pub mod prelude {
pub use crate::in_memory::{
ArchivedRowWrapper, Data, DataPages, Query, RowWrapper, StorableRow,
};
pub use crate::lock::LockMap;
pub use crate::lock::FullRowLock;
pub use crate::lock::{Lock, RowLock};
pub use crate::lock::{LockGuard, LockMap};
pub use crate::mem_stat::MemStat;
pub use crate::persistence::{
DeleteOperation, IndexTableOfContents, InsertOperation, Operation, OperationId,
Expand Down
Loading
Loading