Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["codegen", "tools/create-data-file", "tools/dump-data-file"]

[package]
name = "data_bucket"
version = "0.2.10"
version = "0.3.0"
edition = "2021"
authors = ["Handy-caT"]
license = "MIT"
Expand Down
9 changes: 8 additions & 1 deletion src/page/index/page_for_unsized.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ pub struct UnsizedIndexPage<
pub node_id_size: u16,
pub node_id: IndexValue<T>,
pub last_value_offset: u32,
pub removed_len: u32,
pub slots: Vec<(u32, u16)>,
pub index_values: Vec<IndexValue<T>>,
}
Expand All @@ -41,6 +42,7 @@ pub struct UnsizedIndexPageUtility<T: Default + SizeMeasurable + VariableSizeMea
pub node_id_size: u16,
pub node_id: IndexValue<T>,
pub last_value_offset: u32,
pub removed_len: u32,
pub slots: Vec<(u32, u16)>,
}

Expand Down Expand Up @@ -129,6 +131,7 @@ where
node_id_size: len as u16,
node_id: node_id.clone(),
last_value_offset: len,
removed_len: 0,
slots: vec![(len, len as u16)],
index_values: vec![node_id],
})
Expand All @@ -154,17 +157,19 @@ where
node_id,
last_value_offset,
slots,
removed_len: 0,
index_values: values,
}
}

fn rebuild(&mut self)
pub fn rebuild(&mut self)
where
T: Clone,
{
self.node_id = self.index_values.last().unwrap().clone();
self.node_id_size = self.node_id.aligned_size() as u16;
self.last_value_offset = 0;
self.removed_len = 0;
let mut slots = vec![];
for val in &self.index_values {
let len = val.aligned_size() as u32;
Expand Down Expand Up @@ -280,6 +285,7 @@ where
node_id_size: self.node_id_size,
node_id: self.node_id.clone(),
last_value_offset: self.last_value_offset,
removed_len: self.removed_len,
slots: self.slots.clone(),
};
let utility_bytes = utility.as_bytes();
Expand Down Expand Up @@ -335,6 +341,7 @@ where
node_id: utility.node_id,
last_value_offset: utility.last_value_offset,
slots: utility.slots,
removed_len: utility.removed_len,
index_values,
}
}
Expand Down
14 changes: 12 additions & 2 deletions src/page/index/page_for_unsized_cdc_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ use rkyv::ser::Serializer;
use rkyv::util::AlignedVec;
use rkyv::{Archive, Deserialize, Serialize};

use crate::{IndexValue, Link, SizeMeasurable, UnsizedIndexPage, VariableSizeMeasurable};
use crate::{
IndexValue, Link, SizeMeasurable, UnsizedIndexPage, UnsizedIndexPageUtility,
VariableSizeMeasurable,
};

impl<T, const DATA_LENGTH: u32> UnsizedIndexPage<T, DATA_LENGTH>
where
Expand Down Expand Up @@ -98,7 +101,14 @@ where
fn apply_remove_at(&mut self, index: usize) -> eyre::Result<()> {
self.slots.remove(index);
self.slots_size -= 1;
self.index_values.remove(index);
let v = self.index_values.remove(index);

self.removed_len +=
(v.aligned_size() + UnsizedIndexPageUtility::<T>::slots_value_size()) as u32;

if self.removed_len > DATA_LENGTH / 2 {
self.rebuild();
}
Ok(())
}
}
Expand Down
Loading