Add new version of SpaceInfo with table version

Cargo.toml

@@ -3,7 +3,7 @@ members = ["codegen", "tools/create-data-file", "tools/dump-data-file"]
 
 [package]
 name = "data_bucket"
-version = "0.3.14"
+version = "0.3.15"
 edition = "2021"
 authors = ["Handy-caT"]
 license = "MIT"

codegen/src/persistable/generator/persistable_impl.rs

@@ -89,7 +89,7 @@ impl Generator {
                     rkyv::to_bytes::<rkyv::rancor::Error>(self).unwrap()
                 }
 
-                fn from_bytes(bytes: &[u8]) -> Self {
+                fn from_bytes(bytes: &[u8], _version: u32) -> Self {
                     let archived = unsafe { rkyv::access_unchecked::<<Self as Archive>::Archived>(bytes) };
                     rkyv::deserialize::<_, rkyv::rancor::Error>(archived).expect("data should be valid")
                 }
@@ -222,7 +222,7 @@ impl Generator {
         }).collect();
 
         Ok(quote! {
-            fn from_bytes(bytes: &[u8]) -> Self {
+            fn from_bytes(bytes: &[u8], _version: u32) -> Self {
                 let mut offset = 0usize;
                 #(#size_defs)*
 

src/page/data.rs

@@ -56,7 +56,7 @@ impl<const DATA_LENGTH: usize> Persistable for DataPage<DATA_LENGTH> {
         &self.data[..self.length as usize]
     }
 
-    fn from_bytes(bytes: &[u8]) -> Self {
+    fn from_bytes(bytes: &[u8], _version: u32) -> Self {
         let mut data = [0; DATA_LENGTH];
         data.copy_from_slice(bytes);
         Self {

src/page/header.rs

@@ -9,7 +9,7 @@ use crate::space;
 use crate::util::Persistable;
 use crate::PAGE_SIZE;
 
-pub const DATA_VERSION: u32 = 1u32;
+pub const DATA_VERSION: u32 = 2u32;
 
 /// Header that appears on every page before it's inner data.
 #[derive(
@@ -107,7 +107,7 @@ mod test {
     #[test]
     fn test_data_version() {
         let header = GeneralHeader::new(1.into(), PageType::Empty, 2.into());
-        assert_eq!(header.data_version, 1u32);
+        assert_eq!(header.data_version, DATA_VERSION);
     }
 
     #[test]

src/page/index/page.rs

@@ -108,7 +108,7 @@ where
         .await?;
         let mut index_utility_bytes = vec![0u8; index_utility_len];
         file.read_exact(index_utility_bytes.as_mut_slice()).await?;
-        let utility = SizedIndexPageUtility::<T>::from_bytes(&index_utility_bytes);
+        let utility = SizedIndexPageUtility::<T>::from_bytes(&index_utility_bytes, 0);
 
         Ok(utility)
     }
@@ -314,7 +314,7 @@ mod tests {
             size,
         );
         let bytes = page.as_bytes();
-        let new_page = IndexPage::<u64>::from_bytes(bytes.as_ref());
+        let new_page = IndexPage::<u64>::from_bytes(bytes.as_ref(), 0);
 
         assert_eq!(new_page.node_id, page.node_id);
         assert_eq!(new_page.current_index, page.current_index);
@@ -335,7 +335,7 @@ mod tests {
             size,
         );
         let bytes = page.as_bytes();
-        let new_page = IndexPage::<u128>::from_bytes(bytes.as_ref());
+        let new_page = IndexPage::<u128>::from_bytes(bytes.as_ref(), 0);
 
         assert_eq!(new_page.node_id, page.node_id);
         assert_eq!(new_page.current_index, page.current_index);
@@ -355,7 +355,7 @@ mod tests {
             size,
         );
         let bytes = page.as_bytes();
-        let new_page = IndexPage::<Uuid>::from_bytes(bytes.as_ref());
+        let new_page = IndexPage::<Uuid>::from_bytes(bytes.as_ref(), 0);
 
         assert_eq!(new_page.node_id, page.node_id);
         assert_eq!(new_page.current_index, page.current_index);

src/page/index/page_for_unsized.rs

@@ -106,7 +106,7 @@ where
         .await?;
         let mut index_utility_bytes = vec![0u8; index_utility_len];
         file.read_exact(index_utility_bytes.as_mut_slice()).await?;
-        let utility = UnsizedIndexPageUtility::<T>::from_bytes(&index_utility_bytes);
+        let utility = UnsizedIndexPageUtility::<T>::from_bytes(&index_utility_bytes, 0);
 
         Ok(utility)
     }
@@ -304,7 +304,7 @@ where
         bytes
     }
 
-    fn from_bytes(bytes: &[u8]) -> Self {
+    fn from_bytes(bytes: &[u8], _version: u32) -> Self {
         let slots_size_bytes = &bytes[0..UnsizedIndexPageUtility::<T>::slots_size_size()];
         let archived =
             unsafe { rkyv::access_unchecked::<<u16 as Archive>::Archived>(slots_size_bytes) };
@@ -321,7 +321,7 @@ where
             slots_size as usize,
             node_id_size as usize,
         );
-        let utility = UnsizedIndexPageUtility::<T>::from_bytes(&bytes[0..utility_len]);
+        let utility = UnsizedIndexPageUtility::<T>::from_bytes(&bytes[0..utility_len], _version);
         let mut index_values = Vec::with_capacity(utility.slots.len());
         for (offset, len) in &utility.slots {
             let offset = bytes.len() - *offset as usize;
@@ -360,7 +360,7 @@ mod test {
         .unwrap();
         let bytes = page.as_bytes();
         assert_eq!(bytes.as_ref().len(), 1024);
-        let page_back = UnsizedIndexPage::from_bytes(bytes.as_ref());
+        let page_back = UnsizedIndexPage::from_bytes(bytes.as_ref(), 0);
         assert_eq!(page_back, page)
     }
 

src/page/index/table_of_contents_page.rs

@@ -63,7 +63,7 @@ where
         };
         rkyv::to_bytes::<rkyv::rancor::Error>(&model).unwrap()
     }
-    fn from_bytes(bytes: &[u8]) -> Self {
+    fn from_bytes(bytes: &[u8], _version: u32) -> Self {
         let archived = unsafe {
             rkyv::access_unchecked::<<TableOfContentsPagePersisted<T> as Archive>::Archived>(bytes)
         };