aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-01-01 07:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

core/storage/btree: Replace io_yield_many with completion group in B-Tree

Browse Source
This commit is contained in:
Pekka Enberg
2025-10-13 10:52:35 +03:00
parent 986faa42da
commit 840d6a0df5
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/storage/btree.rs
View File

@@ -1,7 +1,8 @@
use tracing::{instrument, Level};
use crate::{
io_yield_many, io_yield_one,
io::CompletionGroup,
io_yield_one,
schema::Index,
storage::{
pager::{BtreePageAllocMode, Pager},
@@ -2858,12 +2859,12 @@ impl BTreeCursor {
// start loading right page first
let mut pgno: u32 = unsafe { right_pointer.cast::<u32>().read().swap_bytes() };
let current_sibling = sibling_pointer;
let mut completions: Vec<Completion> = Vec::with_capacity(current_sibling + 1);
let mut group = CompletionGroup::new(|_| {});
for i in (0..=current_sibling).rev() {
match btree_read_page(&self.pager, pgno as i64) {
Err(e) => {
tracing::error!("error reading page {}: {}", pgno, e);
self.pager.io.cancel(&completions)?;
group.cancel();
self.pager.io.drain()?;
return Err(e);
}
@@ -2872,7 +2873,7 @@ impl BTreeCursor {
self.pager.add_dirty(&page);
pages_to_balance[i].replace(page);
if let Some(c) = c {
completions.push(c);
group.add(&c);
}
}
}
@@ -2939,8 +2940,9 @@ impl BTreeCursor {
first_divider_cell: first_cell_divider,
});
*sub_state = BalanceSubState::NonRootDoBalancing;
if !completions.is_empty() {
io_yield_many!(completions);
let completion = group.build();
if !completion.finished() {
io_yield_one!(completion);
}
}
BalanceSubState::NonRootDoBalancing => {