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

fixes after atomics merge conflicts

Browse Source
This commit is contained in:
Jussi Saurio
2025-09-25 08:16:52 +03:00
parent f7806cbc33
commit 49602f409f
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/mvcc/database/checkpoint_state_machine.rs
View File

@@ -277,11 +277,9 @@ impl<Clock: LogicalClock> CheckpointStateMachine<Clock> {
return Err(crate::LimboError::Busy);
}
result?;
self.connection
.transaction_state
.replace(TransactionState::Write {
schema_did_change: false,
}); // TODO: schema_did_change??
*self.connection.transaction_state.write() = TransactionState::Write {
schema_did_change: false,
}; // TODO: schema_did_change??
self.lock_states.pager_write_tx = true;
self.state = CheckpointState::WriteRow {
write_set_index: 0,
@@ -422,9 +420,7 @@ impl<Clock: LogicalClock> CheckpointStateMachine<Clock> {
self.state = CheckpointState::TruncateLogicalLog;
self.lock_states.pager_read_tx = false;
self.lock_states.pager_write_tx = false;
self.connection
.transaction_state
.replace(TransactionState::None);
*self.connection.transaction_state.write() = TransactionState::None;
let header = self
.pager
.io
@@ -520,14 +516,10 @@ impl<Clock: LogicalClock> StateTransition for CheckpointStateMachine<Clock> {
.io
.block(|| self.pager.end_tx(rollback, self.connection.as_ref()))
.expect("failed to end pager write tx");
self.connection
.transaction_state
.replace(TransactionState::None);
*self.connection.transaction_state.write() = TransactionState::None;
} else if self.lock_states.pager_read_tx {
self.pager.end_read_tx().unwrap();
self.connection
.transaction_state
.replace(TransactionState::None);
*self.connection.transaction_state.write() = TransactionState::None;
}
if self.lock_states.blocking_checkpoint_lock_held {
self.checkpoint_lock.unlock();

2
core/mvcc/database/mod.rs
View File

@@ -590,7 +590,7 @@ impl<Clock: LogicalClock> StateTransition for CommitStateMachine<Clock> {
mvcc_store
.global_header
.write()
.replace(*tx_unlocked.header.borrow());
.replace(*tx_unlocked.header.read());
// We have now updated all the versions with a reference to the
// transaction ID to a timestamp and can, therefore, remove the
// transaction. Please note that when we move to lockless, the