Skip to content

Commit

Permalink
feat(storage): switch to eviction time disk cache insertion (#20076)
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 a582c11 commit f41dab7
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 21 deletions.
26 changes: 9 additions & 17 deletions Cargo.lock

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

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

[workspace.dependencies]
foyer = { version = "0.13.1", features = ["tracing", "nightly", "prometheus"] }
# 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",
] }
apache-avro = { git = "https://github.com/risingwavelabs/avro", rev = "25113ba88234a9ae23296e981d8302c290fdaa4b", features = [
"snappy",
"zstandard",
Expand Down Expand Up @@ -154,7 +160,10 @@ icelake = { git = "https://github.com/risingwavelabs/icelake.git", rev = "0ec44f
"prometheus",
] }
# branch dev_rebase_main_20241230
iceberg = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "683fb89edeaf8d1baae69e1f376d68b92be1d496", features = ["storage-s3", "storage-gcs"] }
iceberg = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "683fb89edeaf8d1baae69e1f376d68b92be1d496", features = [
"storage-s3",
"storage-gcs",
] }
iceberg-catalog-rest = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "683fb89edeaf8d1baae69e1f376d68b92be1d496" }
iceberg-catalog-glue = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "683fb89edeaf8d1baae69e1f376d68b92be1d496" }
opendal = "0.49"
Expand Down
7 changes: 5 additions & 2 deletions src/storage/src/store_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@ use crate::monitor::{
use crate::opts::StorageOpts;
use crate::StateStore;

static FOYER_METRICS_REGISTRY: LazyLock<PrometheusMetricsRegistry> =
LazyLock::new(|| PrometheusMetricsRegistry::new(GLOBAL_METRICS_REGISTRY.clone()));
static FOYER_METRICS_REGISTRY: LazyLock<Box<PrometheusMetricsRegistry>> = LazyLock::new(|| {
Box::new(PrometheusMetricsRegistry::new(
GLOBAL_METRICS_REGISTRY.clone(),
))
});

mod opaque_type {
use super::*;
Expand Down

0 comments on commit f41dab7

Please sign in to comment.