diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-11-15 14:20:50 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-11-15 14:20:50 +0100 |
| commit | 393c4d4515e0cdadadc8de8ae2df12e4371cff88 (patch) | |
| tree | 1805db8a9697a723abd76f26f2cd421d9f5960a5 /src/model | |
| parent | 65066c70640371cc318faddfb4c05c96de18e86d (diff) | |
| download | garage-393c4d4515e0cdadadc8de8ae2df12e4371cff88.tar.gz garage-393c4d4515e0cdadadc8de8ae2df12e4371cff88.zip | |
layout: add helper for cached/external values to centralize recomputation
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/helper/bucket.rs | 2 | ||||
| -rw-r--r-- | src/model/index_counter.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/model/helper/bucket.rs b/src/model/helper/bucket.rs index 2cb53424..efa3e27b 100644 --- a/src/model/helper/bucket.rs +++ b/src/model/helper/bucket.rs @@ -455,7 +455,7 @@ impl<'a> BucketHelper<'a> { .system .cluster_layout() .all_nongateway_nodes() - .into_owned(); + .to_vec(); let k2vindexes = self .0 .k2v diff --git a/src/model/index_counter.rs b/src/model/index_counter.rs index 2d968733..e8702bf1 100644 --- a/src/model/index_counter.rs +++ b/src/model/index_counter.rs @@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize}; use garage_db as db; -use garage_rpc::layout::LayoutHistory; +use garage_rpc::layout::LayoutHelper; use garage_rpc::system::System; use garage_util::background::BackgroundRunner; use garage_util::data::*; @@ -83,7 +83,7 @@ impl<T: CountedItem> Entry<T::CP, T::CS> for CounterEntry<T> { } impl<T: CountedItem> CounterEntry<T> { - pub fn filtered_values(&self, layout: &LayoutHistory) -> HashMap<String, i64> { + pub fn filtered_values(&self, layout: &LayoutHelper) -> HashMap<String, i64> { let nodes = layout.all_nongateway_nodes(); self.filtered_values_with_nodes(&nodes) } |