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

core/storage: Fix BTreeCursor::record() for MVCC

Browse Source 
Respect immutable record invalidation.
This commit is contained in:
Pekka Enberg
2025-07-17 16:12:13 +03:00
parent 962987e9a1
commit cef0195b42
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/storage/btree.rs
View File

@@ -4120,28 +4120,6 @@ impl BTreeCursor {
/// back.
#[instrument(skip(self), level = Level::INFO)]
pub fn record(&self) -> Result<IOResult<Option<Ref<ImmutableRecord>>>> {
if self.mv_cursor.is_some() {
let mv_cursor = self.mv_cursor.as_ref().unwrap().borrow();
if let Some(row) = mv_cursor.current_row().unwrap() {
// Follow the same pattern as the non-MVCC path
self.get_immutable_record_or_create()
.as_mut()
.unwrap()
.invalidate();
self.get_immutable_record_or_create()
.as_mut()
.unwrap()
.start_serialization(&row.data);
self.record_cursor.borrow_mut().invalidate();
let record_ref =
Ref::filter_map(self.reusable_immutable_record.borrow(), |opt| opt.as_ref())
.unwrap();
return Ok(IOResult::Done(Some(record_ref)));
} else {
return Ok(IOResult::Done(None));
}
}
if !self.has_record.get() {
return Ok(IOResult::Done(None));
}
@@ -4157,6 +4135,24 @@ impl BTreeCursor {
.unwrap();
return Ok(IOResult::Done(Some(record_ref)));
}
if self.mv_cursor.is_some() {
let mv_cursor = self.mv_cursor.as_ref().unwrap().borrow();
let row = mv_cursor.current_row().unwrap().unwrap();
self.get_immutable_record_or_create()
.as_mut()
.unwrap()
.invalidate();
self.get_immutable_record_or_create()
.as_mut()
.unwrap()
.start_serialization(&row.data);
self.record_cursor.borrow_mut().invalidate();
let record_ref =
Ref::filter_map(self.reusable_immutable_record.borrow(), |opt| opt.as_ref())
.unwrap();
return Ok(IOResult::Done(Some(record_ref)));
}
if *self.parse_record_state.borrow() == ParseRecordState::Init {
*self.parse_record_state.borrow_mut() = ParseRecordState::Parsing {
payload: Vec::new(),