From aad0460bd118d4e5ee55b734c596f906d13cac07 Mon Sep 17 00:00:00 2001 From: Nikita Sivukhin Date: Wed, 30 Jul 2025 14:20:44 +0400 Subject: [PATCH] rename methods --- packages/turso-sync/examples/example_sync.rs | 33 ++++++++------ packages/turso-sync/src/database.rs | 12 ++--- packages/turso-sync/src/database_inner.rs | 48 ++++++++++---------- 3 files changed, 49 insertions(+), 44 deletions(-) diff --git a/packages/turso-sync/examples/example_sync.rs b/packages/turso-sync/examples/example_sync.rs index ad9fadaa9..a4d1b59b6 100644 --- a/packages/turso-sync/examples/example_sync.rs +++ b/packages/turso-sync/examples/example_sync.rs @@ -28,16 +28,21 @@ async fn main() { } let trimmed = input.trim(); - if trimmed == ".exit" || trimmed == ".quit" { - break; - } - if trimmed.starts_with(".sync-from-remote") { - db.sync_from_remote().await.unwrap(); - continue; - } - if trimmed.starts_with(".sync-to-remote") { - db.sync_to_remote().await.unwrap(); - continue; + match trimmed { + ".exit" | ".quit" => break, + ".pull" => { + db.pull().await.unwrap(); + continue; + } + ".push" => { + db.push().await.unwrap(); + continue; + } + ".sync" => { + db.sync().await.unwrap(); + continue; + } + _ => {} } let mut rows = db.query(&input, ()).await.unwrap(); while let Some(row) = rows.next().await.unwrap() { @@ -46,13 +51,13 @@ async fn main() { let value = row.get_value(i).unwrap(); match value { turso::Value::Null => values.push(format!("NULL")), - turso::Value::Integer(x) => values.push(format!("{}", x)), - turso::Value::Real(x) => values.push(format!("{}", x)), - turso::Value::Text(x) => values.push(format!("'{}'", x)), + turso::Value::Integer(x) => values.push(format!("{x}")), + turso::Value::Real(x) => values.push(format!("{x}")), + turso::Value::Text(x) => values.push(format!("'{x}'")), turso::Value::Blob(x) => values.push(format!( "x'{}'", x.iter() - .map(|x| format!("{:02x}", x)) + .map(|x| format!("{x:02x}")) .collect::>() .join(""), )), diff --git a/packages/turso-sync/src/database.rs b/packages/turso-sync/src/database.rs index 8bf75946c..2bc64729d 100644 --- a/packages/turso-sync/src/database.rs +++ b/packages/turso-sync/src/database.rs @@ -68,14 +68,14 @@ impl Builder { } impl Database { - pub async fn sync_full(&mut self) -> Result<()> { - self.0.sync_full().await + pub async fn sync(&mut self) -> Result<()> { + self.0.sync().await } - pub async fn sync_from_remote(&mut self) -> Result<()> { - self.0.sync_from_remote().await + pub async fn pull(&mut self) -> Result<()> { + self.0.pull().await } - pub async fn sync_to_remote(&mut self) -> Result<()> { - self.0.sync_to_remote().await + pub async fn push(&mut self) -> Result<()> { + self.0.push().await } pub async fn execute(&self, sql: &str, params: impl turso::IntoParams) -> Result { self.0.execute(sql, params).await diff --git a/packages/turso-sync/src/database_inner.rs b/packages/turso-sync/src/database_inner.rs index 4fbf28af8..77c0297d9 100644 --- a/packages/turso-sync/src/database_inner.rs +++ b/packages/turso-sync/src/database_inner.rs @@ -115,7 +115,7 @@ impl DatabaseInner { /// Sync any new changes from remote DB and apply them locally /// This method will **not** send local changed to the remote /// This method will block writes for the period of sync - pub async fn sync_from_remote(&mut self) -> Result<()> { + pub async fn pull(&mut self) -> Result<()> { tracing::debug!("sync_from_remote"); self.cleanup_synced().await?; @@ -157,7 +157,7 @@ impl DatabaseInner { /// Sync local changes to remote DB /// This method will **not** pull remote changes to the local DB /// This method will **not** block writes for the period of sync - pub async fn sync_to_remote(&mut self) -> Result<()> { + pub async fn push(&mut self) -> Result<()> { tracing::debug!("sync to remote"); self.cleanup_synced().await?; @@ -174,13 +174,13 @@ impl DatabaseInner { Ok(()) } - /// Sync local chnages to remote DB and bring new changes from remote to local + /// Sync local changes to remote DB and bring new changes from remote to local /// This method will block writes for the period of sync - pub async fn sync_full(&mut self) -> Result<()> { + pub async fn sync(&mut self) -> Result<()> { // todo(sivukhin): this is bit suboptimal as both sync_to_remote and sync_from_remote will call pull_synced_from_remote // but for now - keep it simple - self.sync_to_remote().await?; - self.sync_from_remote().await?; + self.push().await?; + self.pull().await?; Ok(()) } @@ -212,7 +212,7 @@ impl DatabaseInner { } // sync WAL from the remote - self.sync_from_remote().await?; + self.pull().await?; assert!( self.meta().active_db == ActiveDatabase::Draft, @@ -648,7 +648,7 @@ mod tests { )); // 1 rows synced - db.sync_from_remote().await.unwrap(); + db.pull().await.unwrap(); assert_eq!( query_rows(&db, "SELECT * FROM t").await.unwrap(), vec![vec![Value::Integer(1)]] @@ -662,7 +662,7 @@ mod tests { db.execute("INSERT INTO t VALUES (3)", ()).await.unwrap(); // changes are synced from the remote - but remote changes are not propagated locally - db.sync_to_remote().await.unwrap(); + db.push().await.unwrap(); assert_eq!( query_rows(&db, "SELECT * FROM t").await.unwrap(), vec![vec![Value::Integer(1)], vec![Value::Integer(3)]] @@ -682,7 +682,7 @@ mod tests { ); db.execute("INSERT INTO t VALUES (4)", ()).await.unwrap(); - db.sync_to_remote().await.unwrap(); + db.push().await.unwrap(); assert_eq!( query_rows(&db, "SELECT * FROM t").await.unwrap(), @@ -705,7 +705,7 @@ mod tests { ] ); - db.sync_from_remote().await.unwrap(); + db.pull().await.unwrap(); assert_eq!( query_rows(&db, "SELECT * FROM t").await.unwrap(), vec![ @@ -761,21 +761,21 @@ mod tests { Err(Error::TursoError(turso::Error::SqlExecutionFailure(x))) if x.contains("no such table: t") )); - db.sync_full().await.unwrap(); + db.sync().await.unwrap(); assert_eq!( query_rows(&db, "SELECT * FROM t").await.unwrap(), vec![vec![Value::Integer(1)]] ); db.execute("INSERT INTO t VALUES (2)", ()).await.unwrap(); - db.sync_full().await.unwrap(); + db.sync().await.unwrap(); assert_eq!( query_rows(&db, "SELECT * FROM t").await.unwrap(), vec![vec![Value::Integer(1)], vec![Value::Integer(2)]] ); db.execute("INSERT INTO t VALUES (3)", ()).await.unwrap(); - db.sync_full().await.unwrap(); + db.sync().await.unwrap(); assert_eq!( query_rows(&db, "SELECT * FROM t").await.unwrap(), vec![ @@ -817,7 +817,7 @@ mod tests { for db in &mut dbs { let mut db = db.lock().await; - db.sync_from_remote().await.unwrap(); + db.pull().await.unwrap(); } for (i, db) in dbs.iter().enumerate() { let db = db.lock().await; @@ -832,7 +832,7 @@ mod tests { let db = db.clone(); tasks.push(async move { let mut db = db.lock().await; - db.sync_to_remote().await + db.push().await }); } futures::future::join_all(tasks).await @@ -891,12 +891,12 @@ mod tests { .await .unwrap(); - db.sync_from_remote().await.unwrap(); + db.pull().await.unwrap(); for query in queries { db.execute(&query, ()).await.unwrap(); } let guard = sync_lock.lock().await; - db.sync_to_remote().await.unwrap(); + db.push().await.unwrap(); drop(guard); } })); @@ -943,7 +943,7 @@ mod tests { let has_fault = matches!(strategy, FaultInjectionStrategy::Enabled { .. }); ctx.switch_mode(strategy).await; - let result = db.sync_from_remote().await; + let result = db.pull().await; ctx.switch_mode(FaultInjectionStrategy::Disabled).await; if !has_fault { @@ -963,7 +963,7 @@ mod tests { ] ); - db.sync_from_remote().await.unwrap(); + db.pull().await.unwrap(); let rows = query_rows(&db, "SELECT * FROM t").await.unwrap(); assert_eq!( @@ -1011,7 +1011,7 @@ mod tests { let has_fault = matches!(strategy, FaultInjectionStrategy::Enabled { .. }); ctx.switch_mode(strategy).await; - let result = db.sync_from_remote().await; + let result = db.pull().await; ctx.switch_mode(FaultInjectionStrategy::Disabled).await; if !has_fault { @@ -1024,7 +1024,7 @@ mod tests { let rows = query_rows(&db, "SELECT * FROM t").await.unwrap(); assert!(rows.len() <= 3); - db.sync_from_remote().await.unwrap(); + db.pull().await.unwrap(); let rows = query_rows(&db, "SELECT * FROM t").await.unwrap(); assert_eq!( @@ -1079,7 +1079,7 @@ mod tests { let has_fault = matches!(strategy, FaultInjectionStrategy::Enabled { .. }); ctx.switch_mode(strategy).await; - let result = db.sync_to_remote().await; + let result = db.push().await; ctx.switch_mode(FaultInjectionStrategy::Disabled).await; if !has_fault { @@ -1097,7 +1097,7 @@ mod tests { .unwrap(); assert!(rows.len() <= 3); - db.sync_to_remote().await.unwrap(); + db.push().await.unwrap(); let rows = convert_rows(&mut server_conn.query("SELECT * FROM t", ()).await.unwrap())