Skip to content

Commit 8c7a9bf

Browse files
committed
fix frames_synced
1 parent d77e019 commit 8c7a9bf

File tree

2 files changed

+11
-7
lines changed
  • libsql-server/tests/embedded_replica
  • libsql/src/replication

2 files changed

+11
-7
lines changed

libsql-server/tests/embedded_replica/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ fn replicate_with_snapshots() {
759759
assert_eq!(stat, 427);
760760

761761
let rep = db.sync().await.unwrap();
762-
assert_eq!(rep.frames_synced(), 427);
762+
assert_eq!(rep.frames_synced(), 0);
763763

764764
let conn = db.connect().unwrap();
765765

@@ -1336,7 +1336,7 @@ fn replicated_return() {
13361336

13371337
let rep = db.sync().await.unwrap();
13381338
assert_eq!(rep.frame_no(), Some(10));
1339-
assert_eq!(rep.frames_synced(), 11);
1339+
assert_eq!(rep.frames_synced(), 9);
13401340

13411341
// Regenerate log
13421342
notify.notify_waiters();
@@ -1346,7 +1346,7 @@ fn replicated_return() {
13461346

13471347
let rep = db.sync().await.unwrap();
13481348
assert_eq!(rep.frame_no(), Some(4));
1349-
assert_eq!(rep.frames_synced(), 16);
1349+
assert_eq!(rep.frames_synced(), 3);
13501350

13511351
let mut row = conn.query("select count(*) from user", ()).await.unwrap();
13521352
let count = row.next().await.unwrap().unwrap().get::<u64>(0).unwrap();

libsql/src/replication/mod.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,13 +255,17 @@ impl EmbeddedReplicator {
255255
}
256256
}
257257

258-
let last_frames_synced = self
259-
.last_frames_synced
260-
.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
258+
let last_frames_synced = self.last_frames_synced.fetch_add(
259+
replicator.frames_synced(),
260+
std::sync::atomic::Ordering::Relaxed,
261+
);
262+
263+
let frames_synced =
264+
((replicator.frames_synced() as i64 - last_frames_synced as i64).abs()) as usize;
261265

262266
let replicated = Replicated {
263267
frame_no: replicator.client_mut().committed_frame_no(),
264-
frames_synced: replicator.frames_synced() - last_frames_synced,
268+
frames_synced,
265269
};
266270

267271
Ok(replicated)

0 commit comments

Comments
 (0)