diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-01-04 11:34:43 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-01-04 11:34:43 +0100 |
| commit | 570e5e5bbb7a3eac41350db9433e28ed289b97f4 (patch) | |
| tree | a7fc299ba180098be5a3bef28a39256870ce697b /src/model/migrate.rs | |
| parent | 6e44369cbc810b8912ca0f7f5fd293e87f10c851 (diff) | |
| parent | 4eb8ca3a528dae2848141f5cc3eb607eb7d40114 (diff) | |
| download | garage-570e5e5bbb7a3eac41350db9433e28ed289b97f4.tar.gz garage-570e5e5bbb7a3eac41350db9433e28ed289b97f4.zip | |
Merge branch 'main' into next
Diffstat (limited to 'src/model/migrate.rs')
| -rw-r--r-- | src/model/migrate.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/model/migrate.rs b/src/model/migrate.rs index cd6ad26a..6b4c3eed 100644 --- a/src/model/migrate.rs +++ b/src/model/migrate.rs @@ -2,6 +2,7 @@ use std::sync::Arc; use garage_util::crdt::*; use garage_util::data::*; +use garage_util::encode::nonversioned_decode; use garage_util::error::Error as GarageError; use garage_util::time::*; @@ -28,8 +29,8 @@ impl Migrate { let mut old_buckets = vec![]; for res in tree.iter().map_err(GarageError::from)? { let (_k, v) = res.map_err(GarageError::from)?; - let bucket = rmp_serde::decode::from_read_ref::<_, old_bucket::Bucket>(&v[..]) - .map_err(GarageError::from)?; + let bucket = + nonversioned_decode::<old_bucket::Bucket>(&v[..]).map_err(GarageError::from)?; old_buckets.push(bucket); } |