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

core/mvcc: remove unnecessary fields in CommitState::Checkpoint

Browse Source
This commit is contained in:
Pere Diaz Bou
2025-10-03 17:35:42 +02:00
parent c612a51df7
commit e3f2bbf90b
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -327,7 +327,6 @@ pub enum CommitState<Clock: LogicalClock> {
end_ts: u64,
},
Checkpoint {
end_ts: u64,
state_machine: RefCell<StateMachine<CheckpointStateMachine<Clock>>>,
},
CommitEnd {
@@ -640,19 +639,6 @@ impl<Clock: LogicalClock> StateTransition for CommitStateMachine<Clock> {
}
}
CommitState::Checkpoint {
end_ts,
state_machine,
} => {
match state_machine.borrow_mut().step(&())? {
IOResult::Done(_) => {}
IOResult::IO(iocompletions) => {
return Ok(TransitionResult::Io(iocompletions));
}
}
self.finalize(mvcc_store)?;
return Ok(TransitionResult::Done(()));
}
CommitState::SyncLogicalLog { end_ts } => {
let c = mvcc_store.storage.sync()?;
self.state = CommitState::EndCommitLogicalLog { end_ts: *end_ts };
@@ -719,16 +705,23 @@ impl<Clock: LogicalClock> StateTransition for CommitStateMachine<Clock> {
false,
));
let state_machine = RefCell::new(state_machine);
self.state = CommitState::Checkpoint {
end_ts: *end_ts,
state_machine,
};
self.state = CommitState::Checkpoint { state_machine };
return Ok(TransitionResult::Continue);
}
tracing::trace!("logged(tx_id={}, end_ts={})", self.tx_id, *end_ts);
self.finalize(mvcc_store)?;
Ok(TransitionResult::Done(()))
}
CommitState::Checkpoint { state_machine } => {
match state_machine.borrow_mut().step(&())? {
IOResult::Done(_) => {}
IOResult::IO(iocompletions) => {
return Ok(TransitionResult::Io(iocompletions));
}
}
self.finalize(mvcc_store)?;
return Ok(TransitionResult::Done(()));
}
}
}
@@ -2178,13 +2171,7 @@ impl<Clock: LogicalClock> Debug for CommitState<Clock> {
.debug_struct("SyncLogicalLog")
.field("end_ts", end_ts)
.finish(),
Self::Checkpoint {
end_ts,
state_machine: _,
} => f
.debug_struct("Checkpoint")
.field("end_ts", end_ts)
.finish(),
Self::Checkpoint { state_machine: _ } => f.debug_struct("Checkpoint").finish(),
Self::CommitEnd { end_ts } => {
f.debug_struct("CommitEnd").field("end_ts", end_ts).finish()
}