Skip to content

perf: Optimize BTree search using binary search #767

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

Merged
merged 3 commits into from
Aug 8, 2024
Merged
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
77 changes: 50 additions & 27 deletions src/data_structures/b_tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,20 +146,16 @@ where

pub fn search(&self, key: T) -> bool {
let mut current_node = &self.root;
let mut index: isize;
loop {
index = isize::try_from(current_node.keys.len()).ok().unwrap() - 1;
while index >= 0 && current_node.keys[index as usize] > key {
index -= 1;
}

let u_index: usize = usize::try_from(index + 1).ok().unwrap();
if index >= 0 && current_node.keys[u_index - 1] == key {
break true;
} else if current_node.is_leaf() {
break false;
} else {
current_node = &current_node.children[u_index];
match current_node.keys.binary_search(&key) {
Ok(_) => return true,
Err(index) => {
if current_node.is_leaf() {
return false;
} else {
current_node = &current_node.children[index];
}
}
}
}
}
Expand All @@ -169,19 +165,46 @@ where
mod test {
use super::BTree;

#[test]
fn test_search() {
let mut tree = BTree::new(2);
tree.insert(10);
tree.insert(20);
tree.insert(30);
tree.insert(5);
tree.insert(6);
tree.insert(7);
tree.insert(11);
tree.insert(12);
tree.insert(15);
assert!(tree.search(15));
assert!(!tree.search(16));
macro_rules! test_search {
($($name:ident: $number_of_children:expr,)*) => {
$(
#[test]
fn $name() {
let mut tree = BTree::new($number_of_children);
tree.insert(10);
tree.insert(20);
tree.insert(30);
tree.insert(5);
tree.insert(6);
tree.insert(7);
tree.insert(11);
tree.insert(12);
tree.insert(15);
assert!(!tree.search(4));
assert!(tree.search(5));
assert!(tree.search(6));
assert!(tree.search(7));
assert!(!tree.search(8));
assert!(!tree.search(9));
assert!(tree.search(10));
assert!(tree.search(11));
assert!(tree.search(12));
assert!(!tree.search(13));
assert!(!tree.search(14));
assert!(tree.search(15));
assert!(!tree.search(16));
}
)*
}
}

test_search! {
children_2: 2,
children_3: 3,
children_4: 4,
children_5: 5,
children_10: 10,
children_60: 60,
children_101: 101,
}
}