From 5d46528794250e0e7cf48b4e5c46b6b2539469bc Mon Sep 17 00:00:00 2001 From: Noel Kwan Date: Fri, 25 Oct 2024 16:30:00 +0800 Subject: [PATCH 1/3] use madsim from rw --- Cargo.lock | 31 ++++++++++++++++--------------- Cargo.toml | 2 +- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ddf0f6047d80..6dd7de4a6418f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9747,7 +9747,7 @@ dependencies = [ "indoc", "libc", "memoffset", - "parking_lot 0.12.1", + "parking_lot 0.11.2", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -12763,9 +12763,9 @@ dependencies = [ [[package]] name = "sea-orm-cli" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465ea2308d4716837e9af4a2cff8e14c28135867a580bb93e9e03d408a3a6afb" +checksum = "620bc560062ae251b1366bde43b3f1508445cab5c2c8cbdb397034638ab1b357" dependencies = [ "chrono", "clap", @@ -12794,9 +12794,9 @@ dependencies = [ [[package]] name = "sea-orm-migration" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac734b6e5610c2764056cc8495fbc293cd1c8ebe084fdfb74c3b0cdaaff9bb92" +checksum = "ee8269bc6ff71afd6b78aa4333ac237a69eebd2cdb439036291e64fb4b8db23c" dependencies = [ "async-trait", "clap", @@ -12865,14 +12865,15 @@ dependencies = [ [[package]] name = "sea-query-derive" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd78f2e0ee8e537e9195d1049b752e0433e2cac125426bccb7b5c3e508096117" +checksum = "9834af2c4bd8c5162f00c89f1701fb6886119a88062cf76fe842ea9e232b9839" dependencies = [ + "darling 0.20.9", "heck 0.4.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.79", "thiserror", ] @@ -13733,7 +13734,7 @@ dependencies = [ [[package]] name = "sqlx" version = "0.7.4" -source = "git+https://github.com/kwannoel/sqlx.git?rev=ddf222f56cf99f865231a5383053645c6ea05ba3#ddf222f56cf99f865231a5383053645c6ea05ba3" +source = "git+https://github.com/risingwavelabs/sqlx.git?rev=7188c5462f4608d232a24b2da696e4dff8c036d5#7188c5462f4608d232a24b2da696e4dff8c036d5" dependencies = [ "sqlx-core", "sqlx-macros", @@ -13745,7 +13746,7 @@ dependencies = [ [[package]] name = "sqlx-core" version = "0.7.4" -source = "git+https://github.com/kwannoel/sqlx.git?rev=ddf222f56cf99f865231a5383053645c6ea05ba3#ddf222f56cf99f865231a5383053645c6ea05ba3" +source = "git+https://github.com/risingwavelabs/sqlx.git?rev=7188c5462f4608d232a24b2da696e4dff8c036d5#7188c5462f4608d232a24b2da696e4dff8c036d5" dependencies = [ "ahash 0.8.11", "atoi", @@ -13789,7 +13790,7 @@ dependencies = [ [[package]] name = "sqlx-macros" version = "0.7.4" -source = "git+https://github.com/kwannoel/sqlx.git?rev=ddf222f56cf99f865231a5383053645c6ea05ba3#ddf222f56cf99f865231a5383053645c6ea05ba3" +source = "git+https://github.com/risingwavelabs/sqlx.git?rev=7188c5462f4608d232a24b2da696e4dff8c036d5#7188c5462f4608d232a24b2da696e4dff8c036d5" dependencies = [ "proc-macro2", "quote", @@ -13801,7 +13802,7 @@ dependencies = [ [[package]] name = "sqlx-macros-core" version = "0.7.4" -source = "git+https://github.com/kwannoel/sqlx.git?rev=ddf222f56cf99f865231a5383053645c6ea05ba3#ddf222f56cf99f865231a5383053645c6ea05ba3" +source = "git+https://github.com/risingwavelabs/sqlx.git?rev=7188c5462f4608d232a24b2da696e4dff8c036d5#7188c5462f4608d232a24b2da696e4dff8c036d5" dependencies = [ "dotenvy", "either", @@ -13826,7 +13827,7 @@ dependencies = [ [[package]] name = "sqlx-mysql" version = "0.7.4" -source = "git+https://github.com/kwannoel/sqlx.git?rev=ddf222f56cf99f865231a5383053645c6ea05ba3#ddf222f56cf99f865231a5383053645c6ea05ba3" +source = "git+https://github.com/risingwavelabs/sqlx.git?rev=7188c5462f4608d232a24b2da696e4dff8c036d5#7188c5462f4608d232a24b2da696e4dff8c036d5" dependencies = [ "atoi", "base64 0.21.7", @@ -13872,7 +13873,7 @@ dependencies = [ [[package]] name = "sqlx-postgres" version = "0.7.4" -source = "git+https://github.com/kwannoel/sqlx.git?rev=ddf222f56cf99f865231a5383053645c6ea05ba3#ddf222f56cf99f865231a5383053645c6ea05ba3" +source = "git+https://github.com/risingwavelabs/sqlx.git?rev=7188c5462f4608d232a24b2da696e4dff8c036d5#7188c5462f4608d232a24b2da696e4dff8c036d5" dependencies = [ "atoi", "base64 0.21.7", @@ -13915,7 +13916,7 @@ dependencies = [ [[package]] name = "sqlx-sqlite" version = "0.7.4" -source = "git+https://github.com/kwannoel/sqlx.git?rev=ddf222f56cf99f865231a5383053645c6ea05ba3#ddf222f56cf99f865231a5383053645c6ea05ba3" +source = "git+https://github.com/risingwavelabs/sqlx.git?rev=7188c5462f4608d232a24b2da696e4dff8c036d5#7188c5462f4608d232a24b2da696e4dff8c036d5" dependencies = [ "async-channel 2.2.1", "atoi", diff --git a/Cargo.toml b/Cargo.toml index c51ee7fee7381..bf7d82f16bfec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -353,7 +353,7 @@ tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = # NOTE(kwannoel): patch sqlx to use a version compatible with madsim. # If we can merge in: https://github.com/madsim-rs/sqlx/pull/2, # we can change it to patch madsim version instead. -sqlx = { git = "https://github.com/kwannoel/sqlx.git", rev = "ddf222f56cf99f865231a5383053645c6ea05ba3" } +sqlx = { git = "https://github.com/risingwavelabs/sqlx.git", rev = "7188c5462f4608d232a24b2da696e4dff8c036d5" } futures-timer = { git = "https://github.com/madsim-rs/futures-timer.git", rev = "05b33b4" } # patch to remove preserve_order from serde_json bson = { git = "https://github.com/risingwavelabs/bson-rust", rev = "e5175ec" } From 9ed001f2abafb94a1f716cdfe199cc4fb41edad6 Mon Sep 17 00:00:00 2001 From: Noel Kwan Date: Mon, 28 Oct 2024 12:08:57 +0800 Subject: [PATCH 2/3] revert parking_lot version regression --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 6dd7de4a6418f..47ad5fd99edc8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9747,7 +9747,7 @@ dependencies = [ "indoc", "libc", "memoffset", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "portable-atomic", "pyo3-build-config", "pyo3-ffi", From 11024a55dd5cc9588dd646da90aa1f6b89f03f95 Mon Sep 17 00:00:00 2001 From: Noel Kwan Date: Mon, 28 Oct 2024 14:12:12 +0800 Subject: [PATCH 3/3] remove async_channel, remove parking_lot diffs --- Cargo.lock | 15 +++++++-------- Cargo.toml | 9 +++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 47ad5fd99edc8..150c59019b349 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13734,7 +13734,7 @@ dependencies = [ [[package]] name = "sqlx" version = "0.7.4" -source = "git+https://github.com/risingwavelabs/sqlx.git?rev=7188c5462f4608d232a24b2da696e4dff8c036d5#7188c5462f4608d232a24b2da696e4dff8c036d5" +source = "git+https://github.com/risingwavelabs/sqlx.git?rev=ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a#ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a" dependencies = [ "sqlx-core", "sqlx-macros", @@ -13746,7 +13746,7 @@ dependencies = [ [[package]] name = "sqlx-core" version = "0.7.4" -source = "git+https://github.com/risingwavelabs/sqlx.git?rev=7188c5462f4608d232a24b2da696e4dff8c036d5#7188c5462f4608d232a24b2da696e4dff8c036d5" +source = "git+https://github.com/risingwavelabs/sqlx.git?rev=ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a#ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a" dependencies = [ "ahash 0.8.11", "atoi", @@ -13790,7 +13790,7 @@ dependencies = [ [[package]] name = "sqlx-macros" version = "0.7.4" -source = "git+https://github.com/risingwavelabs/sqlx.git?rev=7188c5462f4608d232a24b2da696e4dff8c036d5#7188c5462f4608d232a24b2da696e4dff8c036d5" +source = "git+https://github.com/risingwavelabs/sqlx.git?rev=ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a#ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a" dependencies = [ "proc-macro2", "quote", @@ -13802,7 +13802,7 @@ dependencies = [ [[package]] name = "sqlx-macros-core" version = "0.7.4" -source = "git+https://github.com/risingwavelabs/sqlx.git?rev=7188c5462f4608d232a24b2da696e4dff8c036d5#7188c5462f4608d232a24b2da696e4dff8c036d5" +source = "git+https://github.com/risingwavelabs/sqlx.git?rev=ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a#ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a" dependencies = [ "dotenvy", "either", @@ -13827,7 +13827,7 @@ dependencies = [ [[package]] name = "sqlx-mysql" version = "0.7.4" -source = "git+https://github.com/risingwavelabs/sqlx.git?rev=7188c5462f4608d232a24b2da696e4dff8c036d5#7188c5462f4608d232a24b2da696e4dff8c036d5" +source = "git+https://github.com/risingwavelabs/sqlx.git?rev=ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a#ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a" dependencies = [ "atoi", "base64 0.21.7", @@ -13873,7 +13873,7 @@ dependencies = [ [[package]] name = "sqlx-postgres" version = "0.7.4" -source = "git+https://github.com/risingwavelabs/sqlx.git?rev=7188c5462f4608d232a24b2da696e4dff8c036d5#7188c5462f4608d232a24b2da696e4dff8c036d5" +source = "git+https://github.com/risingwavelabs/sqlx.git?rev=ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a#ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a" dependencies = [ "atoi", "base64 0.21.7", @@ -13916,9 +13916,8 @@ dependencies = [ [[package]] name = "sqlx-sqlite" version = "0.7.4" -source = "git+https://github.com/risingwavelabs/sqlx.git?rev=7188c5462f4608d232a24b2da696e4dff8c036d5#7188c5462f4608d232a24b2da696e4dff8c036d5" +source = "git+https://github.com/risingwavelabs/sqlx.git?rev=ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a#ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a" dependencies = [ - "async-channel 2.2.1", "atoi", "chrono", "flume", diff --git a/Cargo.toml b/Cargo.toml index bf7d82f16bfec..da6b0bfa87385 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -350,10 +350,11 @@ getrandom = { git = "https://github.com/madsim-rs/getrandom.git", rev = "e79a7ae # tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "0dd1055" } tokio-retry = { git = "https://github.com/madsim-rs/rust-tokio-retry.git", rev = "95e2fd3" } tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "ac00d88" } -# NOTE(kwannoel): patch sqlx to use a version compatible with madsim. -# If we can merge in: https://github.com/madsim-rs/sqlx/pull/2, -# we can change it to patch madsim version instead. -sqlx = { git = "https://github.com/risingwavelabs/sqlx.git", rev = "7188c5462f4608d232a24b2da696e4dff8c036d5" } + +# sqlx version: v0.7.4 +# patch diffs: https://github.com/madsim-rs/sqlx/pull/3 +sqlx = { git = "https://github.com/risingwavelabs/sqlx.git", rev = "ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a" } + futures-timer = { git = "https://github.com/madsim-rs/futures-timer.git", rev = "05b33b4" } # patch to remove preserve_order from serde_json bson = { git = "https://github.com/risingwavelabs/bson-rust", rev = "e5175ec" }