sqlite/libsql
0
0
Fork 0
mirror of https://github.com/tursodatabase/libsql.git synced 2025-09-20 21:29:46 +00:00
Code Activity

Only pull frames when doing write delegation (#2028)

Browse Source 
Fixes #2026.
This commit is contained in:
Pekka Enberg
2025-04-11 17:20:06 +00:00
committed by GitHub
parent 361d082b7f 1f640e9b7d
commit d18e237d8a
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libsql/src/database.rs
View File

@@ -392,7 +392,14 @@ cfg_replication! {
#[cfg(feature = "replication")]
DbType::Sync { db, encryption_config: _ } => db.sync().await,
#[cfg(feature = "sync")]
DbType::Offline { db, .. } => db.sync_offline().await,
DbType::Offline { db, remote_writes: false, .. } => db.sync_offline().await,
#[cfg(feature = "sync")]
DbType::Offline { db, remote_writes: true, .. } => {
let mut sync_ctx = db.sync_ctx.as_ref().unwrap().lock().await;
crate::sync::bootstrap_db(&mut sync_ctx).await?;
let conn = db.connect()?;
crate::sync::try_pull(&mut sync_ctx, &conn).await
},
_ => Err(Error::SyncNotSupported(format!("{:?}", self.db_type))),
}
}

2
libsql/src/sync.rs
View File

@@ -814,7 +814,7 @@ async fn try_push(
})
}
async fn try_pull(
pub async fn try_pull(
sync_ctx: &mut SyncContext,
conn: &Connection,
) -> Result<crate::database::Replicated> {

6
libsql/src/sync/statement.rs
View File

@@ -22,21 +22,21 @@ impl Stmt for SyncedStatement {
async fn execute(&mut self, params: &Params) -> Result<usize> {
let result = self.inner.execute(params).await;
let mut context = self.context.lock().await;
let _ = crate::sync::sync_offline(&mut context, &self.conn).await;
crate::sync::try_pull(&mut context, &self.conn).await?;
result
}
async fn query(&mut self, params: &Params) -> Result<Rows> {
let result = self.inner.query(params).await;
let mut context = self.context.lock().await;
let _ = crate::sync::sync_offline(&mut context, &self.conn).await;
crate::sync::try_pull(&mut context, &self.conn).await?;
result
}
async fn run(&mut self, params: &Params) -> Result<()> {
let result = self.inner.run(params).await;
let mut context = self.context.lock().await;
let _ = crate::sync::sync_offline(&mut context, &self.conn).await;
crate::sync::try_pull(&mut context, &self.conn).await?;
result
}