Skip to content

Commit

Permalink
refactor(storage): switch to foyer 0.14.0 and mixtrics 0.0.2 (#20155)
Browse files Browse the repository at this point in the history
Signed-off-by: MrCroxx <[email protected]>
  • Loading branch information
MrCroxx authored Jan 14, 2025
1 parent 8fd5a9c commit f437f77
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 20 deletions.
51 changes: 39 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,8 @@ normal = ["workspace-hack"]
development = ["expect-test", "pretty_assertions"]

[workspace.dependencies]
# Switch to a released foyer version after the next release.
# foyer = { version = "0.13.1", features = ["tracing", "nightly", "prometheus"] }
foyer = { git = "https://github.com/foyer-rs/foyer", rev = "bdf484622d487df7ac08533fcc93ab745ed418cf", features = [
"tracing",
"nightly",
"prometheus",
] }
foyer = { version = "0.14.0", features = ["tracing", "nightly"] }
mixtrics ={ version = "0.0.2", features = ["prometheus"] }
apache-avro = { git = "https://github.com/risingwavelabs/avro", rev = "25113ba88234a9ae23296e981d8302c290fdaa4b", features = [
"snappy",
"zstandard",
Expand Down
1 change: 1 addition & 0 deletions src/storage/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ itertools = { workspace = true }
libc = "0.2"
lz4 = "1.28.0"
memcomparable = "0.2"
mixtrics = { workspace = true }
moka = { version = "0.12.0", features = ["future", "sync"] }
more-asserts = "0.3"
num-integer = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/storage/src/store_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ use std::sync::{Arc, LazyLock};
use std::time::Duration;

use enum_as_inner::EnumAsInner;
use foyer::prometheus::PrometheusMetricsRegistry;
use foyer::{
DirectFsDeviceOptions, Engine, HybridCacheBuilder, LargeEngineOptions, RateLimitPicker,
};
use mixtrics::registry::prometheus::PrometheusMetricsRegistry;
use risingwave_common::monitor::GLOBAL_METRICS_REGISTRY;
use risingwave_common_service::RpcNotificationClient;
use risingwave_hummock_sdk::HummockSstableObjectId;
Expand Down

0 comments on commit f437f77

Please sign in to comment.