Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ derive_more = { version = "2.0.1", features = ["from", "error", "display", "into
tokio = { version = "1", features = ["full"] }
tracing = "0.1"
rkyv = { version = "0.8.9", features = ["uuid-1"] }
lockfree = { version = "0.5.1" }
lock_freedom = "0.1"
fastrand = "2.3.0"
futures = "0.3.30"
uuid = { version = "1.10.0", features = ["v4", "v7"] }
Expand Down
2 changes: 1 addition & 1 deletion performance_measurement/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ description = "Package taht can be used to measuere function execution time"
[dependencies]
lazy_static = {version = "1.5.0"}
derive_more = {version = "1.0.0", features = ["display"]}
lockfree = {version = "0.5.1"}
lock_freedom = "0.1"
2 changes: 1 addition & 1 deletion performance_measurement/src/profiler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::time::{Duration, Instant};

use derive_more::Display;
use lazy_static::lazy_static;
use lockfree::map::Map;
use lock_freedom::map::Map;

lazy_static! {
static ref GLOBAL_PERFORMANCE_MEASUREMENTS: Map<&'static str, PerformanceMeasurement> =
Expand Down
2 changes: 1 addition & 1 deletion src/in_memory/pages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::{

use data_bucket::page::PageId;
use derive_more::{Display, Error, From};
use lockfree::stack::Stack;
use lock_freedom::stack::Stack;
#[cfg(feature = "perf_measurements")]
use performance_measurement_codegen::performance_measurement;
use rkyv::{
Expand Down
4 changes: 2 additions & 2 deletions src/persistence/task.rs
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ where

#[derive(Debug)]
pub struct Queue<PrimaryKeyGenState, PrimaryKey, SecondaryKeys> {
queue: lockfree::queue::Queue<Operation<PrimaryKeyGenState, PrimaryKey, SecondaryKeys>>,
queue: lock_freedom::queue::Queue<Operation<PrimaryKeyGenState, PrimaryKey, SecondaryKeys>>,
notify: Notify,
len: Arc<AtomicU16>,
}
Expand All @@ -306,7 +306,7 @@ impl<PrimaryKeyGenState, PrimaryKey, SecondaryKeys>
{
pub fn new() -> Self {
Self {
queue: lockfree::queue::Queue::new(),
queue: lock_freedom::queue::Queue::new(),
notify: Notify::new(),
len: Arc::new(AtomicU16::new(0)),
}
Expand Down