From 741558c0ed2f7724d24b3fe093f63b768f09a801 Mon Sep 17 00:00:00 2001 From: MrCroxx Date: Wed, 20 Dec 2023 10:14:16 +0800 Subject: [PATCH 1/3] chore: bump foyer-storage to 0.2.2 Signed-off-by: MrCroxx --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5170a8fe09187..5aa97799e07dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3847,9 +3847,9 @@ dependencies = [ [[package]] name = "foyer-storage" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df47c9672ac893c172832c79c41bc4be7b24f71376fb00be461418c7a4d1cfe" +checksum = "5cb8ea9451a80e457cfc15e1d26c8bb27ccb620b20cb0414d7e8bf74704c0506" dependencies = [ "anyhow", "bitflags 2.4.0", From 5d63fb892720eedccbdcd3df7cf4f9c68a218ef6 Mon Sep 17 00:00:00 2001 From: MrCroxx Date: Fri, 22 Dec 2023 15:32:27 +0800 Subject: [PATCH 2/3] chore: bump foyer to 0.4 Signed-off-by: MrCroxx --- Cargo.lock | 8 ++++---- src/storage/Cargo.toml | 2 +- src/storage/src/hummock/file_cache/store.rs | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5aa97799e07dc..07cb1ecdefe1b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3785,9 +3785,9 @@ dependencies = [ [[package]] name = "foyer" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caed9c227536e3b6fb92aea800c44de7516ecc339a11eb01544549dd6f43cb69" +checksum = "2c96977361c34221e9cd77c1334a194e0f2a169f0b56f84229cca034bf8b483c" dependencies = [ "foyer-common 0.2.0", "foyer-intrusive", @@ -3847,9 +3847,9 @@ dependencies = [ [[package]] name = "foyer-storage" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cb8ea9451a80e457cfc15e1d26c8bb27ccb620b20cb0414d7e8bf74704c0506" +checksum = "b99c687e5c1ae5198e1a2bc4fb729518e588e1ce90cc58f1f1871f7aadbd127e" dependencies = [ "anyhow", "bitflags 2.4.0", diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index e1cff95c761ea..dc3b5ca765e76 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -26,7 +26,7 @@ dyn-clone = "1.0.14" either = "1" enum-as-inner = "0.6" fail = "0.5" -foyer = "0.3" +foyer = "0.4" futures = { version = "0.3", default-features = false, features = ["alloc"] } futures-async-stream = { workspace = true } hex = "0.4" diff --git a/src/storage/src/hummock/file_cache/store.rs b/src/storage/src/hummock/file_cache/store.rs index d7c48a81ed412..108cde42c11c6 100644 --- a/src/storage/src/hummock/file_cache/store.rs +++ b/src/storage/src/hummock/file_cache/store.rs @@ -279,7 +279,6 @@ where catalog_bits: config.catalog_bits, admissions, reinsertions: config.reinsertions, - flusher_buffer_size: 131072, // TODO: make it configurable flushers: config.flushers, reclaimers: config.reclaimers, clean_region_threshold: config.reclaimers + config.reclaimers / 2, From 36839d7227bb74e62d8bcdf8a435432b9cd09e7d Mon Sep 17 00:00:00 2001 From: MrCroxx Date: Thu, 28 Dec 2023 14:51:49 +0800 Subject: [PATCH 3/3] chore: bump foyer to 0.5.0 Signed-off-by: MrCroxx --- Cargo.lock | 49 ++++++++++++++---------------------------- src/storage/Cargo.toml | 2 +- 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0e5d52cfede55..00b0a3aeba679 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3793,11 +3793,11 @@ dependencies = [ [[package]] name = "foyer" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c96977361c34221e9cd77c1334a194e0f2a169f0b56f84229cca034bf8b483c" +checksum = "2780f71cb9e19bbeb5649c099020f14c92d32d2483685f02e31e4a7b72313c44" dependencies = [ - "foyer-common 0.2.0", + "foyer-common", "foyer-intrusive", "foyer-storage", "foyer-workspace-hack", @@ -3805,25 +3805,9 @@ dependencies = [ [[package]] name = "foyer-common" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e441ea6dcf68cc0626535868343f838c803a75fd7686c3895e2c99c9c8f11d60" -dependencies = [ - "anyhow", - "bytes", - "foyer-workspace-hack", - "itertools 0.12.0", - "madsim-tokio", - "parking_lot 0.12.1", - "paste", - "tracing", -] - -[[package]] -name = "foyer-common" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f10010b8cb0f380cc30ff8c82ec7f6addc2ced72b3758d336f351831a56a4a59" +checksum = "0c89db1d90703a4f87415b03dfda552ac81445ab4d0302c7729252b53acef26f" dependencies = [ "anyhow", "bytes", @@ -3837,13 +3821,13 @@ dependencies = [ [[package]] name = "foyer-intrusive" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f967c3c40435a621fb1b8670d8f6501d67e79cea08b1ce07c150147aabdc588" +checksum = "06608d1d72aaa73336b5cb9c0558268a7d86d7a6e26391db53f80115bdfae59e" dependencies = [ "bytes", "cmsketch", - "foyer-common 0.1.0", + "foyer-common", "foyer-workspace-hack", "itertools 0.12.0", "memoffset", @@ -3855,16 +3839,16 @@ dependencies = [ [[package]] name = "foyer-storage" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99c687e5c1ae5198e1a2bc4fb729518e588e1ce90cc58f1f1871f7aadbd127e" +checksum = "9da599c6c3b870f4811086af5763d4afbc144d537dd6ca6fe11dfa13497d79bf" dependencies = [ "anyhow", "bitflags 2.4.0", "bitmaps", "bytes", "cmsketch", - "foyer-common 0.2.0", + "foyer-common", "foyer-intrusive", "foyer-workspace-hack", "futures", @@ -3886,9 +3870,9 @@ dependencies = [ [[package]] name = "foyer-workspace-hack" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72699c6a83a9e76c13d1196518be3c7d85183e62507a3c0e248d556a7e875072" +checksum = "5a8e5e5cc44b5e8819ea45b2ca2e6a6f569586dffb1cbb8715486b2640075be9" dependencies = [ "cc", "crossbeam-utils", @@ -3899,15 +3883,14 @@ dependencies = [ "futures-sink", "futures-util", "libc", - "log", "memchr", "parking_lot 0.12.1", "parking_lot_core 0.9.8", + "proc-macro2", + "quote", "rand", + "syn 2.0.37", "tokio", - "tokio-util", - "tower", - "tracing", "tracing-core", ] diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index c8107c079bf61..19d38568a6a60 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -26,7 +26,7 @@ dyn-clone = "1.0.14" either = "1" enum-as-inner = "0.6" fail = "0.5" -foyer = "0.4" +foyer = "0.5" futures = { version = "0.3", default-features = false, features = ["alloc"] } futures-async-stream = { workspace = true } hex = "0.4"