update dependencies and fix CI

Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>

Author: connortsui20

Cargo.toml

@@ -6,27 +6,23 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-channel = "2.3.1"
-core_affinity = "0.7.0"
-derivative = "2.0.0"
-libc = "0.2.0"
-rand = "0.8.0"
-scc = "2.0.0"
+async-channel = "2.5.0"
+core_affinity = "0.8.3"
+derivative = "2.2.0"
+libc = "0.2.176"
+rand = "0.9.2"
+rand_distr = "0.5.1"
+scc = "3.1.1"
 tokio-uring = "0.5.0"
-tracing = "0.1.0"
-zipf = "7.0.0"
+tracing = "0.1.41"
+tokio = { version = "1.47.1", features = ["macros", "rt", "sync", "time"] }
 
-# Pin version "1.27" for a missing method.
-tokio = { version = "1.27.0", features = ["macros", "rt", "sync", "time"] }
-
-# Pin more recent versions for `-Zminimal-versions`.
-bitflags = "1.1.0" # For tokio-uring -> io-uring -> bitflags.
-proc-macro2 = "1.0.60" # For a missing feature.
-slab = "0.4.4" # For a missing method.
+# Pin downgraded version for minimal-versions
+bitflags = "1.3.2" # (Downgrade) For tokio-uring -> io-uring -> bitflags.
 
 [dev-dependencies]
-tokio = { version = "1.27.0", features = ["full"] }
-tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
+tokio = { version = "1.47.1", features = ["full"] }
+tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
 
 [profile.dev]
 panic = "abort"

src/bpm.rs

@@ -149,7 +149,7 @@ impl BufferPoolManager {
         // Get the page if it exists, otherwise create a new one return that.
         let page = self
             .pages
-            .entry(*pid)
+            .entry_sync(*pid)
             .or_insert_with(|| {
                 trace!("Creating a new `Page`.");
 
@@ -174,8 +174,8 @@ impl BufferPoolManager {
     ///
     /// Intended for use by an eviction algorithm.
     pub(crate) fn get_random_frame_group(&self) -> Arc<FrameGroup> {
-        let mut rng = rand::thread_rng();
-        let index = rng.gen_range(0..self.frame_groups.len());
+        let mut rng = rand::rng();
+        let index = rng.random_range(0..self.frame_groups.len());
 
         self.get_frame_group(index)
     }

src/page/page_handle.rs

@@ -44,7 +44,7 @@ impl PageHandle {
     ///
     /// Raises an error if an I/O error occurs while trying to load the data from disk into memory.
     #[instrument(skip(self), err, fields(page = ?self.page.pid))]
-    pub async fn read(&self) -> Result<ReadPageGuard> {
+    pub async fn read(&self) -> Result<ReadPageGuard<'_>> {
         info!("Reading `PageHandle`.");
 
         // Optimization: attempt to read only if we observe that the `is_loaded` flag is set.
@@ -84,7 +84,7 @@ impl PageHandle {
     ///
     /// Raises an error if an I/O error occurs while trying to load the data from disk into memory.
     #[instrument(skip(self), err, fields(page = ?self.page.pid))]
-    pub async fn try_read(&self) -> Result<Option<ReadPageGuard>> {
+    pub async fn try_read(&self) -> Result<Option<ReadPageGuard<'_>>> {
         info!("Trying to read `PageHandle`.");
 
         // Optimization: attempt to read only if we observe that the `is_loaded` flag is set.
@@ -127,7 +127,7 @@ impl PageHandle {
     ///
     /// Raises an error if an I/O error occurs while trying to load the data from disk into memory.
     #[instrument(skip(self), err, fields(page = ?self.page.pid))]
-    pub async fn write(&self) -> Result<WritePageGuard> {
+    pub async fn write(&self) -> Result<WritePageGuard<'_>> {
         info!("Writing `PageHandle`.");
 
         let mut write_guard = self.page.frame.write().await;
@@ -157,7 +157,7 @@ impl PageHandle {
     ///
     /// Raises an error if an I/O error occurs while trying to load the data from disk into memory.
     #[instrument(skip(self), err, fields(page = ?self.page.pid))]
-    pub async fn try_write(&self) -> Result<Option<WritePageGuard>> {
+    pub async fn try_write(&self) -> Result<Option<WritePageGuard<'_>>> {
         info!("Trying to write `PageHandle`.");
 
         let Ok(mut write_guard) = self.page.frame.try_write() else {

tests/throughput.rs

@@ -3,8 +3,9 @@ use async_bpm::{
     BufferPoolManager, IO_OPERATIONS,
 };
 use core_affinity::CoreId;
-use rand::thread_rng;
-use rand::{distributions::Distribution, Rng};
+use rand::rng;
+use rand::{distr::Distribution, Rng};
+use rand_distr::Zipf;
 use std::{
     ops::{Deref, DerefMut},
     sync::{
@@ -18,7 +19,6 @@ use tokio::{
     task::{JoinHandle, JoinSet},
 };
 use tracing::info;
-use zipf::ZipfDistribution;
 
 const SECONDS: usize = 300;
 
@@ -178,8 +178,8 @@ fn spawn_find_task(barrier: Arc<Barrier>) -> JoinHandle<()> {
     let bpm = BufferPoolManager::get();
 
     // Since half of the threads are solely reading, we double the writers here.
-    let zipf = ZipfDistribution::new(STORAGE_PAGES, ZIPF_EXP).unwrap();
-    let mut rng = rand::thread_rng();
+    let zipf = Zipf::new(STORAGE_PAGES as f64, ZIPF_EXP).unwrap();
+    let mut rng = rand::rng();
 
     BufferPoolManager::spawn_local(async move {
         let mut handles = Vec::with_capacity(TASK_ACCESSES);
@@ -211,8 +211,8 @@ fn spawn_scan_task(barrier: Arc<Barrier>) -> JoinHandle<()> {
     BufferPoolManager::spawn_local(async move {
         barrier.wait().await;
 
-        let mut rng = thread_rng();
-        let start = rng.gen_range(0..STORAGE_PAGES);
+        let mut rng = rng();
+        let start = rng.random_range(0..STORAGE_PAGES);
 
         // Continuously scan all pages.
         loop {