Update tokio-uring (#43)

Fixes some issues created by monoio integration and updates kioto-uring-executor.

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: Install rustc and clippy nightly

Cargo.toml

@@ -26,19 +26,13 @@ tokio-condvar = { version="0.3", features=["parking_lot"] }
 tokio-uring = { version="0.5", optional=true }
 bloomfilter = { version="3", optional=true }
 monoio = { version="0.2", optional=true, features=["sync"] }
+kioto-uring-executor = { version="0.2", optional=true }
 
 [dependencies.tokio]
 version="1"
 default-features=false
 features=["io-util", "sync", "macros", "tracing", "time"]
 
-[dependencies.tokio-uring-executor]
-package="kioto-uring-executor"
-git="https://github.com/kaimast/kioto-uring-executor.git"
-branch="shutdown"
-# version="0.1"
-optional=true
-
 [dev-dependencies]
 clap = { version="4", features=["derive"] }
 env_logger = "0.11"
@@ -57,7 +51,7 @@ monoio = ["dep:monoio", "_async-io"]
 snappy-compression = ["dep:snap"]
 wisckey = []
 bloom-filters = ["dep:bloomfilter"]
-tokio-uring = ["dep:tokio-uring", "dep:tokio-uring-executor", "_async-io"]
+tokio-uring = ["dep:tokio-uring", "dep:kioto-uring-executor", "_async-io"]
 _async-io = []
 
 [[test]]

benchmarks/async.rs

@@ -48,7 +48,7 @@ async fn bench_init(args: &Args) -> (TempDir, Database) {
     (tmp_dir, database)
 }
 
-#[cfg_attr(feature = "tokio-uring", tokio_uring_executor::main)]
+#[cfg_attr(feature = "tokio-uring", kioto_uring_executor::main)]
 #[cfg_attr(feature = "monoio", monoio::main)]
 #[cfg_attr(not(feature = "_async-io"), tokio::main)]
 async fn main() {

src/data_blocks/mod.rs

@@ -204,7 +204,7 @@ mod tests {
     use tempfile::tempdir;
 
     #[cfg(feature = "tokio-uring")]
-    use tokio_uring_executor::test as async_test;
+    use kioto_uring_executor::test as async_test;
 
     #[cfg(feature = "monoio")]
     use monoio::test as async_test;

src/logic.rs

@@ -977,7 +977,7 @@ mod tests {
     use tempfile::TempDir;
 
     #[cfg(feature = "tokio-uring")]
-    use tokio_uring_executor::test as async_test;
+    use kioto_uring_executor::test as async_test;
 
     #[cfg(feature = "monoio")]
     use monoio::test as async_test;

src/manifest.rs

@@ -441,7 +441,7 @@ mod tests {
     use tempfile::tempdir;
 
     #[cfg(feature = "tokio-uring")]
-    use tokio_uring_executor::test as async_test;
+    use kioto_uring_executor::test as async_test;
 
     #[cfg(feature = "monoio")]
     use monoio::test as async_test;

src/sorted_table/tests.rs

@@ -5,7 +5,7 @@ use crate::manifest::Manifest;
 use tempfile::tempdir;
 
 #[cfg(feature = "tokio-uring")]
-use tokio_uring_executor::test as async_test;
+use kioto_uring_executor::test as async_test;
 
 #[cfg(feature = "monoio")]
 use monoio::test as async_test;

src/tasks.rs

@@ -184,7 +184,7 @@ impl TaskManager {
         let level_update_cond = Arc::new(UpdateCond::new());
 
         #[cfg(feature = "tokio-uring")]
-        let mut spawn_pos = tokio_uring_executor::SpawnPos::default();
+        let mut spawn_pos = kioto_uring_executor::new_spawn_ring();
 
         {
             let memtable_update_cond = Arc::new(UpdateCond::new());
@@ -201,7 +201,7 @@ impl TaskManager {
                 cfg_if::cfg_if! {
                     if #[cfg(feature="tokio-uring")] {
                         unsafe {
-                            tokio_uring_executor::unsafe_spawn_at(spawn_pos.get(), task);
+                            kioto_uring_executor::unsafe_spawn_at(spawn_pos.get(), task);
                             spawn_pos.advance();
                         }
                     } else if #[cfg(feature="monoio")] {
@@ -235,7 +235,7 @@ impl TaskManager {
                     cfg_if::cfg_if! {
                         if #[cfg(feature="tokio-uring")] {
                             unsafe {
-                                tokio_uring_executor::unsafe_spawn_at(spawn_pos.get(), task);
+                                kioto_uring_executor::unsafe_spawn_at(spawn_pos.get(), task);
                                 spawn_pos.advance();
                             }
                         } else if #[cfg(feature="monoio")] {

src/values/tests.rs

@@ -1,5 +1,5 @@
 #[cfg(feature = "tokio-uring")]
-use tokio_uring_executor::test as async_test;
+use kioto_uring_executor::test as async_test;
 
 #[cfg(feature = "monoio")]
 use monoio::test as async_test;

src/wal/mod.rs

@@ -123,7 +123,7 @@ impl WriteAheadLog {
                 }
             } else if #[cfg(feature = "_async-io")] {
                 unsafe {
-                    tokio_uring_executor::unsafe_spawn(async move {
+                    kioto_uring_executor::unsafe_spawn(async move {
                         let mut writer = WalWriter::new(params).await;
                         loop {
                             let done = writer.update_log(&inner).await;
@@ -267,7 +267,7 @@ impl WriteAheadLog {
         cfg_if::cfg_if! {
             if #[cfg(feature = "tokio-uring")] {
                 unsafe {
-                    tokio_uring_executor::unsafe_spawn(async move {
+                    kioto_uring_executor::unsafe_spawn(async move {
                         let mut writer = WalWriter::continue_from(position, params).await;
                         loop {
                             let done = writer.update_log(&inner).await;

src/wal/tests.rs

@@ -6,7 +6,7 @@ use tempfile::TempDir;
 use super::*;
 
 #[cfg(feature = "tokio-uring")]
-use tokio_uring_executor::test as async_test;
+use kioto_uring_executor::test as async_test;
 
 #[cfg(feature = "monoio")]
 use monoio::test as async_test;

tests/basic.rs

@@ -6,7 +6,7 @@ use lsm::{Database, Params, StartMode, WriteBatch, WriteOptions};
 const SM: StartMode = StartMode::CreateOrOverride;
 
 #[cfg(feature = "tokio-uring")]
-use tokio_uring_executor::test as async_test;
+use kioto_uring_executor::test as async_test;
 
 #[cfg(feature = "monoio")]
 use monoio::test as async_test;

tests/reopen.rs

@@ -4,7 +4,7 @@ use tempfile::{Builder, TempDir};
 use futures::stream::StreamExt;
 
 #[cfg(feature = "tokio-uring")]
-use tokio_uring_executor::test as async_test;
+use kioto_uring_executor::test as async_test;
 
 #[cfg(feature = "monoio")]
 use monoio::test as async_test;