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

more small fixes

Browse Source
This commit is contained in:
Nikita Sivukhin
2025-08-06 19:30:16 +04:00
parent 5b9f3816b3
commit 253b4933f7
4 changed files with 51 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/turso-sync-engine/src/database_sync_engine.rs
View File

@@ -434,7 +434,7 @@ pub mod tests {
database_sync_engine::DatabaseSyncEngineOpts,
test_context::{FaultInjectionStrategy, TestContext},
test_protocol_io::TestProtocolIo,
test_sync_server::{convert_rows, TestSyncServerOpts},
test_sync_server::convert_rows,
tests::{deterministic_runtime, seed_u64, TestRunner},
Result,
};
@@ -450,9 +450,8 @@ pub mod tests {
let io: Arc<dyn turso_core::IO> = Arc::new(turso_core::PlatformIO::new().unwrap());
let dir = tempfile::TempDir::new().unwrap();
let server_path = dir.path().join("server.db");
let opts = TestSyncServerOpts { pull_batch_size: 1 };
let ctx = Arc::new(TestContext::new(seed_u64()));
let protocol = TestProtocolIo::new(ctx.clone(), &server_path, opts)
let protocol = TestProtocolIo::new(ctx.clone(), &server_path)
.await
.unwrap();
let mut runner = TestRunner::new(ctx.clone(), io, protocol.clone());
@@ -574,9 +573,8 @@ pub mod tests {
let io: Arc<dyn turso_core::IO> = Arc::new(turso_core::PlatformIO::new().unwrap());
let dir = tempfile::TempDir::new().unwrap();
let server_path = dir.path().join("server.db");
let opts = TestSyncServerOpts { pull_batch_size: 1 };
let ctx = Arc::new(TestContext::new(seed_u64()));
let server = TestProtocolIo::new(ctx.clone(), &server_path, opts)
let server = TestProtocolIo::new(ctx.clone(), &server_path)
.await
.unwrap();
let mut runner = TestRunner::new(ctx.clone(), io.clone(), server.clone());
@@ -642,10 +640,9 @@ pub mod tests {
deterministic_runtime(async || {
let dir = tempfile::TempDir::new().unwrap();
let server_path = dir.path().join("server.db");
let opts = TestSyncServerOpts { pull_batch_size: 1 };
let ctx = Arc::new(TestContext::new(seed_u64()));
let io: Arc<dyn turso_core::IO> = Arc::new(turso_core::PlatformIO::new().unwrap());
let protocol = TestProtocolIo::new(ctx.clone(), &server_path, opts)
let protocol = TestProtocolIo::new(ctx.clone(), &server_path)
.await
.unwrap();
let mut dbs = Vec::new();
@@ -697,10 +694,9 @@ pub mod tests {
deterministic_runtime(async || {
let dir = tempfile::TempDir::new().unwrap();
let server_path = dir.path().join("server.db");
let opts = TestSyncServerOpts { pull_batch_size: 1 };
let io: Arc<dyn turso_core::IO> = Arc::new(turso_core::PlatformIO::new().unwrap());
let ctx = Arc::new(TestContext::new(seed_u64()));
let protocol = TestProtocolIo::new(ctx.clone(), &server_path, opts)
let protocol = TestProtocolIo::new(ctx.clone(), &server_path)
.await
.unwrap();
@@ -770,9 +766,8 @@ pub mod tests {
let dir = tempfile::TempDir::new().unwrap();
let server_path = dir.path().join("server.db");
let io: Arc<dyn turso_core::IO> = Arc::new(turso_core::PlatformIO::new().unwrap());
let opts = TestSyncServerOpts { pull_batch_size: 1 };
let ctx = Arc::new(TestContext::new(seed_u64()));
let protocol = TestProtocolIo::new(ctx.clone(), &server_path, opts)
let protocol = TestProtocolIo::new(ctx.clone(), &server_path)
.await
.unwrap();
@@ -844,7 +839,6 @@ pub mod tests {
deterministic_runtime(async || {
let dir = tempfile::TempDir::new().unwrap();
let io: Arc<dyn turso_core::IO> = Arc::new(turso_core::PlatformIO::new().unwrap());
let opts = TestSyncServerOpts { pull_batch_size: 1 };
let ctx = Arc::new(TestContext::new(seed_u64()));
let mut session = ctx.fault_session();
@@ -853,7 +847,7 @@ pub mod tests {
it += 1;
let server_path = dir.path().join(format!("server-{it}.db"));
let protocol = TestProtocolIo::new(ctx.clone(), &server_path, opts.clone())
let protocol = TestProtocolIo::new(ctx.clone(), &server_path)
.await
.unwrap();
@@ -914,7 +908,6 @@ pub mod tests {
deterministic_runtime(async || {
let dir = tempfile::TempDir::new().unwrap();
let io: Arc<dyn turso_core::IO> = Arc::new(turso_core::PlatformIO::new().unwrap());
let opts = TestSyncServerOpts { pull_batch_size: 1 };
let ctx = Arc::new(TestContext::new(seed_u64()));
let mut session = ctx.fault_session();
@@ -923,7 +916,7 @@ pub mod tests {
it += 1;
let server_path = dir.path().join(format!("server-{it}.db"));
let protocol = TestProtocolIo::new(ctx.clone(), &server_path, opts.clone())
let protocol = TestProtocolIo::new(ctx.clone(), &server_path)
.await
.unwrap();

6
packages/turso-sync-engine/src/database_sync_operations.rs
View File

@@ -1,4 +1,4 @@
use std::{cell::RefCell, rc::Rc, sync::Arc};
use std::{rc::Rc, sync::Arc};
use turso_core::{types::Text, Buffer, Completion, LimboError, Value};
@@ -47,8 +47,8 @@ pub async fn db_bootstrap<C: ProtocolIO>(
let chunk = chunk.data();
let content_len = chunk.len();
// todo(sivukhin): optimize allocations here
let buffer = Arc::new(RefCell::new(Buffer::allocate(chunk.len(), Rc::new(|_| {}))));
buffer.borrow_mut().as_mut_slice().copy_from_slice(&chunk);
let buffer = Arc::new(Buffer::allocate(chunk.len(), Rc::new(|_| {})));
buffer.as_mut_slice().copy_from_slice(&chunk);
let mut completions = Vec::with_capacity(dbs.len());
for i in 0..dbs.len() {
let c = Completion::new_write(move |size| {

6
packages/turso-sync-engine/src/test_protocol_io.rs
View File

@@ -11,7 +11,7 @@ use crate::{
errors::Error,
protocol_io::{DataCompletion, DataPollResult, ProtocolIO},
test_context::TestContext,
test_sync_server::{TestSyncServer, TestSyncServerOpts},
test_sync_server::TestSyncServer,
Result,
};
@@ -102,11 +102,11 @@ impl DataCompletion for TestDataCompletion {
}
impl TestProtocolIo {
pub async fn new(ctx: Arc<TestContext>, path: &Path, opts: TestSyncServerOpts) -> Result<Self> {
pub async fn new(ctx: Arc<TestContext>, path: &Path) -> Result<Self> {
Ok(Self {
ctx: ctx.clone(),
requests: Arc::new(std::sync::Mutex::new(Vec::new())),
server: TestSyncServer::new(ctx, path, opts).await?,
server: TestSyncServer::new(ctx, path).await?,
files: Arc::new(Mutex::new(HashMap::new())),
})
}

83
packages/turso-sync-engine/src/test_sync_server.rs
View File

@@ -31,20 +31,35 @@ struct TestSyncServerState {
sessions: HashMap<String, SyncSession>,
}
#[derive(Debug, Clone)]
pub struct TestSyncServerOpts {
pub pull_batch_size: usize,
}
#[derive(Clone)]
pub struct TestSyncServer {
ctx: Arc<TestContext>,
db: turso::Database,
opts: Arc<TestSyncServerOpts>,
state: Arc<Mutex<TestSyncServerState>>,
}
impl TestSyncServer {
pub async fn new(ctx: Arc<TestContext>, path: &Path) -> Result<Self> {
let mut generations = HashMap::new();
generations.insert(
1,
Generation {
snapshot: EMPTY_WAL_MODE_DB.to_vec(),
frames: Vec::new(),
},
);
Ok(Self {
ctx,
db: turso::Builder::new_local(path.to_str().unwrap())
.build()
.await?,
state: Arc::new(Mutex::new(TestSyncServerState {
generation: 1,
generations,
sessions: HashMap::new(),
})),
})
}
pub async fn db_info(&self, completion: TestDataCompletion) -> Result<()> {
tracing::debug!("db_info");
self.ctx.faulty_call("db_info_start").await?;
@@ -244,47 +259,7 @@ impl TestSyncServer {
Ok(())
}
}
// empty DB with single 4096-byte page and WAL mode (PRAGMA journal_mode=WAL)
// see test test_empty_wal_mode_db_content which validates asset content
pub const EMPTY_WAL_MODE_DB: &[u8] = include_bytes!("test_empty.db");
pub async fn convert_rows(rows: &mut turso::Rows) -> Result<Vec<Vec<turso::Value>>> {
let mut rows_values = vec![];
while let Some(row) = rows.next().await? {
let mut row_values = vec![];
for i in 0..row.column_count() {
row_values.push(row.get_value(i)?);
}
rows_values.push(row_values);
}
Ok(rows_values)
}
impl TestSyncServer {
pub async fn new(ctx: Arc<TestContext>, path: &Path, opts: TestSyncServerOpts) -> Result<Self> {
let mut generations = HashMap::new();
generations.insert(
1,
Generation {
snapshot: EMPTY_WAL_MODE_DB.to_vec(),
frames: Vec::new(),
},
);
Ok(Self {
ctx,
db: turso::Builder::new_local(path.to_str().unwrap())
.build()
.await?,
opts: Arc::new(opts),
state: Arc::new(Mutex::new(TestSyncServerState {
generation: 1,
generations,
sessions: HashMap::new(),
})),
})
}
pub fn db(&self) -> turso::Database {
self.db.clone()
}
@@ -310,3 +285,19 @@ impl TestSyncServer {
Ok(())
}
}
// empty DB with single 4096-byte page and WAL mode (PRAGMA journal_mode=WAL)
// see test test_empty_wal_mode_db_content which validates asset content
pub const EMPTY_WAL_MODE_DB: &[u8] = include_bytes!("test_empty.db");
pub async fn convert_rows(rows: &mut turso::Rows) -> Result<Vec<Vec<turso::Value>>> {
let mut rows_values = vec![];
while let Some(row) = rows.next().await? {
let mut row_values = vec![];
for i in 0..row.column_count() {
row_values.push(row.get_value(i)?);
}
rows_values.push(row_values);
}
Ok(rows_values)
}