-
Notifications
You must be signed in to change notification settings - Fork 31
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.
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
Implement Versionize for VecDeque #13
Open
alexandruag
wants to merge
1
commit into
firecracker-microvm:main
Choose a base branch
from
alexandruag:vecdeque
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,11 @@ | ||
# v0.1.0 | ||
# Changelog | ||
|
||
## [Unreleased] | ||
|
||
### Added | ||
|
||
- Implemented `Versionize` for `VecDeque` as a primitive. | ||
|
||
## v0.1.0 | ||
|
||
- "versionize" v0.1.0 first release. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
{"coverage_score": 92.3, "exclude_path": "", "crate_features": ""} | ||
{"coverage_score": 92.4, "exclude_path": "", "crate_features": ""} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -3,6 +3,8 @@ | |||||
//! Serialization support for primitive data types. | ||||||
#![allow(clippy::float_cmp)] | ||||||
|
||||||
use std::collections::VecDeque; | ||||||
|
||||||
use self::super::{VersionMap, Versionize, VersionizeError, VersionizeResult}; | ||||||
use vmm_sys_util::fam::{FamStruct, FamStructWrapper}; | ||||||
|
||||||
|
@@ -335,6 +337,53 @@ where | |||||
} | ||||||
} | ||||||
|
||||||
impl<T> Versionize for VecDeque<T> | ||||||
where | ||||||
T: Versionize, | ||||||
{ | ||||||
#[inline] | ||||||
fn serialize<W: std::io::Write>( | ||||||
&self, | ||||||
mut writer: &mut W, | ||||||
version_map: &VersionMap, | ||||||
app_version: u16, | ||||||
) -> VersionizeResult<()> { | ||||||
// Serialize in the same fashion as bincode: | ||||||
// Write len. | ||||||
bincode::serialize_into(&mut writer, &self.len()) | ||||||
.map_err(|ref err| VersionizeError::Serialize(format!("{:?}", err)))?; | ||||||
// Walk the vecdeque and write each elemenet. | ||||||
for element in self { | ||||||
element | ||||||
.serialize(writer, version_map, app_version) | ||||||
.map_err(|ref err| VersionizeError::Serialize(format!("{:?}", err)))?; | ||||||
} | ||||||
Ok(()) | ||||||
} | ||||||
|
||||||
#[inline] | ||||||
fn deserialize<R: std::io::Read>( | ||||||
mut reader: &mut R, | ||||||
version_map: &VersionMap, | ||||||
app_version: u16, | ||||||
) -> VersionizeResult<Self> { | ||||||
let mut v = VecDeque::new(); | ||||||
let len: u64 = bincode::deserialize_from(&mut reader) | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit-ish: Serialized Let's use the same thing here just in case
Suggested change
|
||||||
.map_err(|ref err| VersionizeError::Deserialize(format!("{:?}", err)))?; | ||||||
for _ in 0..len { | ||||||
let element: T = T::deserialize(reader, version_map, app_version) | ||||||
.map_err(|ref err| VersionizeError::Deserialize(format!("{:?}", err)))?; | ||||||
v.push_back(element); | ||||||
} | ||||||
Ok(v) | ||||||
} | ||||||
|
||||||
// Not used yet. | ||||||
fn version() -> u16 { | ||||||
1 | ||||||
} | ||||||
} | ||||||
|
||||||
// Implement versioning for FAM structures by using the FamStructWrapper interface. | ||||||
impl<T: Default + FamStruct + Versionize> Versionize for FamStructWrapper<T> | ||||||
where | ||||||
|
@@ -622,6 +671,26 @@ mod tests { | |||||
assert_eq!(store, restore); | ||||||
} | ||||||
|
||||||
#[test] | ||||||
fn test_ser_de_vecdeque() { | ||||||
let vm = VersionMap::new(); | ||||||
let mut snapshot_mem = vec![0u8; 64]; | ||||||
|
||||||
let mut store = VecDeque::new(); | ||||||
store.push_back("test 1".to_owned()); | ||||||
store.push_back("test 2".to_owned()); | ||||||
store.push_back("test 3".to_owned()); | ||||||
|
||||||
store | ||||||
.serialize(&mut snapshot_mem.as_mut_slice(), &vm, 1) | ||||||
.unwrap(); | ||||||
let restore = | ||||||
<VecDeque<String> as Versionize>::deserialize(&mut snapshot_mem.as_slice(), &vm, 1) | ||||||
.unwrap(); | ||||||
|
||||||
assert_eq!(store, restore); | ||||||
} | ||||||
|
||||||
#[test] | ||||||
fn test_ser_de_option() { | ||||||
let vm = VersionMap::new(); | ||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we rely on the Vec primitive here and just use Into/From instead of duplicating the Vec code:
Docs say: This avoids reallocating where possible, but the conditions for that are strict, and subject to change, and so shouldn't be relied upon unless the Vec came from From<VecDeque> and hasn't been reallocated.