Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(storage): switch to eviction time disk cache insertion #20076

Merged
merged 6 commits into from
Jan 14, 2025
Merged

feat(storage): switch to eviction time disk cache insertion #20076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
05bbf3d
feat(storage): switch to eviction time disk cache insertion
MrCroxx Jan 9, 2025
064979b
Merge remote-tracking branch 'origin/main' into xx/evict
MrCroxx Jan 10, 2025
cf938c1
perf: don't iter evicted entries without disk cache
MrCroxx Jan 10, 2025
fbd6c5d
Merge remote-tracking branch 'origin/main' into xx/evict
MrCroxx Jan 14, 2025
2e3776e
chore: switch to a unreleased version on main
MrCroxx Jan 14, 2025
13c8f33
Merge branch 'main' into xx/evict
MrCroxx Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 9 additions & 17 deletions Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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
Loading