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

Merge 'mvcc: dont use mv store for ephemeral tables' from Jussi Saurio

Browse Source 
not sure how these would even work with mvcc - either way, an ephemeral
table use an ephemeral database file and pager so i don't think putting
its writes into MV store makes sense
TBH i have no idea if there are any weird interactions here but the code
we have now for sure does not work
Closes #3486

Reviewed-by: Nikita Sivukhin (@sivukhin)

Closes #3490
This commit is contained in:
Jussi Saurio
2025-10-01 13:50:30 +03:00
committed by GitHub
parent 760ebe1370 3bc6311bfd
commit 480d066147
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/vdbe/execute.rs
View File

@@ -7417,15 +7417,6 @@ pub fn op_open_ephemeral(
let root_page = return_if_io!(pager.btree_create(flag)) as i64;
let (_, cursor_type) = program.cursor_ref.get(cursor_id).unwrap();
let mv_cursor = if let Some(tx_id) = program.connection.get_mv_tx_id() {
let mv_store = mv_store.unwrap().clone();
let mv_cursor = Arc::new(RwLock::new(
MvCursor::new(mv_store.clone(), tx_id, root_page, pager.clone()).unwrap(),
));
Some(mv_cursor)
} else {
None
};
let num_columns = match cursor_type {
CursorType::BTreeTable(table_rc) => table_rc.columns.len(),
@@ -7434,9 +7425,9 @@ pub fn op_open_ephemeral(
};
let cursor = if let CursorType::BTreeIndex(index) = cursor_type {
BTreeCursor::new_index(mv_cursor, pager.clone(), root_page, index, num_columns)
BTreeCursor::new_index(None, pager.clone(), root_page, index, num_columns)
} else {
BTreeCursor::new_table(mv_cursor, pager.clone(), root_page, num_columns)
BTreeCursor::new_table(None, pager.clone(), root_page, num_columns)
};
state.op_open_ephemeral_state = OpOpenEphemeralState::Rewind {
cursor: Box::new(cursor),