diff --git a/packages/backend/native-utils/Cargo.lock b/packages/backend/native-utils/Cargo.lock index f3a3a99e20..f4d5ca4dfc 100644 --- a/packages/backend/native-utils/Cargo.lock +++ b/packages/backend/native-utils/Cargo.lock @@ -2466,7 +2466,6 @@ dependencies = [ "serde", "serde_yaml", "thiserror", - "tikv-jemallocator", "tokio", "urlencoding", ] @@ -3252,26 +3251,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tikv-jemalloc-sys" -version = "0.5.4+5.3.0-patched" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - [[package]] name = "time" version = "0.1.45" diff --git a/packages/backend/native-utils/scylla-migration/Cargo.toml b/packages/backend/native-utils/scylla-migration/Cargo.toml index 85a11474c5..eaa0b74be3 100644 --- a/packages/backend/native-utils/scylla-migration/Cargo.toml +++ b/packages/backend/native-utils/scylla-migration/Cargo.toml @@ -18,6 +18,3 @@ serde_yaml = "0.9.22" thiserror = "1.0.43" tokio = { version = "1.29.1", features = ["full"] } urlencoding = "2.1.3" - -[target.'cfg(not(target_env = "msvc"))'.dependencies] -tikv-jemallocator = "0.5.4" diff --git a/packages/backend/native-utils/scylla-migration/src/main.rs b/packages/backend/native-utils/scylla-migration/src/main.rs index d6e6f3dfb8..9b21f0515c 100644 --- a/packages/backend/native-utils/scylla-migration/src/main.rs +++ b/packages/backend/native-utils/scylla-migration/src/main.rs @@ -1,10 +1,3 @@ -#[cfg(not(target_env = "msvc"))] -use tikv_jemallocator::Jemalloc; - -#[cfg(not(target_env = "msvc"))] -#[global_allocator] -static GLOBAL: Jemalloc = Jemalloc; - use scylla_migration::{cli::run_cli, error::Error}; #[tokio::main] diff --git a/packages/backend/native-utils/scylla-migration/src/setup.rs b/packages/backend/native-utils/scylla-migration/src/setup.rs index 9a5c55b323..0212bc0419 100644 --- a/packages/backend/native-utils/scylla-migration/src/setup.rs +++ b/packages/backend/native-utils/scylla-migration/src/setup.rs @@ -214,6 +214,11 @@ impl Initializer { }); tasks.push(handler); } + + if tasks.len() > 1000 { + future::join_all(tasks).await; + tasks = Vec::new() + } } let mut reactions = note_reaction::Entity::find() @@ -232,6 +237,11 @@ impl Initializer { }); tasks.push(handler); } + + if tasks.len() > 1000 { + future::join_all(tasks).await; + tasks = Vec::new() + } } let mut votes = poll_vote::Entity::find() @@ -256,6 +266,11 @@ impl Initializer { }); tasks.push(handler); } + + if tasks.len() > 1000 { + future::join_all(tasks).await; + tasks = Vec::new() + } } let mut notifications = notification::Entity::find() @@ -279,9 +294,12 @@ impl Initializer { }); tasks.push(handler); } - } - future::join_all(tasks).await; + if tasks.len() > 1000 { + future::join_all(tasks).await; + tasks = Vec::new() + } + } Ok(()) }