Skip to content

Correction caused by indexset update #48

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.

Sign up for GitHub

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

Merged
Handy-caT merged 7 commits into from
Jul 13, 2025
Merged

Correction caused by indexset update #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8742938
update indexset version
Handy-caT Jun 28, 2025
d4b45dc
version bump
Handy-caT Jun 28, 2025
50c2a5b
corrections
Handy-caT Jul 13, 2025
ae7e84f
Merge branch 'main' into page_cdc_correction
Handy-caT Jul 13, 2025
c86e727
version bump
Handy-caT Jul 13, 2025
9d392ff
WIP
Handy-caT Jul 13, 2025
652de07
bump
Handy-caT Jul 13, 2025
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
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
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.7"
version = "0.2.8"
edition = "2021"
authors = ["Handy-caT"]
license = "MIT"
Expand All @@ -19,7 +19,7 @@ rkyv = { version = "0.8.9", features = ["uuid-1"] }
lockfree = "0.5.1"
uuid = { version = "1.11.0", features = ["v4"] }
ordered-float = "5.0.0"
indexset = { version = "0.12.3", features = ["concurrent", "cdc", "multimap"] }
# indexset = { path = "../indexset", version = "0.12.2", features = ["concurrent", "cdc", "multimap"] }
# indexset = { git = "https://github.com/Handy-caT/indexset", branch = "multimap-range-fix", version = "0.12.0", features = ["concurrent", "cdc", "multimap"] }
# indexset = { version = "0.12.3", features = ["concurrent", "cdc", "multimap"] }
# indexset = { path = "../indexset", version = "0.12.3", features = ["concurrent", "cdc", "multimap"] }
indexset = { package = "wt-indexset", version = "0.12.4", features = ["concurrent", "cdc", "multimap"] }
tokio = { version = "1", features = ["full"] }
3 changes: 1 addition & 2 deletions codegen/src/persistable/generator/persistable_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,7 @@ impl Generator {
});
val.unwrap().1.ident.as_ref().unwrap()
};
let value_fn_ident =
Ident::new(format!("{}_value_size", ident).as_str(), Span::call_site());
let value_fn_ident = Ident::new(format!("{ident}_value_size").as_str(), Span::call_site());
let len = if is_primitive(&inner_ty_str) {
quote! {
let values_len = align(#size_ident as usize * <#inner_ty as Default>::default().aligned_size()) + 8;
Expand Down
2 changes: 1 addition & 1 deletion src/page/index/page.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ mod tests {
#[test]
fn test_bytes_128() {
let size: usize = get_index_page_size_from_data_length::<u128>(INNER_PAGE_SIZE);
println!("size: {}", size);
println!("size: {size}");
let page = IndexPage::<u128>::new(
IndexValue {
key: u128::default(),
Expand Down
13 changes: 12 additions & 1 deletion src/page/index/page_cdc_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,22 @@ where
pub fn apply_change_event(&mut self, event: ChangeEvent<Pair<T, Link>>) -> eyre::Result<()> {
match event.clone() {
ChangeEvent::InsertAt {
event_id: _,
max_value: _,
value,
index,
} => {
if value.key > self.node_id.key {
self.node_id = value.clone().into();
}
if index == self.current_length as usize {
if index == self.current_length as usize && value.key == self.node_id.key {
self.node_id = value.clone().into();
}
self.apply_insert_at(index, value)?;
Ok(())
}
ChangeEvent::RemoveAt {
event_id: _,
max_value,
value,
index,
Expand Down Expand Up @@ -129,6 +131,7 @@ mod test {
10,
);
let event = ChangeEvent::InsertAt {
event_id: 0.into(),
max_value: Pair {
key: 1,
value: Link::default(),
Expand Down Expand Up @@ -161,6 +164,7 @@ mod test {
10,
);
let event = ChangeEvent::InsertAt {
event_id: 0.into(),
max_value: Pair {
key: 1,
value: Link::default(),
Expand All @@ -173,6 +177,7 @@ mod test {
};
page.apply_change_event(event).unwrap();
let event = ChangeEvent::InsertAt {
event_id: 0.into(),
max_value: Pair {
key: 1,
value: Link::default(),
Expand Down Expand Up @@ -212,6 +217,7 @@ mod test {
10,
);
let event = ChangeEvent::InsertAt {
event_id: 0.into(),
max_value: Pair {
key: 1,
value: Link::default(),
Expand All @@ -224,6 +230,7 @@ mod test {
};
page.apply_change_event(event).unwrap();
let event = ChangeEvent::InsertAt {
event_id: 0.into(),
max_value: Pair {
key: 1,
value: Link::default(),
Expand All @@ -236,6 +243,7 @@ mod test {
};
page.apply_change_event(event).unwrap();
let event = ChangeEvent::RemoveAt {
event_id: 0.into(),
max_value: Pair {
key: 2,
value: Link::default(),
Expand Down Expand Up @@ -269,6 +277,7 @@ mod test {
10,
);
let event = ChangeEvent::InsertAt {
event_id: 0.into(),
max_value: Pair {
key: 1,
value: Link::default(),
Expand All @@ -281,6 +290,7 @@ mod test {
};
page.apply_change_event(event).unwrap();
let event = ChangeEvent::InsertAt {
event_id: 0.into(),
max_value: Pair {
key: 1,
value: Link::default(),
Expand All @@ -293,6 +303,7 @@ mod test {
};
page.apply_change_event(event).unwrap();
let event = ChangeEvent::RemoveAt {
event_id: 0.into(),
max_value: Pair {
key: 2,
value: Link::default(),
Expand Down
2 changes: 1 addition & 1 deletion src/page/index/page_for_unsized.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ mod test {
let mut values = vec![];
for i in 0..10 {
values.push(IndexValue {
key: format!("{}___________________{}", i, i),
key: format!("{i}___________________{i}"),
link: Link {
page_id: 0.into(),
offset: i * 24,
Expand Down
7 changes: 7 additions & 0 deletions src/page/index/page_for_unsized_cdc_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ where
pub fn apply_change_event(&mut self, event: ChangeEvent<Pair<T, Link>>) -> eyre::Result<()> {
match event {
ChangeEvent::InsertAt {
event_id: _,
max_value: _,
value,
index,
Expand All @@ -44,6 +45,7 @@ where
Ok(())
}
ChangeEvent::RemoveAt {
event_id: _,
max_value,
value,
index,
Expand Down Expand Up @@ -115,6 +117,7 @@ mod test {
})
.unwrap();
let event = ChangeEvent::InsertAt {
event_id: 0.into(),
max_value: Pair {
key: "Something".to_string(),
value: Link::default(),
Expand All @@ -138,6 +141,7 @@ mod test {
})
.unwrap();
let event = ChangeEvent::InsertAt {
event_id: 0.into(),
max_value: Pair {
key: "Something".to_string(),
value: Link::default(),
Expand All @@ -150,6 +154,7 @@ mod test {
};
page.apply_change_event(event).unwrap();
let event = ChangeEvent::RemoveAt {
event_id: 0.into(),
max_value: Pair {
key: "Something new".to_string(),
value: Link::default(),
Expand All @@ -173,6 +178,7 @@ mod test {
})
.unwrap();
let event = ChangeEvent::InsertAt {
event_id: 0.into(),
max_value: Pair {
key: "Something".to_string(),
value: Link::default(),
Expand All @@ -185,6 +191,7 @@ mod test {
};
page.apply_change_event(event).unwrap();
let event = ChangeEvent::RemoveAt {
event_id: 0.into(),
max_value: Pair {
key: "Something new".to_string(),
value: Link::default(),
Expand Down
Loading