From e00a8b52997a1bbb6c9baf35154feefed2c47076 Mon Sep 17 00:00:00 2001 From: Liu Jiang Date: Sat, 27 Nov 2021 22:54:38 +0800 Subject: [PATCH] Enhance VersionMap to filter out some versions Current VersionMap implementation assumes all versions lower than VersionMap::latest_version() are supported. That may not be true in some situation. So add `is_supported()` method to VersionMap to filter out some versions. Signed-off-by: Liu Jiang --- coverage_config_x86_64.json | 2 +- src/version_map.rs | 79 ++++++++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/coverage_config_x86_64.json b/coverage_config_x86_64.json index f7958fd..3d90c85 100644 --- a/coverage_config_x86_64.json +++ b/coverage_config_x86_64.json @@ -1 +1 @@ -{"coverage_score": 95.4, "exclude_path": "test", "crate_features": ""} +{"coverage_score": 96.2, "exclude_path": "test", "crate_features": ""} diff --git a/src/version_map.rs b/src/version_map.rs index f42e368..fbcf82b 100644 --- a/src/version_map.rs +++ b/src/version_map.rs @@ -62,22 +62,51 @@ use std::any::TypeId; use std::collections::hash_map::HashMap; +use std::fmt::Debug; +use std::sync::Arc; const BASE_VERSION: u16 = 1; +/// Trait to check whether is specific `version` is supported by a `VersionMap`. +pub trait VersionFilter: Debug { + /// Check whether the `version` is supported or not. + fn is_supported(&self, version: u16) -> bool; +} + +impl VersionFilter for () { + fn is_supported(&self, _version: u16) -> bool { + true + } +} /// /// The VersionMap API provides functionality to define the version for each /// type and attach them to specific root versions. -#[derive(Clone, Debug, Default)] +#[derive(Clone, Debug)] pub struct VersionMap { versions: Vec>, + filter: Arc, +} + +impl Default for VersionMap { + fn default() -> Self { + VersionMap { + versions: vec![HashMap::new(); 1], + filter: Arc::new(()), + } + } } impl VersionMap { /// Create a new version map initialized at version 1. pub fn new() -> Self { + Default::default() + } + + /// Create a new version map with specified version filter. + pub fn with_filter(filter: Arc) -> Self { VersionMap { versions: vec![HashMap::new(); 1], + filter, } } @@ -119,16 +148,36 @@ impl VersionMap { pub fn latest_version(&self) -> u16 { self.versions.len() as u16 } + + /// Check whether the `version` is supported by the version map. + pub fn is_supported(&self, version: u16) -> bool { + if version == 0 || version > self.latest_version() { + false + } else { + self.filter.is_supported(version) + } + } } #[cfg(test)] mod tests { use super::{TypeId, VersionMap, BASE_VERSION}; + use std::sync::Arc; + use version_map::VersionFilter; pub struct MyType; pub struct MySecondType; pub struct MyThirdType; + #[derive(Debug)] + struct MyFilter; + + impl VersionFilter for MyFilter { + fn is_supported(&self, version: u16) -> bool { + version < 5 + } + } + #[test] fn test_default_version() { let vm = VersionMap::new(); @@ -223,4 +272,32 @@ mod tests { assert_eq!(vm.get_type_version(129, TypeId::of::()), 2); assert_eq!(vm.get_type_version(1, TypeId::of::()), BASE_VERSION); } + + #[test] + fn test_version_filter() { + let mut vm = VersionMap::default(); + vm.new_version(); + + assert_eq!(vm.is_supported(0), false); + assert_eq!(vm.is_supported(1), true); + assert_eq!(vm.is_supported(2), true); + assert_eq!(vm.is_supported(3), false); + + let mut vm = VersionMap::with_filter(Arc::new(MyFilter)); + vm.new_version(); + vm.new_version(); + vm.new_version(); + vm.new_version(); + vm.new_version(); + + let vm1 = vm.clone(); + assert_eq!(vm1.is_supported(0), false); + assert_eq!(vm1.is_supported(1), true); + assert_eq!(vm1.is_supported(2), true); + assert_eq!(vm1.is_supported(3), true); + assert_eq!(vm1.is_supported(4), true); + assert_eq!(vm1.is_supported(5), false); + assert_eq!(vm1.is_supported(6), false); + assert_eq!(vm.latest_version(), 6); + } }