aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2025-12-26 04:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Nikita Sivukhin
2025-09-02 15:41:48 +04:00
parent 0b6a6e7713
commit 5b9fe0cdf3
1 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
core/storage/btree.rs
View File

@@ -1206,17 +1206,18 @@ impl BTreeCursor {
}
}
loop {
let mem_page = self.stack.top_ref();
let contents = mem_page.get_contents();
let cell_idx = self.stack.current_cell_index();
let cell_count = self.stack.leaf_cell_count();
if cell_idx != -1 && cell_count.is_some() && cell_idx + 1 < cell_count.unwrap() {
let cell_count = contents.cell_count();
let is_leaf = contents.is_leaf();
if cell_idx != -1 && is_leaf && cell_idx as usize + 1 < cell_count {
self.stack.advance();
return Ok(IOResult::Done(true));
}
self.stack.set_leaf_cell_count(None);
let mem_page = self.stack.top();
let mem_page = mem_page.clone();
let contents = mem_page.get_contents();
let cell_count = contents.cell_count();
tracing::debug!(
id = mem_page.get().id,
cell = self.stack.current_cell_index(),
@@ -1274,16 +1275,15 @@ impl BTreeCursor {
}
turso_assert!(
cell_idx < contents.cell_count(),
cell_idx < cell_count,
"cell index out of bounds: cell_idx={}, cell_count={}, page_type={:?} page_id={}",
cell_idx,
contents.cell_count(),
cell_count,
contents.page_type(),
mem_page.get().id
);
if contents.is_leaf() {
self.stack.set_leaf_cell_count(Some(cell_count as i32));
if is_leaf {
return Ok(IOResult::Done(true));
}
if is_index && self.going_upwards {
@@ -6006,11 +6006,16 @@ impl PageStack {
/// Get the top page on the stack.
/// This is the page that is currently being traversed.
#[instrument(skip(self), level = Level::DEBUG, name = "pagestack::top")]
fn top(&self) -> Arc<Page> {
let current = self.current();
let page = self.stack[current].clone().unwrap();
tracing::trace!(current = current, page_id = page.get().id);
turso_assert!(page.is_loaded(), "page should be loaded");
page
}
fn top_ref(&self) -> &Arc<Page> {
let current = self.current();
let page = self.stack[current].as_ref().unwrap();
turso_assert!(page.is_loaded(), "page should be loaded");
page
}
@@ -6028,20 +6033,6 @@ impl PageStack {
self.node_states[current].cell_idx
}
/// Cell count of the current leaf page
/// Caller must ensure that this method will be called for the leag page only
fn leaf_cell_count(&self) -> Option<i32> {
let current = self.current();
self.node_states[current].cell_count
}
// Set cell count for current leaf page
// Caller must ensure that this method will be called for the leag page only
fn set_leaf_cell_count(&mut self, cell_count: Option<i32>) {
let current = self.current();
self.node_states[current].cell_count = cell_count;
}
/// Check if the current cell index is less than 0.
/// This means we have been iterating backwards and have reached the start of the page.
fn current_cell_index_less_than_min(&self) -> bool {