From e6521b4256e345b9282e143feb7c395f08a4e50d Mon Sep 17 00:00:00 2001
From: Kould <kould2333@gmail.com>
Date: Mon, 4 Nov 2024 11:18:47 +0800
Subject: [PATCH] chore: resolve conflicts

---
 Cargo.toml                  | 8 ++++----
 tests/data_integrity.rs     | 2 +-
 tonbo_ext_reader/Cargo.toml | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2cb524e..95ea8af 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,7 +58,7 @@ crc32fast = "1"
 crossbeam-skiplist = "0.1"
 datafusion = { version = "42", optional = true }
 flume = { version = "0.11", features = ["async"] }
-fusio = { git = "https://github.com/tonbo-io/fusio.git", rev = "a97407aaea1a82fde1cff997e4db13be0f24b517", package = "fusio", version = "0.3.1", features = [
+fusio = { git = "https://github.com/tonbo-io/fusio.git", rev = "db305599ae88c7a934ab1ab235d8b3efda95a242", package = "fusio", version = "0.3.1", features = [
     "aws",
     "dyn",
     "fs",
@@ -66,11 +66,11 @@ fusio = { git = "https://github.com/tonbo-io/fusio.git", rev = "a97407aaea1a82fd
     "tokio",
     "tokio-http",
 ] }
-fusio-dispatch = { git = "https://github.com/tonbo-io/fusio.git", rev = "a97407aaea1a82fde1cff997e4db13be0f24b517", package = "fusio-dispatch", version = "0.2.1", features = [
+fusio-dispatch = { git = "https://github.com/tonbo-io/fusio.git", rev = "db305599ae88c7a934ab1ab235d8b3efda95a242", package = "fusio-dispatch", version = "0.2.1", features = [
     "aws",
     "tokio",
 ] }
-fusio-parquet = { git = "https://github.com/tonbo-io/fusio.git", rev = "a97407aaea1a82fde1cff997e4db13be0f24b517", package = "fusio-parquet", version = "0.2.1" }
+fusio-parquet = { git = "https://github.com/tonbo-io/fusio.git", rev = "db305599ae88c7a934ab1ab235d8b3efda95a242", package = "fusio-parquet", version = "0.2.1" }
 futures-core = "0.3"
 futures-io = "0.3"
 futures-util = "0.3"
@@ -82,7 +82,7 @@ regex = "1"
 thiserror = "1"
 tokio = { version = "1", features = ["io-util"], default-features = false }
 tokio-util = { version = "0.7" }
-tonbo_macros = { version = "0.1.0", path = "tonbo_macros" }
+tonbo_macros = { version = "0.2.0", path = "tonbo_macros" }
 tonbo_ext_reader = { version = "0.1.0", path = "tonbo_ext_reader" }
 tracing = "0.1"
 ulid = "1"
diff --git a/tests/data_integrity.rs b/tests/data_integrity.rs
index 0cd2b39..302fd26 100644
--- a/tests/data_integrity.rs
+++ b/tests/data_integrity.rs
@@ -63,8 +63,8 @@ mod tests {
         }
     }
 
-    #[tokio::test]
     #[ignore]
+    #[tokio::test]
     async fn test_data_integrity() {
         let mut rng = fastrand::Rng::with_seed(42);
         let mut primary_key_count = 0;
diff --git a/tonbo_ext_reader/Cargo.toml b/tonbo_ext_reader/Cargo.toml
index dcb011e..ed1e956 100644
--- a/tonbo_ext_reader/Cargo.toml
+++ b/tonbo_ext_reader/Cargo.toml
@@ -11,13 +11,13 @@ bytes = { version = "1.7", features = ["serde"] }
 foyer = { version = "0.12" }
 futures-core = "0.3"
 futures-util = "0.3"
-fusio-parquet = { git = "https://github.com/tonbo-io/fusio.git", rev = "a97407aaea1a82fde1cff997e4db13be0f24b517", package = "fusio-parquet", version = "0.2.1" }
+fusio-parquet = { git = "https://github.com/tonbo-io/fusio.git", rev = "db305599ae88c7a934ab1ab235d8b3efda95a242", package = "fusio-parquet", version = "0.2.1" }
 parquet = { version = "53", features = ["async"] }
 thiserror = "1"
 ulid = { version = "1", features = ["serde"] }
 
 [dev-dependencies]
-fusio = { git = "https://github.com/tonbo-io/fusio.git", rev = "a97407aaea1a82fde1cff997e4db13be0f24b517", package = "fusio", version = "0.3.1", features = [
+fusio = { git = "https://github.com/tonbo-io/fusio.git", rev = "db305599ae88c7a934ab1ab235d8b3efda95a242", package = "fusio", version = "0.3.1", features = [
     "aws",
     "dyn",
     "fs",
@@ -25,7 +25,7 @@ fusio = { git = "https://github.com/tonbo-io/fusio.git", rev = "a97407aaea1a82fd
     "tokio",
     "tokio-http",
 ] }
-fusio-dispatch = { git = "https://github.com/tonbo-io/fusio.git", rev = "a97407aaea1a82fde1cff997e4db13be0f24b517", package = "fusio-dispatch", version = "0.2.1", features = [
+fusio-dispatch = { git = "https://github.com/tonbo-io/fusio.git", rev = "db305599ae88c7a934ab1ab235d8b3efda95a242", package = "fusio-dispatch", version = "0.2.1", features = [
     "tokio",
 ] }
 tempfile = "3"