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

Merge 'core/mvcc/logical-log: switch RwLock to parking_lot' from Pere Diaz Bou

Browse Source 
Reviewed-by: Jussi Saurio <jussi.saurio@gmail.com>

Closes #3615
This commit is contained in:
Pekka Enberg
2025-10-07 13:43:39 +03:00
committed by GitHub
parent c3dbcec8c9 44152f11d0
commit b98c4ece0d
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2016,7 +2016,7 @@ impl<Clock: LogicalClock> MvStore<Clock> {
}
StreamingResult::Eof => {
// Set offset to the end so that next writes go to the end of the file
self.storage.logical_log.write().unwrap().offset = reader.offset as u64;
self.storage.logical_log.write().offset = reader.offset as u64;
break;
}
}

20
core/mvcc/persistent_storage/mod.rs
View File

@@ -1,5 +1,6 @@
use parking_lot::RwLock;
use std::fmt::Debug;
use std::sync::{Arc, RwLock};
use std::sync::Arc;
pub mod logical_log;
use crate::mvcc::database::LogRecord;
@@ -20,7 +21,7 @@ impl Storage {
impl Storage {
pub fn log_tx(&self, m: &LogRecord) -> Result<Completion> {
self.logical_log.write().unwrap().log_tx(m)
self.logical_log.write().log_tx(m)
}
pub fn read_tx_log(&self) -> Result<Vec<LogRecord>> {
@@ -28,30 +29,27 @@ impl Storage {
}
pub fn sync(&self) -> Result<Completion> {
self.logical_log.write().unwrap().sync()
self.logical_log.write().sync()
}
pub fn truncate(&self) -> Result<Completion> {
self.logical_log.write().unwrap().truncate()
self.logical_log.write().truncate()
}
pub fn get_logical_log_file(&self) -> Arc<dyn File> {
self.logical_log.write().unwrap().file.clone()
self.logical_log.write().file.clone()
}
pub fn should_checkpoint(&self) -> bool {
self.logical_log.read().unwrap().should_checkpoint()
self.logical_log.read().should_checkpoint()
}
pub fn set_checkpoint_threshold(&self, threshold: u64) {
self.logical_log
.write()
.unwrap()
.set_checkpoint_threshold(threshold)
self.logical_log.write().set_checkpoint_threshold(threshold)
}
pub fn checkpoint_threshold(&self) -> u64 {
self.logical_log.read().unwrap().checkpoint_threshold()
self.logical_log.read().checkpoint_threshold()
}
}